[Pkg-xfce-commits] r7395 - in desktop/trunk/xfconf: . debian

Yves-Alexis Perez corsac at alioth.debian.org
Tue May 21 06:54:07 UTC 2013 

Author: corsac
Date: 2013-05-21 18:54:07 +0000 (Tue, 21 May 2013)
New Revision: 7395

Modified:
   desktop/trunk/xfconf/
   desktop/trunk/xfconf/debian/changelog
   desktop/trunk/xfconf/debian/compat
   desktop/trunk/xfconf/debian/control
   desktop/trunk/xfconf/debian/libxfconf-0-2.install
   desktop/trunk/xfconf/debian/libxfconf-0-dev.install
   desktop/trunk/xfconf/debian/rules
   desktop/trunk/xfconf/debian/xfconf.install
Log:
merge changes from experimental



Property changes on: desktop/trunk/xfconf
___________________________________________________________________
Added: svn:mergeinfo
   + /desktop/branches/experimental/xfconf:6539-7388

Modified: desktop/trunk/xfconf/debian/changelog
===================================================================
--- desktop/trunk/xfconf/debian/changelog	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/changelog	2013-05-21 18:54:07 UTC (rev 7395)
@@ -1,3 +1,43 @@
+xfconf (4.10.0-1) experimental; urgency=low
+
+  * New upstream stable release.
+  * debian/control: revert b-dep to unversioned libxfce4util -dev package, and
+    require >= 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Fri, 04 May 2012 21:40:42 +0200
+
+xfconf (4.9.1-1) experimental; urgency=low
+
+  * New upstream development release.
+  * debian/libxfconf-0-dev.install: drop *.a files, they aren't build anymore
+    with latest xfce4-dev-tools.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 15 Apr 2012 15:27:07 +0200
+
+xfconf (4.9.0-1) experimental; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream development release.
+    - update libxfce4util build-dep for 4.9.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop build-dep on hardening-includes.
+    - add depend on ${misc:Pre-Depends} on lib package for multi-arch.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+    - update paths for multi-arch.
+    - build with --parallel.
+  * debian/compat bumped to 9.
+  * debian/*.install:
+    - update paths for multi-arch.
+
+  [ Lionel Le Folgoc ]
+  * debian/rules:
+    - drop --sourcedir from dh_install, unneeded, and pass -X .la to ignore
+      .la files instead of deleting them manually.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 08 Apr 2012 15:56:33 +0200
+
 xfconf (4.8.1-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: desktop/trunk/xfconf/debian/compat
===================================================================
--- desktop/trunk/xfconf/debian/compat	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/compat	2013-05-21 18:54:07 UTC (rev 7395)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfconf/debian/control
===================================================================
--- desktop/trunk/xfconf/debian/control	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/control	2013-05-21 18:54:07 UTC (rev 7395)
@@ -4,10 +4,10 @@
 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~), libxfce4util-dev (>= 4.8.0), 
+Build-Depends: debhelper (>= 9), libxfce4util-dev (>= 4.10.0), 
  libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl, 
- libextutils-depends-perl, libglib-perl, intltool, hardening-includes
-Standards-Version: 3.9.2
+ libextutils-depends-perl, libglib-perl, 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/xfconf
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfconf/
@@ -29,6 +29,7 @@
 Package: libxfconf-0-2
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfconf
 Description: Client library for Xfce4 configure interface
  This package contains a library which can be used by every

Modified: desktop/trunk/xfconf/debian/libxfconf-0-2.install
===================================================================
--- desktop/trunk/xfconf/debian/libxfconf-0-2.install	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/libxfconf-0-2.install	2013-05-21 18:54:07 UTC (rev 7395)
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*


Property changes on: desktop/trunk/xfconf/debian/libxfconf-0-2.install
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: desktop/trunk/xfconf/debian/libxfconf-0-dev.install
===================================================================
--- desktop/trunk/xfconf/debian/libxfconf-0-dev.install	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/libxfconf-0-dev.install	2013-05-21 18:54:07 UTC (rev 7395)
@@ -1,5 +1,4 @@
 usr/include
-usr/lib/pkgconfig
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/pkgconfig
+usr/lib/*/lib*.so
 usr/share/gtk-doc

Modified: desktop/trunk/xfconf/debian/rules
===================================================================
--- desktop/trunk/xfconf/debian/rules	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/rules	2013-05-21 18:54:07 UTC (rev 7395)
@@ -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
-
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-perl-bindings
@@ -18,8 +12,7 @@
 override_dh_auto_test:
 
 override_dh_install:
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libxfconf-0.la
-	dh_install --fail-missing --sourcedir=debian/tmp
+	dh_install --fail-missing -X .la
 
 override_dh_strip:
 	dh_strip --dbg-package=libxfconf-0-2-dbg

Modified: desktop/trunk/xfconf/debian/xfconf.install
===================================================================
--- desktop/trunk/xfconf/debian/xfconf.install	2013-05-21 18:53:41 UTC (rev 7394)
+++ desktop/trunk/xfconf/debian/xfconf.install	2013-05-21 18:54:07 UTC (rev 7395)
@@ -1,4 +1,4 @@
 usr/share/dbus-1
 usr/share/locale
 usr/bin
-usr/lib/xfce4/xfconf/xfconfd
+usr/lib/*/xfce4/xfconf/xfconfd

More information about the Pkg-xfce-commits mailing list