[Pkg-xfce-commits] r6357 - desktop/branches/experimental/xfce4-utils/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-01-23 20:29:32 +0000 (Mon, 23 Jan 2012)
New Revision: 6357

Removed:
   desktop/branches/experimental/xfce4-utils/debian/Debian
Modified:
   desktop/branches/experimental/xfce4-utils/debian/control
   desktop/branches/experimental/xfce4-utils/debian/rules
Log:
disable more things to avoid conflicts with 4.9.x components

Deleted: desktop/branches/experimental/xfce4-utils/debian/Debian
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/Debian	2012-01-23 19:54:55 UTC (rev 6356)
+++ desktop/branches/experimental/xfce4-utils/debian/Debian	2012-01-23 20:29:32 UTC (rev 6357)
@@ -1,9 +0,0 @@
-Debian Xfce Team is <pkg-xfce-devel at lists.alioth.debian.org>
-
-Co maintainers are:
-
-Yves-Alexis Perez <corsac at debian.org>
-Lionel Le Folgoc <mrpouit at gmail.com>
-
-Bugs should be reported to Debian BTS at: http://bugs.debian.org or using
-reportbug.

Modified: desktop/branches/experimental/xfce4-utils/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/control	2012-01-23 19:54:55 UTC (rev 6356)
+++ desktop/branches/experimental/xfce4-utils/debian/control	2012-01-23 20:29:32 UTC (rev 6357)
@@ -5,7 +5,7 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 8.9.4), libxfce4util-dev (>= 4.8.0), 
- dpkg-dev (>= 1.16.1), libxfce4ui-1-dev (>= 4.8.0), chrpath, intltool, 
+ dpkg-dev (>= 1.16.1), libxfce4ui-1-dev (>= 4.8.0), intltool, 
  libgtk2.0-dev (>= 2.10.0), libdbus-glib-1-dev (>= 0.33),
  xfce4-dev-tools, libtool
 Standards-Version: 3.9.2

Modified: desktop/branches/experimental/xfce4-utils/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/rules	2012-01-23 19:54:55 UTC (rev 6356)
+++ desktop/branches/experimental/xfce4-utils/debian/rules	2012-01-23 20:29:32 UTC (rev 6357)
@@ -4,15 +4,10 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 export PWD=$(shell pwd)
 
-XFVENDOR=Debian
-ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
-	XFVENDOR=Xubuntu
-endif
-
 override_dh_auto_configure:
 	find .pc -type f -exec echo '{}' \; >> po/POTFILES.skip
 	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --with-x \
+	dh_auto_configure -- --with-x \
 		--with-browser=midori --docdir=\$${prefix}/share/doc/xfce4-utils \
 		--disable-xfconf-migration
 
@@ -27,11 +22,6 @@
 		fi; \
 	done
 
-	install -D -m 644 `pwd`/debian/Debian \
-		`pwd`/debian/xfce4-utils/usr/share/xfce4/Debian
-
-	chrpath -d -k `pwd`/debian/xfce4-utils/usr/bin/xfrun4 \
-		`pwd`/debian/xfce4-utils/usr/bin/xfce4-about
 	chmod +x `pwd`/debian/xfce4-utils/etc/xdg/xfce4/xinitrc
 
 	# Clean up for 4.9 compatibility