From ae9befd601aa4478064ab04efeb8fd67bd90b49b Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 11:44:45 +0200 Subject: Fix EXTRA_DIST for applet gschemas The following fails to include the needed schemas files: $(gsettings_SCHEMAS_in_in) replacing it with: $(gsettings_SCHEMAS).in.in --- battstat/Makefile.am | 2 +- charpick/Makefile.am | 2 +- cpufreq/Makefile.am | 2 +- geyes/Makefile.am | 2 +- multiload/Makefile.am | 2 +- stickynotes/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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..5df6c0eb 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -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/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/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/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/stickynotes/Makefile.am b/stickynotes/Makefile.am index 9036bd7b..f79c5d08 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 -- cgit v1.2.1 From 25215717270bd9632434d4f809695023e24d766c Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 10:45:43 +0200 Subject: Remove MAINTAINERS (does not exist) file from extra dist --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ebe0fb51..86aa7635 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 \ -- cgit v1.2.1 From 4f764027a3a0ac87fb148e24adc63de634e20c0f Mon Sep 17 00:00:00 2001 From: infirit Date: Thu, 10 Oct 2013 18:12:43 +0200 Subject: Replace old gconf with gsettings schema --- po/POTFILES.in | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 889ae781..28823919 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,17 +7,17 @@ accessx-status/applet.c battstat/battstat_applet.c [type: gettext/glade]battstat/battstat_applet.ui battstat/battstat-hal.c -battstat/battstat.schemas.in [type: gettext/ini]battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in +battstat/org.mate.panel.applet.battstat.gschema.xml.in.in battstat/properties.c battstat/sounds/mate-battstat_applet.soundlist.in charpick/charpick.c -charpick/charpick.schemas.in [type: gettext/ini]charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in +charpick/org.mate.panel.applet.charpick.gschema.xml.in.in charpick/properties.c -cpufreq/cpufreq-applet.schemas.in [type: gettext/glade]cpufreq/cpufreq-preferences.ui [type: gettext/ini]cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in +cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in cpufreq/src/cpufreq-applet.c cpufreq/src/cpufreq-prefs.c cpufreq/src/cpufreq-monitor-cpuinfo.c @@ -27,11 +27,10 @@ cpufreq/src/cpufreq-popup.c cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in drivemount/drive-button.c drivemount/drivemount.c -drivemount/drivemount.schemas.in [type: gettext/ini]drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in geyes/geyes.c -geyes/geyes.schemas.in [type: gettext/ini]geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in +geyes/org.mate.panel.applet.geyes.gschema.xml.in.in geyes/themes.c mateweather/mateweather-about.c mateweather/mateweather-applet.c @@ -39,8 +38,9 @@ mateweather/mateweather-dialog.c mateweather/mateweather-pref.c mateweather/main.c [type: gettext/ini]mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in -invest-applet/data/Invest_Applet.server.in.in invest-applet/data/Invest_Applet.xml +invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in +invest-applet/data/org.mate.panel.applet.InvestAppletFactory.service.in [type: gettext/glade]invest-applet/data/financialchart.ui [type: gettext/glade]invest-applet/data/prefs-dialog.ui invest-applet/invest/about.py @@ -51,36 +51,15 @@ invest-applet/invest/preferences.py invest-applet/invest/quotes.py invest-applet/invest/widgets.py # NB. these are actually separate files -mini-commander/MATE_MiniCommanderApplet.server.in -mini-commander/src/about.c -mini-commander/src/cmd_completion.c -mini-commander/src/command_line.c -mini-commander/src/exec.c -mini-commander/src/help.c -mini-commander/src/history.c -mini-commander/src/macro.c -mini-commander/src/mc-install-default-macros.c -mini-commander/src/mini-commander-global.schemas.in -[type: gettext/glade]mini-commander/src/mini-commander.ui -mini-commander/src/mini-commander.schemas.in -mini-commander/src/mini-commander_applet.c -[type: gettext/ini]mini-commander/src/org.mate.applets.MiniCommanderApplet.mate-panel-applet.in.in -mini-commander/src/preferences.c -mixer/applet.c -mixer/dock.c -mixer/load.c -mixer/mixer.schemas.in -mixer/org.mate.applets.MixerApplet.mate-panel-applet.in.in -mixer/preferences.c modemlights/modem-applet.c [type: gettext/glade]modemlights/modemlights.ui [type: gettext/ini]modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in multiload/linux-proc.c multiload/load-graph.c multiload/main.c -multiload/multiload.schemas.in multiload/netspeed.c [type: gettext/ini]multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in +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 @@ -94,7 +73,7 @@ stickynotes/data/MATE_StickyNotesApplet.server.in [type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in stickynotes/stickynotes.c [type: gettext/glade]stickynotes/stickynotes.ui -stickynotes/stickynotes.schemas.in +stickynotes/org.mate.stickynotes.gschema.xml.in.in stickynotes/stickynotes_applet.c stickynotes/stickynotes_applet_callbacks.c stickynotes/stickynotes_callbacks.c -- cgit v1.2.1 From 9950cc8ad7eab15969eda995bb781df42fde16bf Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 11 Oct 2013 01:40:25 +0200 Subject: Remove Invest_Applet.xml from po/POTFILES.in It causes gettext to throw a fit and mateweather applet has a simular file and it is also not in POTFILES.in The error it throws is: junk after document element at line 2, column 0, byte 45 at /usr/lib64/perl5/vendor_perl/5.16.3/x86_64-linux/XML/Parser.pm line 187. /usr/bin/xgettext: error while opening "../invest-applet/data/Invest_Applet.xml.h" for reading: No such file or directory ERROR: xgettext failed to generate PO template file. Please consult error message above if there is any. --- po/POTFILES.in | 1 - 1 file changed, 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 28823919..c232bfe8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,7 +38,6 @@ mateweather/mateweather-dialog.c mateweather/mateweather-pref.c mateweather/main.c [type: gettext/ini]mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in -invest-applet/data/Invest_Applet.xml invest-applet/data/org.mate.applets.InvestApplet.mate-panel-applet.in.in invest-applet/data/org.mate.panel.applet.InvestAppletFactory.service.in [type: gettext/glade]invest-applet/data/financialchart.ui -- cgit v1.2.1 From b2c23bac8ae1b2f2adc8adc59f51be3d3477639c Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 11:58:37 +0200 Subject: Mixer applet moved, correct POTFILES.in --- po/POTFILES.in | 1 - 1 file changed, 1 deletion(-) 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 -- cgit v1.2.1 From 5b4d9d3cbdf81c4d27efcce771db92a88bab4eda Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 12:04:21 +0200 Subject: Mixer applet moved so also remove MATE_MixerApplet.server.in --- null_applet/MATE_MixerApplet.server.in | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 null_applet/MATE_MixerApplet.server.in 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 @@ - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1 From 6649d95a2e32e1c43f64c9b7ff29c3743f6d79bd Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 12:48:56 +0200 Subject: Fix make distcheck Just use CLEANFILES instead of DISTCLEANFILES Correct name, server -> service Add applet_DATA to CLEANFILES --- invest-applet/data/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 \ -- cgit v1.2.1 From 43219a49d40b7cf65de5c865d150fe5984660023 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 13:00:41 +0200 Subject: Make tar.xz and not tar.gz --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 45ab6e44..f7d19514 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 *************************************************************************** -- cgit v1.2.1 From 798494b4f7e10173e87558a5fbefd4cf199bb162 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 19 Oct 2013 13:30:27 +0200 Subject: Remove obsolete distro dir --- distro/archlinux/PKGBUILD | 45 ----------------------------------- distro/archlinux/mate-applets.install | 23 ------------------ 2 files changed, 68 deletions(-) delete mode 100644 distro/archlinux/PKGBUILD delete mode 100644 distro/archlinux/mate-applets.install 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 -} - -- cgit v1.2.1