Merge pull request #59 from infirit/master

Move to gucharmap + make distcheck now works

14 files changed, 38 insertions, 126 deletions

diff --git a/Makefile.am b/Makefile.am
index 003b60b4..0d440fc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,6 @@ DIST_SUBDIRS = \
 	null_applet
 
 EXTRA_DIST = \
-	MAINTAINERS \
 	m4/ac-define-dir.m4 \
 	COPYING-DOCS \
 	intltool-update.in \
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index b96dee20..4985f251 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -99,7 +99,7 @@ EXTRA_DIST = 							\
 	$(ui_DATA)						\
 	org.mate.applets.BattstatApplet.mate-panel-applet.in.in	\
 	$(service_in_files)					\
-	$(gsettings_SCHEMAS_in_in)
+	$(gsettings_SCHEMAS).in.in
 
 
 -include $(top_srcdir)/git.mk
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 678a06f1..b4c7d1d4 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS =					\
 	-I$(srcdir)				\
 	-DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"	\
 	$(MATE_APPLETS4_CFLAGS)		\
-	$(MUCHARMAP_CFLAGS)
+	$(GUCHARMAP_CFLAGS)
 
 libexec_PROGRAMS = charpick_applet2
 
@@ -15,7 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
 
 charpick_applet2_LDADD = \
 		       $(MATE_APPLETS4_LIBS)	\
-		       $(MUCHARMAP_LIBS)
+		       $(GUCHARMAP_LIBS)
 
 appletdir       = $(datadir)/mate-panel/applets
 applet_in_files = org.mate.applets.CharpickerApplet.mate-panel-applet.in
@@ -54,6 +54,6 @@ EXTRA_DIST =							\
 	org.mate.applets.CharpickerApplet.mate-panel-applet.in.in	\
 	$(service_in_files)					\
 	$(ui_DATA)						\
-	$(gsettings_SCHEMAS_in_in)
+	$(gsettings_SCHEMAS).in.in
 
 -include $(top_srcdir)/git.mk
diff --git a/charpick/charpick.c b/charpick/charpick.c
index 54048794..6f5e766e 100644
--- a/charpick/charpick.c
+++ b/charpick/charpick.c
@@ -6,8 +6,8 @@
 #include <string.h>
 #include <mate-panel-applet.h>
 #include <mate-panel-applet-gsettings.h>
-#ifdef HAVE_MUCHARMAP
-#	include <mucharmap/mucharmap.h>
+#ifdef HAVE_GUCHARMAP
+#	include <gucharmap/gucharmap.h>
 #endif
 #include "charpick.h"
 
@@ -457,13 +457,13 @@ build_table(charpick_data *p_curr_data)
     g_utf8_strncpy (label, charlist, 1);
     charlist = g_utf8_next_char (charlist);
 
-#ifdef HAVE_MUCHARMAP
+#ifdef HAVE_GUCHARMAP
     /* TRANSLATOR: This sentance reads something like 'Insert "PILCROW SIGN"'
      *             hopefully, the name of the unicode character has already
      *             been translated.
      */
     name = g_strdup_printf (_("Insert \"%s\""),
-		    mucharmap_get_unicode_name (g_utf8_get_char (label)));
+		    gucharmap_get_unicode_name (g_utf8_get_char (label)));
 #else
     name = g_strdup (_("Insert special character"));
 #endif
diff --git a/configure.ac b/configure.ac
index 8e8788bb..510b19c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_INIT(mate-applets, 1.6.1)
 AC_PREREQ(2.59)
 
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gz])
 AC_CONFIG_MACRO_DIR(m4)
 
 dnl ***************************************************************************
@@ -28,8 +28,8 @@ PYGTK_REQUIRED=2.6
 PYGOBJECT_REQUIRED=2.6
 MATE_ICON_THEME_REQUIRED=1.1.0
 LIBXML_REQUIRED=2.5.0
-MUCHARMAP2_REQUIRED=1.5.0
-MUCHARMAP_REQUIRED=1.4.0
+GUCHARMAP2_REQUIRED=2.33.0
+GUCHARMAP_REQUIRED=1.4.0
 POLKIT_REQUIRED=0.92
 NETWORKMANAGER_REQUIRED=0.7
 dnl ***************************************************************************
@@ -238,27 +238,27 @@ fi
 AC_SUBST(UPOWER_CFLAGS)
 AC_SUBST(UPOWER_LIBS)
 
-dnl -- check for mucharmap (optional) -----------------------------------------
+dnl -- check for gucharmap (optional) -----------------------------------------
 
-PKG_CHECK_EXISTS([mucharmap-2 >= $MUCHARMAP2_REQUIRED],
-                 [have_mucharmap=yes have_mucharmap_2=yes],[have_mucharmap_2=no])
-if test "$have_mucharmap_2" = "yes"; then
-      PKG_CHECK_MODULES([MUCHARMAP],[mucharmap-2 >= $MUCHARMAP2_REQUIRED])
+PKG_CHECK_EXISTS([gucharmap-2 >= $GUCHARMAP2_REQUIRED],
+                 [have_gucharmap=yes have_gucharmap_2=yes],[have_gucharmap_2=no])
+if test "$have_gucharmap_2" = "yes"; then
+      PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2 >= $GUCHARMAP2_REQUIRED])
 else
-      PKG_CHECK_MODULES([MUCHARMAP], [mucharmap >= $MUCHARMAP_REQUIRED],
-                        [have_mucharmap=yes],[have_mucharmap=no])
+      PKG_CHECK_MODULES([GUCHARMAP], [gucharmap >= $GUCHARMAP_REQUIRED],
+                        [have_gucharmap=yes],[have_gucharmap=no])
 fi
 
-if test "$have_mucharmap_2" = "yes"; then
-        AC_DEFINE([HAVE_MUCHARMAP_2],[1],[Define if mucharmap API is version 2])
+if test "$have_gucharmap_2" = "yes"; then
+        AC_DEFINE([HAVE_GUCHARMAP_2],[1],[Define if gucharmap API is version 2])
 fi
-if test "$have_mucharmap" = "yes"; then
-	AC_DEFINE([HAVE_MUCHARMAP],[1],[Mucharmap Available])
+if test "$have_gucharmap" = "yes"; then
+	AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
 else
-  AC_MSG_WARN([*** 'charpick' applet will not be built with mucharmap support ***])
+  AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
 fi
-AC_SUBST(MUCHARMAP_CFLAGS)
-AC_SUBST(MUCHARMAP_LIBS)
+AC_SUBST(GUCHARMAP_CFLAGS)
+AC_SUBST(GUCHARMAP_LIBS)
 
 dnl -- check for Python modules (optional) ------------------------------
 PYGTK_CFLAGS=
@@ -713,8 +713,8 @@ mate-applets-$VERSION configure summary:
         - accessx-status           $HAVE_XKB
         - battstat                 $build_battstat_applet
         - charpick                 always
-            - mucharmap support    $have_mucharmap
-            - mucharmap-2 support  $have_mucharmap_2
+            - gucharmap support    $have_gucharmap
+            - gucharmap-2 support  $have_gucharmap_2
         - cpufreq                  $build_cpufreq_applet
             - building selector    $enable_selector
             - using PolicyKit      $HAVE_POLKIT
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index e6a63607..9e821585 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -46,7 +46,7 @@ CLEANFILES = \
 EXTRA_DIST = \
              org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in	\
              $(service_in_files)				\
-	     $(gsettings_SCHEMAS_in_in)				\
+	     $(gsettings_SCHEMAS).in.in				\
 	     $(builder_DATA)                 			\
 	     $(ui_DATA)
 	     
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index 92cd1ba0..00000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-pkgname=mate-applets
-pkgver=1.1.3
-pkgrel=1
-pkgdesc="Applets for MATE panel"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gstreamer0.10-base-plugins' 'mate-panel' 'libgtop' 'libmatenotify' 'cpufrequtils')
-makedepends=('mate-doc-utils' 'pkgconfig' 'mate-settings-daemon' 'intltool' 'mate-icon-theme' 'networkmanager' 'mate-character-map') # 'mate-python-desktop'
-groups=('mate-extras')
-options=(!emptydirs)
-replace=('gnome-applets')
-conflicts=('gnome-applets')
-url="http://matsusoft.com.ar/projects/mate/"
-install=mate-applets.install
-source=()
-sha256sums=()
-
-build() {
-	cd "${srcdir}/../../../"
-    PYTHON=/usr/bin/python2 ./autogen.sh \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/mate-applets \
-        --disable-static \
-        --disable-scrollkeeper \
-        --enable-polkit \
-        --enable-networkmanager \
-        --enable-mixer-applet \
-        --enable-mini-commander \
-        --enable-frequency-selector \
-        --enable-ipv6 \
-        --disable-schemas-install || return 1
-    make || return 1
-}
-
-package() {
-	cd "${srcdir}/../../../"
-
-    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
-}
diff --git a/distro/archlinux/mate-applets.install b/distro/archlinux/mate-applets.install
deleted file mode 100644
index 410aa833..00000000
--- a/distro/archlinux/mate-applets.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=mate-applets
-
-post_install() {
-    usr/sbin/mateconfpkg --install ${pkgname}
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    usr/sbin/mateconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index ce734cd4..791d36fa 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -65,7 +65,7 @@ EXTRA_DIST = \
 	     README.themes					\
 	     org.mate.applets.GeyesApplet.mate-panel-applet.in.in 	\
              $(service_in_files)				\
-	     $(gsettings_SCHEMAS_in_in)				\
+	     $(gsettings_SCHEMAS).in.in				\
 	     $(ui_DATA)						\
 	     $(icons)
 
diff --git a/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index 333040df..fa9177cc 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -45,9 +45,13 @@ investbindir = $(libdir)/invest-applet
 # Build rules
 # ******************************************************************************
 
-DISTCLEANFILES = \
-	$(server_in_files) \
-	$(server_in_files:.server.in=.server)
+CLEANFILES = \
+	$(applet_DATA) \
+	$(applet_DATA).in \
+	$(service_in_files) \
+	$(service_in_files:.service.in=.service)
+
+
 
 EXTRA_DIST = \
 	org.mate.applets.InvestApplet.mate-panel-applet.in.in \
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 4e12090c..e6073c5b 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -39,7 +39,7 @@ gsettings_SCHEMAS = org.mate.panel.applet.multiload.gschema.xml
 EXTRA_DIST =							\
 	org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in	\
 	$(service_in_files)					\
-	$(gsettings_SCHEMAS_in_in)			\
+	$(gsettings_SCHEMAS).in.in			\
 	$(ui_DATA)
 
 uidir		= $(datadir)/mate-2.0/ui
diff --git a/null_applet/MATE_MixerApplet.server.in b/null_applet/MATE_MixerApplet.server.in
deleted file mode 100644
index 54b6f6e9..00000000
--- a/null_applet/MATE_MixerApplet.server.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:MATE_MixerApplet"
-	    type="factory" 
-	    location="OAFIID:MATE_NullApplet_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/>
-		<item value="IDL:MateComponent/Control:1.0"/>
-		<item value="IDL:MateComponent/Unknown:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
-	<oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
-	<oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
-	<oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/>
-        <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/>
-        <oaf_attribute name="bugzilla:component" type="string" value="mixer"/>
-        <oaf_attribute name="bugzilla:other_binaries" type="string" value="mixer_applet2"/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c232bfe8..21f3aa3d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,7 +62,6 @@ multiload/org.mate.panel.applet.multiload.gschema.xml.in.in
 multiload/properties.c
 null_applet/MATE_CDPlayerApplet.server.in
 null_applet/MATE_MailcheckApplet_Factory.server.in
-null_applet/MATE_MixerApplet.server.in
 null_applet/MATE_NullApplet_Factory.server.in.in
 null_applet/MATE_Panel_WirelessApplet.server.in
 null_applet/MATE_KeyboardApplet.server.in
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 0206a41d..1444451f 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -79,7 +79,7 @@ endif
 EXTRA_DIST = \
 	     $(builder_files) \
 	     $(ui_files) \
-	     $(gsettings_SCHEMAS_in_in) \
+	     $(gsettings_SCHEMAS).in.in \
 	     $(convert_DATA) \
              $(service_in_files) \
 	     org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in