[Pkg-xfce-commits] r6546 - desktop/branches/experimental/libxfce4util/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Mar 31 11:14:31 UTC 2012
Author: corsac
Date: 2012-03-31 11:14:30 +0000 (Sat, 31 Mar 2012)
New Revision: 6546
Modified:
desktop/branches/experimental/libxfce4util/debian/changelog
desktop/branches/experimental/libxfce4util/debian/compat
desktop/branches/experimental/libxfce4util/debian/control
desktop/branches/experimental/libxfce4util/debian/libxfce4util6-dev.install
desktop/branches/experimental/libxfce4util/debian/libxfce4util6.install
desktop/branches/experimental/libxfce4util/debian/rules
Log:
- update debhelper build dep to 9.
- add build-dep on dpkg-dev 1.16.1.
- drop hardening-includes build-dep.
- add Pre-Depends on ${misc:Pre-Depends} for multi-arch.
* debian/compat bumped to 8
* debian/libxfce4util6-dev.install:
- update paths for multi-arch.
* debian/libxfce4util6.install:
- update paths for multi-arch.
* debian/rules:
- use hardening support of debhelper 9 and dpkg-dev 1.16.1.
Modified: desktop/branches/experimental/libxfce4util/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/changelog 2012-03-31 10:51:13 UTC (rev 6545)
+++ desktop/branches/experimental/libxfce4util/debian/changelog 2012-03-31 11:14:30 UTC (rev 6546)
@@ -10,8 +10,18 @@
- rename -dev package to follow API change.
* debian/control:
- update standards version to 3.9.3.
- * debian/libxfce4util-dev.install:
+ - update debhelper build dep to 9.
+ - add build-dep on dpkg-dev 1.16.1.
+ - drop hardening-includes build-dep.
+ - add Pre-Depends on ${misc:Pre-Depends} for multi-arch.
+ * debian/compat bumped to 8
+ * debian/libxfce4util6-dev.install:
- stop shipping static file, it's not built by default anymore anyway.
+ - update paths for multi-arch.
+ * debian/libxfce4util6.install:
+ - update paths for multi-arch.
+ * debian/rules:
+ - use hardening support of debhelper 9 and dpkg-dev 1.16.1.
-- Yves-Alexis Perez <corsac at debian.org> Fri, 30 Mar 2012 22:57:18 +0200
Modified: desktop/branches/experimental/libxfce4util/debian/compat
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/compat 2012-03-31 10:51:13 UTC (rev 6545)
+++ desktop/branches/experimental/libxfce4util/debian/compat 2012-03-31 11:14:30 UTC (rev 6546)
@@ -1 +1 @@
-7
+9
Modified: desktop/branches/experimental/libxfce4util/debian/control
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/control 2012-03-31 10:51:13 UTC (rev 6545)
+++ desktop/branches/experimental/libxfce4util/debian/control 2012-03-31 11:14:30 UTC (rev 6546)
@@ -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~), libglib2.0-dev, intltool,
- hardening-includes
+Build-Depends: debhelper (>= 9), libglib2.0-dev, intltool,
+ dpkg-dev (>= 1.16.1)
Standards-Version: 3.9.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4util/
@@ -28,6 +28,7 @@
Package: libxfce4util6
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util-common
Recommends: libxfce4util-bin
Description: Utility functions library for Xfce4
Modified: desktop/branches/experimental/libxfce4util/debian/libxfce4util6-dev.install
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/libxfce4util6-dev.install 2012-03-31 10:51:13 UTC (rev 6545)
+++ desktop/branches/experimental/libxfce4util/debian/libxfce4util6-dev.install 2012-03-31 11:14:30 UTC (rev 6546)
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
usr/share/gtk-doc/html/libxfce4util/*
Modified: desktop/branches/experimental/libxfce4util/debian/libxfce4util6.install
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/libxfce4util6.install 2012-03-31 10:51:13 UTC (rev 6545)
+++ desktop/branches/experimental/libxfce4util/debian/libxfce4util6.install 2012-03-31 11:14:30 UTC (rev 6546)
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
Modified: desktop/branches/experimental/libxfce4util/debian/rules
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/rules 2012-03-31 10:51:13 UTC (rev 6545)
+++ desktop/branches/experimental/libxfce4util/debian/rules 2012-03-31 11:14:30 UTC (rev 6546)
@@ -1,16 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
-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 CFLAGS LDFLAGS
-
override_dh_install:
- rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4util.la
+ rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libxfce4util.la
dh_install --fail-missing
override_dh_strip:
More information about the Pkg-xfce-commits
mailing list