[Pkg-xfce-commits] r4196 - desktop/branches/experimental/xfconf/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-07-28 18:54:29 +0000 (Wed, 28 Jul 2010)
New Revision: 4196

Modified:
   desktop/branches/experimental/xfconf/debian/changelog
   desktop/branches/experimental/xfconf/debian/control
   desktop/branches/experimental/xfconf/debian/rules
Log:
* debian/rules:
  - call dpkg-buildflags instead of doing manual tests
  - call dh_shlibdeps with special options only for xfconf; use
    --remaining-packages for the others.
* debian/control: bumped Standards-Version to 3.9.1, no further change.

Modified: desktop/branches/experimental/xfconf/debian/changelog
===================================================================
--- desktop/branches/experimental/xfconf/debian/changelog	2010-07-28 18:23:51 UTC (rev 4195)
+++ desktop/branches/experimental/xfconf/debian/changelog	2010-07-28 18:54:29 UTC (rev 4196)
@@ -5,6 +5,11 @@
 
   [ Lionel Le Folgoc ]
   * debian/libxfconf-0-2.symbols: added.
+  * debian/rules:
+    - call dpkg-buildflags instead of doing manual tests
+    - call dh_shlibdeps with special options only for xfconf; use
+      --remaining-packages for the others.
+  * debian/control: bumped Standards-Version to 3.9.1, no further change.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 10 Feb 2010 21:12:52 +0100
 

Modified: desktop/branches/experimental/xfconf/debian/control
===================================================================
--- desktop/branches/experimental/xfconf/debian/control	2010-07-28 18:23:51 UTC (rev 4195)
+++ desktop/branches/experimental/xfconf/debian/control	2010-07-28 18:54:29 UTC (rev 4196)
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0), 
  libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl,
  libextutils-depends-perl, libglib-perl, intltool
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfconf/

Modified: desktop/branches/experimental/xfconf/debian/rules
===================================================================
--- desktop/branches/experimental/xfconf/debian/rules	2010-07-28 18:23:51 UTC (rev 4195)
+++ desktop/branches/experimental/xfconf/debian/rules	2010-07-28 18:54:29 UTC (rev 4196)
@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
 
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 %:
 	dh $@
@@ -23,5 +20,6 @@
 	dh_strip --dbg-package=libxfconf-0-2-dbg
 
 override_dh_shlibdeps:
-	dh_shlibdeps -X debian/xfconf/usr/bin/xfconf-query -- \
+	dh_shlibdeps -p xfconf -X debian/xfconf/usr/bin/xfconf-query -- \
     -dRecommends debian/xfconf/usr/bin/xfconf-query -dDepends
+	dh_shlibdeps --remaining-packages