[Pkg-xfce-commits] r2969 - in desktop/trunk/xfce4-panel/debian: . patches

corsac at alioth.debian.org corsac at alioth.debian.org
Mon Mar 16 21:24:58 UTC 2009 

Author: corsac
Date: 2009-03-16 21:24:57 +0000 (Mon, 16 Mar 2009)
New Revision: 2969

Added:
   desktop/trunk/xfce4-panel/debian/patches/
   desktop/trunk/xfce4-panel/debian/patches/01_fix-wl-as-needed.patch
   desktop/trunk/xfce4-panel/debian/patches/series
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/compat
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/rules
Log:
* Upload to unstable.
* debian/rules:
  - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
  - re-add quilt rules.
  - replace dh_clean -k by dh_prep.
* debian/control:
  - bump standards version to 3.8.1.
  - add build-dep on quilt.
  - bump debhelper build-dep to 7.
* debian/compat bumped to 7.
* debian/patches:
  - 01_fix-wl-as-needed added, fix build with -Wl,--as-needed.

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2009-03-16 20:09:29 UTC (rev 2968)
+++ desktop/trunk/xfce4-panel/debian/changelog	2009-03-16 21:24:57 UTC (rev 2969)
@@ -1,3 +1,20 @@
+xfce4-panel (4.6.0-2) UNRELEASED; urgency=low
+
+  * Upload to unstable.
+  * debian/rules:
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+    - re-add quilt rules.
+    - replace dh_clean -k by dh_prep.
+  * debian/control:
+    - bump standards version to 3.8.1.
+    - add build-dep on quilt.
+    - bump debhelper build-dep to 7.
+  * debian/compat bumped to 7.
+  * debian/patches:
+    - 01_fix-wl-as-needed added, fix build with -Wl,--as-needed.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 16 Mar 2009 21:50:27 +0100
+
 xfce4-panel (4.6.0-1) experimental; urgency=low
 
   [ Xfce 4.6 Alpha “Pinkie”]

Modified: desktop/trunk/xfce4-panel/debian/compat
===================================================================
--- desktop/trunk/xfce4-panel/debian/compat	2009-03-16 20:09:29 UTC (rev 2968)
+++ desktop/trunk/xfce4-panel/debian/compat	2009-03-16 21:24:57 UTC (rev 2969)
@@ -1 +1 @@
-6
+7

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2009-03-16 20:09:29 UTC (rev 2968)
+++ desktop/trunk/xfce4-panel/debian/control	2009-03-16 21:24:57 UTC (rev 2969)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>> 6.0.7), libgtk2.0-dev (>= 2.10.6), bison,
+Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.6), bison,
  libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.6.0),
  libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libwnck-dev,
- libxml-parser-perl, intltool
-Standards-Version: 3.8.0
+ libxml-parser-perl, intltool, quilt
+Standards-Version: 3.8.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/

Added: desktop/trunk/xfce4-panel/debian/patches/01_fix-wl-as-needed.patch
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/01_fix-wl-as-needed.patch	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/01_fix-wl-as-needed.patch	2009-03-16 21:24:57 UTC (rev 2969)
@@ -0,0 +1,12 @@
+diff --git a/libxfce4panel/Makefile.in b/libxfce4panel/Makefile.in
+index d2c1f17..556b0c2 100644
+--- a/libxfce4panel/Makefile.in
++++ b/libxfce4panel/Makefile.in
+@@ -382,6 +382,7 @@ libxfce4panel_la_LDFLAGS = -export-dynamic -export-symbols-regex \
+ 	"^[^_].*" -version-info $(LIBXFCE4PANEL_VERINFO) \
+ 	$(PLATFORM_LDFLAGS) $(am__append_1)
+ libxfce4panel_la_LIBADD = \
++	-lX11								\
+ 	$(GTK_LIBS)							\
+ 	$(LIBXFCE4UTIL_LIBS)
+ 

Added: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/series	2009-03-16 21:24:57 UTC (rev 2969)
@@ -0,0 +1 @@
+01_fix-wl-as-needed.patch

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2009-03-16 20:09:29 UTC (rev 2968)
+++ desktop/trunk/xfce4-panel/debian/rules	2009-03-16 21:24:57 UTC (rev 2969)
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
-#include /usr/share/quilt/quilt.make
+include /usr/share/quilt/quilt.make
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -17,14 +18,14 @@
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
 
-build: build-stamp
+build: patch build-stamp
 build-stamp: config.status
 	
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot
@@ -38,7 +39,7 @@
 	
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
@@ -88,4 +89,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch

More information about the Pkg-xfce-commits mailing list