r30789 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in gnome-settings-daemon.maintscript gnome-settings-daemon.postinst gnome-settings-daemon.postrm gnome-settings-daemon.preinst

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Oct 19 07:46:02 UTC 2011


Author: biebl
Date: Wed Oct 19 07:46:02 2011
New Revision: 30789

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30789
Log:
* Use the new maintscript facility in dh_installdeb to remove the obsolete
  conffiles:
  - Bump Build-Depends on debhelper to (>= 8.1.0~).
  - Add Pre-Depends: ${misc:Pre-Depends}.
  - Replace preinst/postinst/postrm scripts with a
    gnome-bluetooth.maintscript file.

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

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=30789&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Wed Oct 19 07:46:02 2011
@@ -1,3 +1,14 @@
+gnome-settings-daemon (3.0.3-4) UNRELEASED; urgency=low
+
+  * Use the new maintscript facility in dh_installdeb to remove the obsolete
+    conffiles:
+    - Bump Build-Depends on debhelper to (>= 8.1.0~).
+    - Add Pre-Depends: ${misc:Pre-Depends}.
+    - Replace preinst/postinst/postrm scripts with a
+      gnome-bluetooth.maintscript file.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 19 Oct 2011 09:45:33 +0200
+
 gnome-settings-daemon (3.0.3-3) unstable; urgency=low
 
   * debian/patches/03_deal_with_absence_of_gnome-session.patch:

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=30789&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control [utf-8] Wed Oct 19 07:46:02 2011
@@ -9,7 +9,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs,
-               debhelper (>= 8),
+               debhelper (>= 8.1.0~),
                gnome-pkg-tools,
                dh-autoreconf,
                autotools-dev,
@@ -43,6 +43,7 @@
 
 Package: gnome-settings-daemon
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgnome2-common,

Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=30789&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] Wed Oct 19 07:46:02 2011
@@ -4,7 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
-               debhelper (>= 8),
+               debhelper (>= 8.1.0~),
                gnome-pkg-tools,
                dh-autoreconf,
                autotools-dev,
@@ -38,6 +38,7 @@
 
 Package: gnome-settings-daemon
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgnome2-common,

Added: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript?rev=30789&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript (added)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript [utf-8] Wed Oct 19 07:46:02 2011
@@ -1,0 +1,8 @@
+rm_conffile /etc/xdg/autostart/gnome-settings-daemon.desktop 2.26.1 gnome-settings-daemon
+rm_conffile /etc/gnome/config/xrdb 2.24.1 gnome-settings-daemon
+rm_conffile /etc/gnome/config/Editres.ad 3.0.3-2 gnome-settings-daemon
+rm_conffile /etc/gnome/config/Tk.ad 3.0.3-2 gnome-settings-daemon
+rm_conffile /etc/gnome/config/Emacs.ad 3.0.3-2 gnome-settings-daemon
+rm_conffile /etc/gnome/config/Motif.ad 3.0.3-2 gnome-settings-daemon
+rm_conffile /etc/gnome/config/General.ad 3.0.3-2 gnome-settings-daemon
+rm_conffile /etc/gnome/config/Xaw.ad 3.0.3-2 gnome-settings-daemon




More information about the pkg-gnome-commits mailing list