r13219 - in /desktop/unstable/gnome-system-monitor/debian: changelog control control.in patches/02_fix-distclean.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Oct 22 12:48:18 UTC 2007 

Author: joss
Date: Mon Oct 22 12:48:18 2007
New Revision: 13219

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13219
Log:
* 02_fix-distclean.patch: don't remove gnome-doc-utils.make in the
  distclean target. Closes: #442578.
* Switch to quilt for patch handling to work around #414305.
  Build-depend on quilt.
* Also include patchsys-quilt.mk after gnome.mk.

Added:
    desktop/unstable/gnome-system-monitor/debian/patches/02_fix-distclean.patch
    desktop/unstable/gnome-system-monitor/debian/patches/series
Modified:
    desktop/unstable/gnome-system-monitor/debian/changelog
    desktop/unstable/gnome-system-monitor/debian/control
    desktop/unstable/gnome-system-monitor/debian/control.in
    desktop/unstable/gnome-system-monitor/debian/rules

Modified: desktop/unstable/gnome-system-monitor/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/changelog?rev=13219&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/changelog (original)
+++ desktop/unstable/gnome-system-monitor/debian/changelog Mon Oct 22 12:48:18 2007
@@ -1,3 +1,13 @@
+gnome-system-monitor (2.20.0-2) UNRELEASED; urgency=low
+
+  * 02_fix-distclean.patch: don't remove gnome-doc-utils.make in the
+    distclean target. Closes: #442578.
+  * Switch to quilt for patch handling to work around #414305.
+    Build-depend on quilt.
+  * Also include patchsys-quilt.mk after gnome.mk.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 22 Oct 2007 14:46:23 +0200
+
 gnome-system-monitor (2.20.0-1) unstable; urgency=low
 
   * New upstream release:

Modified: desktop/unstable/gnome-system-monitor/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control?rev=13219&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control (original)
+++ desktop/unstable/gnome-system-monitor/debian/control Mon Oct 22 12:48:18 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Loic Minier <lool at dooz.org>, Oystein Gisnas <oystein at gisnas.net>, Riccardo Setti <giskard at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Oystein Gisnas <oystein at gisnas.net>, Riccardo Setti <giskard at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.0),
                debhelper (>= 5),
                libgtk2.0-dev (>= 2.8.0),
@@ -21,7 +21,8 @@
                gnome-icon-theme (>= 2.15.3),
                libpcre3-dev (>= 6.4),
                libgtkmm-2.4-dev (>= 2.8),
-               gnome-doc-utils
+               gnome-doc-utils,
+               quilt
 Standards-Version: 3.7.2
 
 Package: gnome-system-monitor

Modified: desktop/unstable/gnome-system-monitor/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/control.in?rev=13219&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/control.in (original)
+++ desktop/unstable/gnome-system-monitor/debian/control.in Mon Oct 22 12:48:18 2007
@@ -21,7 +21,8 @@
                gnome-icon-theme (>= 2.15.3),
                libpcre3-dev (>= 6.4),
                libgtkmm-2.4-dev (>= 2.8),
-               gnome-doc-utils
+               gnome-doc-utils,
+               quilt
 Standards-Version: 3.7.2
 
 Package: gnome-system-monitor

Added: desktop/unstable/gnome-system-monitor/debian/patches/02_fix-distclean.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/02_fix-distclean.patch?rev=13219&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/02_fix-distclean.patch (added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/02_fix-distclean.patch Mon Oct 22 12:48:18 2007
@@ -1,0 +1,22 @@
+diff -pruN gnome-system-monitor-2.20.0.orig/Makefile.am gnome-system-monitor-2.20.0/Makefile.am
+--- gnome-system-monitor-2.20.0.orig/Makefile.am	2007-01-30 23:38:52.000000000 +0100
++++ gnome-system-monitor-2.20.0/Makefile.am	2007-10-22 14:30:56.424866449 +0200
+@@ -19,7 +19,6 @@ Applications_DATA = $(Applications_in_fi
+ distuninstallcheck_listfiles = find . -type f -print | grep -v 'scrollkeeper'
+ 
+ DISTCLEANFILES = \
+-  gnome-doc-utils.make \
+   intltool-extract \
+   intltool-merge \
+   intltool-update \
+diff -pruN gnome-system-monitor-2.20.0.orig/Makefile.in gnome-system-monitor-2.20.0/Makefile.in
+--- gnome-system-monitor-2.20.0.orig/Makefile.in	2007-09-17 17:18:45.000000000 +0200
++++ gnome-system-monitor-2.20.0/Makefile.in	2007-10-22 14:31:15.825972055 +0200
+@@ -258,7 +258,6 @@ Applications_in_files = gnome-system-mon
+ Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
+ distuninstallcheck_listfiles = find . -type f -print | grep -v 'scrollkeeper'
+ DISTCLEANFILES = \
+-  gnome-doc-utils.make \
+   intltool-extract \
+   intltool-merge \
+   intltool-update \

Added: desktop/unstable/gnome-system-monitor/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/patches/series?rev=13219&op=file
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/patches/series (added)
+++ desktop/unstable/gnome-system-monitor/debian/patches/series Mon Oct 22 12:48:18 2007
@@ -1,0 +1,4 @@
+01_load_library_instead_of_so.patch
+02_fix-distclean.patch
+04_menu_change.patch
+80_use_units_coherent_with_gnome_desktop.patch

Modified: desktop/unstable/gnome-system-monitor/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-monitor/debian/rules?rev=13219&op=diff
==============================================================================
--- desktop/unstable/gnome-system-monitor/debian/rules (original)
+++ desktop/unstable/gnome-system-monitor/debian/rules Mon Oct 22 12:48:18 2007
@@ -2,9 +2,9 @@
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk

More information about the pkg-gnome-commits mailing list