summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS7
-rw-r--r--MAINTAINERS15
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac4
-rwxr-xr-xdistro/ubuntu/build33
-rwxr-xr-xdistro/ubuntu/postinst13
-rwxr-xr-xdistro/ubuntu/postrm10
-rwxr-xr-xdistro/ubuntu/preinst8
-rwxr-xr-xdistro/ubuntu/prerm11
9 files changed, 10 insertions, 95 deletions
diff --git a/AUTHORS b/AUTHORS
index 6519f9af..5d92bc4b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,7 @@
-Jonathan Blandford <[email protected]>
+MATE:
Perberos <[email protected]>
+Steve Zesch <[email protected]>
+Stefano Karapetsas <[email protected]>
+
+GNOME:
+Jonathan Blandford <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index dbf279aa..00000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,15 +0,0 @@
-Rodrigo Moya
-E-mail: rodrigo at mate-db.org
-Userid: rodrigo
-
-Sebastien Bacher
-Email: seb128 at debian.org
-Userid: sbacher
-
-Thomas Wood
-Email: thos at gnome.org
-Userid: thos
-
-Jens Granseuer
-Email: jensgr at gmx.net
-Userid: jensg
diff --git a/autogen.sh b/autogen.sh
index b81c7425..10c346e0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,7 +12,7 @@ PKG_NAME="mate-control-center"
exit 1
}
-which mate-autogen.sh || {
+which mate-autogen || {
echo "You need to install mate-common from the MATE Git"
exit 1
}
@@ -21,5 +21,5 @@ REQUIRED_AUTOMAKE_VERSION=1.9
USE_MATE2_MACROS=1
USE_COMMON_DOC_BUILD=yes
-. mate-autogen.sh
+. mate-autogen
diff --git a/configure.ac b/configure.ac
index 16729b5d..40632a11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mate-control-center], [1.1.0], [htts://www.mate-desktop.org/])
+AC_INIT([mate-control-center], [1.2.0], [htts://www.mate-desktop.org/])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([shell])
@@ -30,7 +30,7 @@ changequote([,])dnl
IT_PROG_INTLTOOL([0.37.1])
-GETTEXT_PACKAGE=mate-control-center-2.0
+GETTEXT_PACKAGE=mate-control-center
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
diff --git a/distro/ubuntu/build b/distro/ubuntu/build
deleted file mode 100755
index cf538273..00000000
--- a/distro/ubuntu/build
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# fill it
-pkgname=mate-control-center
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="The Control Center for MATE"
-#depends="mate-window-manager, libxss, desktop-file-utils, mate-settings-daemon, libmatekbd, libcanberra, sound-theme-freedesktop, libunique, mate-menus, librsvg"
-# editar esta funcion!
-build() {
- cd $pkgsrc
- # descomprimir
- tar xvzf download
- # entramos a la carpeta
- cd ${pkgname}
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --disable-scrollkeeper --disable-update-mimedb || return 1
- # --enable-aboutme <- this requires libebook (from evolution)
- make || return 1
- make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
- install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
- mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
- rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-
- # --disable-update-mimedb?
- rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
-}
-
-# esto incluye la parte que se repite en la mayoria de los builds
-. /usr/share/mate-doc-utils/mate-debian.sh
diff --git a/distro/ubuntu/postinst b/distro/ubuntu/postinst
deleted file mode 100755
index 850107d9..00000000
--- a/distro/ubuntu/postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-pkgname=mate-control-center
-
-if [ -f /usr/sbin/mateconfpkg ]; then
- /usr/sbin/mateconfpkg --install ${pkgname}
-fi
-
-update-desktop-database -q
-gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-update-mime-database /usr/share/mime
-
-exit 0
diff --git a/distro/ubuntu/postrm b/distro/ubuntu/postrm
deleted file mode 100755
index c27940a4..00000000
--- a/distro/ubuntu/postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-pkgname=mate-control-center
-
-update-desktop-database -q
-gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-update-mime-database /usr/share/mime
-
-exit 0
diff --git a/distro/ubuntu/preinst b/distro/ubuntu/preinst
deleted file mode 100755
index 9d1435d8..00000000
--- a/distro/ubuntu/preinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-pkgname=mate-control-center
-
-if [ -f /usr/sbin/mateconfpkg ]; then
- /usr/sbin/mateconfpkg --uninstall ${pkgname}
-fi
-
diff --git a/distro/ubuntu/prerm b/distro/ubuntu/prerm
deleted file mode 100755
index aeada993..00000000
--- a/distro/ubuntu/prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pkgname=mate-control-center
-
-if [ -f /usr/sbin/mateconfpkg ]; then
- /usr/sbin/mateconfpkg --uninstall ${pkgname}
-fi
-
-exit 0