[Pkg-xfce-commits] r4822 - in goodies/branches/experimental/xfce4-diskperf-plugin/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Fri Jan 21 02:38:53 UTC 2011
Author: corsac
Date: 2011-01-21 14:38:51 +0000 (Fri, 21 Jan 2011)
New Revision: 4822
Removed:
goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch
goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch
goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/03_apply-colors-at-startup.patch
goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series
Modified:
goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog
goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules
Log:
new upstream release, drop unneeded patches
Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog 2011-01-19 19:30:17 UTC (rev 4821)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/changelog 2011-01-21 14:38:51 UTC (rev 4822)
@@ -1,6 +1,7 @@
-xfce4-diskperf-plugin (2.2.0-4) UNRELEASED; urgency=low
+xfce4-diskperf-plugin (2.3.0-1) UNRELEASED; urgency=low
[ Yves-Alexis Perez ]
+ * New upstream release.
* debian/control:
- add build-dep on libxfcegui4-dev now that it's gone from
xfce4-panel-dev dependencies.
@@ -8,10 +9,6 @@
- add build-dep on xfce4-dev-tools because of the patch
touching configure.in.
- switch to linux-any architectures. closes: #604681
- * debian/patches:
- - 01_fix-linking-libxfcegui4 added, fix linking with libxfcegui4.
- - 02_fix-libtool added, fix an error with libtool calling inside
- autoreconf.
* Switch to 3.0 (quilt) source format.
* debian/rules:
- run xdt-autogen after patching.
@@ -19,11 +16,8 @@
[ Lionel Le Folgoc ]
* debian/rules: clean up autogenerated files changed by xdt-autogen.
* debian/control: add myself to Uploaders.
- * debian/patches:
- - 03_apply-colors-at-startup.patch: added, fixes missing colors on restart.
- - series: refreshed.
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 25 Nov 2010 11:41:07 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 21 Jan 2011 15:09:01 +0100
xfce4-diskperf-plugin (2.2.0-3) unstable; urgency=low
Deleted: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch 2011-01-19 19:30:17 UTC (rev 4821)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/01_fix-linking-libxfcegui4.patch 2011-01-21 14:38:51 UTC (rev 4822)
@@ -1,39 +0,0 @@
-commit 35af6821c13a7d20fe7fc31f964178e9fb369dfb
-Author: Landry Breuil <landry at rhaalovely.net>
-Date: Sun Aug 8 10:44:58 2010 +0200
-
- Be sure to have libxfcegui4 cflags/libs for xfce_err(), fixes
- compilation with xfce4-panel 4.7. (Bug #6609)
- Still needs to be converted to libxfce4ui though..
-
-diff --git a/configure.in b/configure.in
-index 6ea6bfb..8bbcf55 100644
---- a/configure.in
-+++ b/configure.in
-@@ -52,6 +52,7 @@ dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
-
- dnl ***********************************
- dnl *** Check for debugging support ***
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 604e7be..3c6b0f1 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -22,10 +22,12 @@ xfce4_diskperf_plugin_SOURCES = \
- devperf.h
-
- xfce4_diskperf_plugin_CFLAGS = \
-- $(LIBXFCE4PANEL_CFLAGS)
-+ $(LIBXFCE4PANEL_CFLAGS) \
-+ $(LIBXFCEGUI4_CFLAGS)
-
- xfce4_diskperf_plugin_LDADD= \
-- $(LIBXFCE4PANEL_LIBS)
-+ $(LIBXFCE4PANEL_LIBS) \
-+ $(LIBXFCEGUI4_LIBS)
-
- #
- # Desktop file
Deleted: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch 2011-01-19 19:30:17 UTC (rev 4821)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/02_fix-libtool.patch 2011-01-21 14:38:51 UTC (rev 4822)
@@ -1,21 +0,0 @@
-commit 2f7d6e565e9ce842a160cfdc9f0688222bdad560
-Author: Mike Massonnet <mmassonnet at xfce.org>
-Date: Sun Feb 22 10:43:52 2009 +0000
-
- * Call AC_PROG_LIBTOOL inside autoconf script
-
-
- (Old svn revision: 6750)
-
-diff --git a/configure.in b/configure.in
-index bc57a34..8155ab9 100644
---- a/configure.in
-+++ b/configure.in
-@@ -35,6 +35,7 @@ dnl ********************************
- AC_PROG_CC()
- AC_PROG_LD()
- AC_PROG_INSTALL()
-+AC_PROG_LIBTOOL()
- AC_PROG_INTLTOOL()
-
- dnl **********************************
Deleted: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/03_apply-colors-at-startup.patch
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/03_apply-colors-at-startup.patch 2011-01-19 19:30:17 UTC (rev 4821)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/03_apply-colors-at-startup.patch 2011-01-21 14:38:51 UTC (rev 4822)
@@ -1,21 +0,0 @@
-From 3e94c2c0f40f81098676c6839b5f6feb357307da Mon Sep 17 00:00:00 2001
-From: Landry Breuil <landry at rhaalovely.net>
-Date: Sat, 23 Jan 2010 11:59:51 +0000
-Subject: Apply color settings upon plugin startup.
-
-From Launchpad #232123, fwded' by Lionel Le Folgoc, thanks!
----
-diff --git a/panel-plugin/main.c b/panel-plugin/main.c
-index fe6d508..b43201b 100644
---- a/panel-plugin/main.c
-+++ b/panel-plugin/main.c
-@@ -553,6 +553,7 @@ static void diskperf_read_config (XfcePanelPlugin *plugin,
- if ((value = xfce_rc_read_entry (rc, (CONF_READ_WRITE_COLOR), NULL))) {
- gdk_color_parse (value, poConf->aoColor + RW_DATA);
- }
-+ SetMonitorBarColor (poPlugin);
-
- xfce_rc_close (rc);
- } /* diskperf_read_config() */
---
-cgit v0.8.3.4
Deleted: goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series 2011-01-19 19:30:17 UTC (rev 4821)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/patches/series 2011-01-21 14:38:51 UTC (rev 4822)
@@ -1,3 +0,0 @@
-01_fix-linking-libxfcegui4.patch
-02_fix-libtool.patch
-03_apply-colors-at-startup.patch
Modified: goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules 2011-01-19 19:30:17 UTC (rev 4821)
+++ goodies/branches/experimental/xfce4-diskperf-plugin/debian/rules 2011-01-21 14:38:51 UTC (rev 4822)
@@ -2,15 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-post-patches::
- NOCONFIGURE=1 xdt-autogen
-
-clean::
- rm -f $$(find -name 'Makefile.in*')
- rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
- rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
- rm -f missing mkinstalldirs
-
binary-post-install/xfce4-diskperf-plugin::
-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.a
-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.la
More information about the Pkg-xfce-commits
mailing list