[Pkg-xfce-commits] r4201 - desktop/branches/experimental/xfce4-panel/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-07-29 20:42:26 +0000 (Thu, 29 Jul 2010)
New Revision: 4201

Modified:
   desktop/branches/experimental/xfce4-panel/debian/changelog
   desktop/branches/experimental/xfce4-panel/debian/control
   desktop/branches/experimental/xfce4-panel/debian/rules
   desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst
Log:
  - bump Standards-Version to 3.9.1.
* debian/xfce4-panel.postinst: explicitly set -e.
  - call dpkg-buildflags

Modified: desktop/branches/experimental/xfce4-panel/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/changelog	2010-07-29 20:28:37 UTC (rev 4200)
+++ desktop/branches/experimental/xfce4-panel/debian/changelog	2010-07-29 20:42:26 UTC (rev 4201)
@@ -4,13 +4,15 @@
   * debian/control:
     - refreshed (b-)deps for this new major release
     - add myself to Uploaders
-    - bump Standards-Version to 3.9.0.
+    - bump Standards-Version to 3.9.1.
   * debian/NEWS: dropped, unneeded.
   * debian/xfce4-panel.shlibs: refreshed, bump to (>= 4.7.2).
   * debian/xfce4-panel.lintian-overrides: refreshed, new lib name.
   * debian/xfce4-panel.preinst: added, handles removal of old conffiles.
+  * debian/xfce4-panel.postinst: explicitly set -e.
   * debian/*.install: refreshed.
   * debian/rules:
+    - call dpkg-buildflags
     - temporarily comment out LDFLAGS as it ftbfs with --as-needed
     - dropped rc files mangling as they don't exist anymore
     - updated removal of *.{l,}a files.

Modified: desktop/branches/experimental/xfce4-panel/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/control	2010-07-29 20:28:37 UTC (rev 4200)
+++ desktop/branches/experimental/xfce4-panel/debian/control	2010-07-29 20:42:26 UTC (rev 4201)
@@ -10,7 +10,7 @@
  libgtk2.0-dev (>= 2.14.0), libglib2.0-dev (>= 2.18.0),
  libdbus-glib-1-dev (>= 0.73), libcairo2-dev (>= 1.0.0),
  libwnck-dev (>= 2.22), libxml-parser-perl, intltool
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/

Modified: desktop/branches/experimental/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/rules	2010-07-29 20:28:37 UTC (rev 4200)
+++ desktop/branches/experimental/xfce4-panel/debian/rules	2010-07-29 20:42:26 UTC (rev 4201)
@@ -1,13 +1,9 @@
 #!/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
-
 override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.la
 	rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel-plugins/*.a

Modified: desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst	2010-07-29 20:28:37 UTC (rev 4200)
+++ desktop/branches/experimental/xfce4-panel/debian/xfce4-panel.postinst	2010-07-29 20:42:26 UTC (rev 4201)
@@ -1,5 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
 
+set -e
+
 if [ "$1" = "configure" ]; then
 	# Run ldconfig to update shared library system
 	ldconfig