[Pkg-xfce-commits] r4748 - desktop/branches/experimental/gtk2-engines-xfce/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-02 14:13:43 +0000 (Sun, 02 Jan 2011)
New Revision: 4748

Modified:
   desktop/branches/experimental/gtk2-engines-xfce/debian/changelog
   desktop/branches/experimental/gtk2-engines-xfce/debian/control
   desktop/branches/experimental/gtk2-engines-xfce/debian/rules
Log:
* debian/rules:
  - switch to dh 7 tiny rules
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add hardening flags to {C,LD}FLAGS.
  - add -O1, -z,defs and --as-needed to LDFLAGS
* debian/control:
  - add build-dep on hardening-includes.

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2011-01-02 13:55:36 UTC (rev 4747)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2011-01-02 14:13:43 UTC (rev 4748)
@@ -6,8 +6,15 @@
   [ Yves-Alexis Perez ]
   * New upstream release.
   * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - switch to dh 7 tiny rules
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
+    - add -O1, -z,defs and --as-needed to LDFLAGS
+  * debian/control:
+    - add build-dep on hardening-includes.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 14:46:47 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 14:52:29 +0100
 
 gtk2-engines-xfce (2.6.0-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/control	2011-01-02 13:55:36 UTC (rev 4747)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/control	2011-01-02 14:13:43 UTC (rev 4748)
@@ -3,7 +3,8 @@
 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 (>= 7), libgtk2.0-dev (>= 2.10.1), libx11-dev (> 2:1.0.0-6), chrpath
+Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.1), 
+ libx11-dev (> 2:1.0.0-6), chrpath, hardening-includes
 Standards-Version: 3.8.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2011-01-02 13:55:36 UTC (rev 4747)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2011-01-02 14:13:43 UTC (rev 4748)
@@ -1,78 +1,13 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/hardening-includes/hardening.make
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
 
-LDFLAGS +=-Wl,-z,-defs -Wl,--as-needed
+export CFLAGS LDFLAGS
 
-configure: configure-stamp
-configure-stamp:
-	
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp:  configure-stamp
-
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	
-	dh_testdir
-	dh_testroot
-	rm -f configure-stamp build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	$(MAKE) install DESTDIR=`pwd`/debian/gtk2-engines-xfce
-
-	#Don't ship .la files:
-	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.a
-	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.la
-
-	chrpath -d -k `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.10.0/engines/libxfce.so
-
-binary-indep: build install
-
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-
-	dh_gtkmodules
-
-	dh_strip
-	dh_compress
-
-	dh_fixperms
-	dh_installdeb
-	
-	dh_shlibdeps
-	dh_gencontrol
-	
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@