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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-06-18 21:12:18 +0000 (Sat, 18 Jun 2011)
New Revision: 5799

Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/rules
Log:
debian/rules: set a different vendor in the about dialog if dpkg-vendor
is Ubuntu.

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2011-06-18 20:58:36 UTC (rev 5798)
+++ desktop/trunk/xfce4-utils/debian/changelog	2011-06-18 21:12:18 UTC (rev 5799)
@@ -1,3 +1,10 @@
+xfce4-utils (4.8.2-2) UNRELEASED; urgency=low
+
+  * debian/rules: set a different vendor in the about dialog if dpkg-vendor
+    is Ubuntu.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 18 Jun 2011 23:04:48 +0200
+
 xfce4-utils (4.8.2-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/trunk/xfce4-utils/debian/rules
===================================================================
--- desktop/trunk/xfce4-utils/debian/rules	2011-06-18 20:58:36 UTC (rev 5798)
+++ desktop/trunk/xfce4-utils/debian/rules	2011-06-18 21:12:18 UTC (rev 5799)
@@ -11,10 +11,15 @@
 
 export CFLAGS LDFLAGS
 
+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=Debian --with-x \
+	dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --with-x \
 		--with-browser=midori --docdir=\$${prefix}/share/doc/xfce4-utils \
 		--disable-xfconf-migration