r30815 - /desktop/experimental/gnome-menus/debian/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Oct 19 21:41:51 UTC 2011 

Author: biebl
Date: Wed Oct 19 21:41:50 2011
New Revision: 30815

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30815
Log:
Merge changes from unstable branch

Added:
    desktop/experimental/gnome-menus/debian/gnome-menus.maintscript
Removed:
    desktop/experimental/gnome-menus/debian/gnome-menus.postrm
    desktop/experimental/gnome-menus/debian/gnome-menus.preinst
Modified:
    desktop/experimental/gnome-menus/debian/changelog
    desktop/experimental/gnome-menus/debian/control
    desktop/experimental/gnome-menus/debian/control.in
    desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install
    desktop/experimental/gnome-menus/debian/gnome-menus.install
    desktop/experimental/gnome-menus/debian/gnome-menus.postinst
    desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install
    desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install
    desktop/experimental/gnome-menus/debian/menus.blacklist

Modified: desktop/experimental/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/changelog?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/changelog [utf-8] Wed Oct 19 21:41:50 2011
@@ -9,6 +9,19 @@
   * Remove pysupport depends, gnome-menus bindings go via GI now.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Mon, 17 Oct 2011 16:26:37 +0100
+
+gnome-menus (3.0.1-3) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Add xterm to the blacklist.
+
+  [ Michael Biebl ]
+  * Use the .maintscript facility provided by dh_installdeb to cleanup the old
+    conffiles.
+  * Update the last unfixed version to 3.0.1-2 as we missed to remove the old
+    conffile for users upgrading from 2.30.3-2+b1. Closes: #645446
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 19 Oct 2011 23:21:39 +0200
 
 gnome-menus (3.0.1-2) unstable; urgency=low
 

Modified: desktop/experimental/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control [utf-8] Wed Oct 19 21:41:50 2011
@@ -7,8 +7,8 @@
 Section: gnome
 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>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 8),
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 8.1.0~),
                cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.29.15),
                gnome-pkg-tools,
@@ -24,6 +24,7 @@
 
 Package: gnome-menus
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends}

Modified: desktop/experimental/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control.in?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control.in [utf-8] Wed Oct 19 21:41:50 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.29.15),
                gnome-pkg-tools,
@@ -19,6 +19,7 @@
 
 Package: gnome-menus
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends}

Modified: desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install [utf-8] Wed Oct 19 21:41:50 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0
+usr/lib/girepository-1.0

Modified: desktop/experimental/gnome-menus/debian/gnome-menus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.install?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.install [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.install [utf-8] Wed Oct 19 21:41:50 2011
@@ -1,9 +1,9 @@
-debian/tmp/etc
-debian/tmp/usr/bin
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/gnome-menus
+etc
+usr/bin
+usr/share/locale
+usr/share/applications
+usr/share/gnome-menus
+usr/share/desktop-directories
 debian/gnome-menus-blacklist /usr/sbin
 debian/menus.blacklist /etc/gnome
-debian/tmp/usr/share/desktop-directories
 debian/desktop-files/*.directory /usr/share/desktop-directories

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

Modified: desktop/experimental/gnome-menus/debian/gnome-menus.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.postinst?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.postinst [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.postinst [utf-8] Wed Oct 19 21:41:50 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#

Modified: desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install [utf-8] Wed Oct 19 21:41:50 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/*.so.*
+usr/lib/*.so.*

Modified: desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install [utf-8] Wed Oct 19 21:41:50 2011
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/share/gir-1.0
+usr/lib/*.a
+usr/lib/*.so
+usr/include
+usr/lib/pkgconfig
+usr/share/gir-1.0

Modified: desktop/experimental/gnome-menus/debian/menus.blacklist
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/menus.blacklist?rev=30815&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/menus.blacklist [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/menus.blacklist [utf-8] Wed Oct 19 21:41:50 2011
@@ -189,3 +189,7 @@
 idle-python2.4.desktop
 idle-python2.5.desktop
 idle-python2.6.desktop
+
+# XTerm
+debian-xterm.desktop
+debian-uxterm.desktop

More information about the pkg-gnome-commits mailing list