[Pkg-xfce-commits] r6403 - desktop/trunk/garcon/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-02-12 17:30:44 +0000 (Sun, 12 Feb 2012)
New Revision: 6403

Modified:
   desktop/trunk/garcon/debian/changelog
   desktop/trunk/garcon/debian/compat
   desktop/trunk/garcon/debian/control
   desktop/trunk/garcon/debian/libgarcon-1-0-dev.install
   desktop/trunk/garcon/debian/libgarcon-1-0.install
   desktop/trunk/garcon/debian/rules
   desktop/trunk/garcon/debian/watch
Log:
* New upstream release.
* debian/rules:
  - use debhelper 9 hardening support.
* Fix paths for multiarch dirs.
* debian/compat bumped to 9.
* debian/control:
  - drop hardening-includes build-dep.
  - update debhelper build-dep to 9 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.
  - pre-depends on multiarch-support.
* debian/watch: updated, garcon moved to core.

Modified: desktop/trunk/garcon/debian/changelog
===================================================================
--- desktop/trunk/garcon/debian/changelog	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/changelog	2012-02-12 17:30:44 UTC (rev 6403)
@@ -1,3 +1,19 @@
+garcon (0.1.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - use debhelper 9 hardening support.
+  * Fix paths for multiarch dirs.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep to 9 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+    - pre-depends on multiarch-support.
+  * debian/watch: updated, garcon moved to core.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 12 Feb 2012 18:15:13 +0100
+
 garcon (0.1.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/garcon/debian/compat
===================================================================
--- desktop/trunk/garcon/debian/compat	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/compat	2012-02-12 17:30:44 UTC (rev 6403)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/garcon/debian/control
===================================================================
--- desktop/trunk/garcon/debian/control	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/control	2012-02-12 17:30:44 UTC (rev 6403)
@@ -4,8 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), intltool (>= 0.31), pkg-config,
- libglib2.0-dev, libgtk2.0-dev, libxfce4util-dev (>= 4.8.0), hardening-includes
+Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config,
+ libglib2.0-dev, libgtk2.0-dev, libxfce4util-dev (>= 4.8.0), dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/garcon
@@ -23,6 +23,7 @@
 Package: libgarcon-1-0
 Section: libs
 Architecture: any
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgarcon-common
 Description: freedesktop.org compliant menu implementation for Xfce
  garcon is a menu implementation that is compliant with the Desktop Menu

Modified: desktop/trunk/garcon/debian/libgarcon-1-0-dev.install
===================================================================
--- desktop/trunk/garcon/debian/libgarcon-1-0-dev.install	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/libgarcon-1-0-dev.install	2012-02-12 17:30:44 UTC (rev 6403)
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/gtk-doc/html/garcon/*

Modified: desktop/trunk/garcon/debian/libgarcon-1-0.install
===================================================================
--- desktop/trunk/garcon/debian/libgarcon-1-0.install	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/libgarcon-1-0.install	2012-02-12 17:30:44 UTC (rev 6403)
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: desktop/trunk/garcon/debian/rules
===================================================================
--- desktop/trunk/garcon/debian/rules	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/rules	2012-02-12 17:30:44 UTC (rev 6403)
@@ -1,18 +1,14 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@
 
 override_dh_install:
-	dh_install --fail-missing -X usr/lib/libgarcon-1.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/*/libgarcon-1.la
+	dh_install --fail-missing
 
 override_dh_strip:
 	dh_strip --dbg-package=libgarcon-1-0-dbg

Modified: desktop/trunk/garcon/debian/watch
===================================================================
--- desktop/trunk/garcon/debian/watch	2012-02-12 17:09:58 UTC (rev 6402)
+++ desktop/trunk/garcon/debian/watch	2012-02-12 17:30:44 UTC (rev 6403)
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/libs/garcon/([\d\.]+)/ \
+http://archive.xfce.org/src/xfce/garcon/([\d\.]+)/ \
 	garcon-([\d\.]+)\.tar\.(?:gz|bz2)