r30803 - in /desktop/unstable/gnome-menus/debian: changelog control control.in gnome-menus.maintscript gnome-menus.postinst gnome-menus.postrm gnome-menus.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct 19 19:20:12 2011
New Revision: 30803

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30803
Log:
Use the .maintscript facility provided by dh_installdeb to cleanup the old
conffiles.

Added:
    desktop/unstable/gnome-menus/debian/gnome-menus.maintscript
Removed:
    desktop/unstable/gnome-menus/debian/gnome-menus.postrm
    desktop/unstable/gnome-menus/debian/gnome-menus.preinst
Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/control
    desktop/unstable/gnome-menus/debian/control.in
    desktop/unstable/gnome-menus/debian/gnome-menus.postinst

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=30803&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Wed Oct 19 19:20:12 2011
@@ -1,8 +1,13 @@
 gnome-menus (3.0.1-3) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Add xterm to the blacklist.
 
- -- Josselin Mouette <joss at debian.org>  Wed, 19 Oct 2011 14:08:39 +0200
+  [ Michael Biebl ]
+  * Use the .maintscript facility provided by dh_installdeb to cleanup the old
+    conffiles.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 19 Oct 2011 21:19:28 +0200
 
 gnome-menus (3.0.1-2) unstable; urgency=low
 

Modified: desktop/unstable/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control?rev=30803&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/control [utf-8] Wed Oct 19 19:20:12 2011
@@ -8,7 +8,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Marc 'HE' Brockschmidt <he at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.0~),
                cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.15.2),
                python-all-dev,
@@ -25,6 +25,7 @@
 
 Package: gnome-menus
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},

Modified: desktop/unstable/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control.in?rev=30803&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/control.in [utf-8] Wed Oct 19 19:20:12 2011
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.0~),
                cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.15.2),
                python-all-dev,
@@ -20,6 +20,7 @@
 
 Package: gnome-menus
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},

Added: desktop/unstable/gnome-menus/debian/gnome-menus.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.maintscript?rev=30803&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.maintscript (added)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.maintscript [utf-8] Wed Oct 19 19:20:12 2011
@@ -1,0 +1,2 @@
+rm_conffile /etc/xdg/menus/gnome-preferences.menu 2.22.2-4 gnome-menu
+rm_conffile /etc/xdg/menus/gnome-settings.menu 2.30.3-2 gnome-menu

Modified: desktop/unstable/gnome-menus/debian/gnome-menus.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.postinst?rev=30803&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.postinst [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.postinst [utf-8] Wed Oct 19 19:20:12 2011
@@ -7,10 +7,4 @@
     exit 0
 fi
 
-# Remove no-longer used conffiles
-dpkg-maintscript-helper rm_conffile \
-	/etc/xdg/menus/gnome-preferences.menu 2.22.2-4 -- "$@"
-dpkg-maintscript-helper rm_conffile \
-	/etc/xdg/menus/gnome-settings.menu 2.30.3-2 -- "$@"
-
 #DEBHELPER#