[Pkg-xfce-commits] r5350 - desktop/trunk/xfce4-utils/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-06 08:43:27 +0000 (Wed, 06 Apr 2011)
New Revision: 5350

Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/control
   desktop/trunk/xfce4-utils/debian/rules
Log:
* debian/rules:
  - disable the perl 4.4 → 4.6 migration script since we won't suppport
    direct upgrades.
  - remove libxml-parser-perl dependency since we no disable the perl
    migration script.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2011-04-06 06:17:02 UTC (rev 5349)
+++ desktop/trunk/xfce4-utils/debian/changelog	2011-04-06 08:43:27 UTC (rev 5350)
@@ -1,13 +1,16 @@
 xfce4-utils (4.8.1-2) UNRELEASED; urgency=low
 
   * Upload to unstable.
+  * debian/rules:
+    - disable the perl 4.4 → 4.6 migration script since we won't suppport
+      direct upgrades.
   * debian/Debian: update maintainers.
   * debian/control:
     - remove Emanuele and Simon from uploaders, thanks to them.
-    - demote libxml-parser-perl to suggests since it's only used for
-      4.4 → 4.6 migration.
+    - remove libxml-parser-perl dependency since we no disable the perl
+      migration script.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 06 Apr 2011 08:15:55 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 06 Apr 2011 10:42:08 +0200
 
 xfce4-utils (4.8.1-1) experimental; urgency=low
 

Modified: desktop/trunk/xfce4-utils/debian/control
===================================================================
--- desktop/trunk/xfce4-utils/debian/control	2011-04-06 06:17:02 UTC (rev 5349)
+++ desktop/trunk/xfce4-utils/debian/control	2011-04-06 08:43:27 UTC (rev 5350)
@@ -20,7 +20,7 @@
  x11-xserver-utils, xinit, exo-utils
 Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore |
  xlockmore-gl, dbus-x11, xinput, xdg-user-dirs
-Suggests: xfce4-session, libxml-parser-perl
+Suggests: xfce4-session
 Description: Various tools for Xfce
  This package contains xfrun4, xfterm4, xflock4, xfmountdev4, xfbrowser4,
  startxfce4, xfhelp4, xfce4-about, eight tools for Xfce.  Xfce is a desktop

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2011-04-06 06:17:02 UTC (rev 5349)
+++ desktop/trunk/xfce4-utils/debian/rules	2011-04-06 08:43:27 UTC (rev 5350)
@@ -15,7 +15,8 @@
 	find .pc -type f -exec echo '{}' \; >> po/POTFILES.skip
 	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure -- --with-vendor-info=Debian --with-x \
-		--with-browser=midori --docdir=\$${prefix}/share/doc/xfce4-utils
+		--with-browser=midori --docdir=\$${prefix}/share/doc/xfce4-utils \
+		--disable-xfconf-migration
 
 override_dh_install:
 	rm -f `pwd`/debian/xfce4-utils/usr/lib/xfce4/mcs-plugins/*.la