[Pkg-xfce-commits] r6405 - desktop/branches/experimental/xfce4-settings/debian

Sun Feb 12 06:04:23 UTC 2012

Author: mrpouit-guest
Date: 2012-02-12 18:04:23 +0000 (Sun, 12 Feb 2012)
New Revision: 6405

Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
   desktop/branches/experimental/xfce4-settings/debian/compat
   desktop/branches/experimental/xfce4-settings/debian/control
   desktop/branches/experimental/xfce4-settings/debian/rules
   desktop/branches/experimental/xfce4-settings/debian/watch
Log:
New upstream development release; rebase against d/trunk/xfce4-settings

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================

--- desktop/branches/experimental/xfce4-settings/debian/changelog	2012-02-12 17:51:44 UTC (rev 6404)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2012-02-12 18:04:23 UTC (rev 6405)
@@ -1,25 +1,50 @@
-xfce4-settings (4.9.1-1) UNRELEASED; urgency=low
+xfce4-settings (4.9.2-1) UNRELEASED; urgency=low
 
-  * New upstream development release, including:
-    - Merge xfce4-settings-helper into xfsettingsd.
-    - Add support to xfsettingsd for pointing device properties.
-    - Rework the mouse dialog and add support for basic synaptics
-      and wacom settings.
-    - Add option to enable assistive technologies during login.
-    - Add fontconfig monitoring.
-    - Add theme dnd-installation by dropping in a treeview.
-    - Add new MIME Type editor.
+  * New upstream development release.
   * debian/control:
-    - bump libxfce4ui-1-dev b-dep to >= 4.9.0.
+    - bump libxfce4ui-1-dev b-dep to >= 4.9.0 and libexo-1-dev to >= 0.7.1.
     - remove xfce4-settings-helper from the long desc.
   * debian/xfce4-settings-helper.1: dropped.
-  * debian/patches/01_use-tango-icon-theme.patch: update to apply cleanly.
+  * debian/patches:
+    - 01_use-tango-icon-theme.patch: update to apply cleanly.
+    - 02_fix-error-in-italian-translation.patch: dropped, included upstream.
   * debian/postinst,debian/preinst,debian/postrm: handle removal of
     xfce4-settings-helper's autostart desktop file.
   * debian/xfsettingsd.1: refreshed for the new options.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 18 Aug 2011 12:53:37 +0200
 
+xfce4-settings (4.8.3-2) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 02_fix-error-in-italian-translation.patch: added, because translating
+      %i to %s isn't a really good idea (fix crash in the confirmation dialog
+      of xfce4-display-settings).                                   lp: #782634
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update debhelper build-dep to 9.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 07 Feb 2012 23:00:45 +0100
+
+xfce4-settings (4.8.3-1) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * New upstream release.
+  * debian/watch: only consider stable releases.
+
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use dpkg-dev 1.16.1 and debhelper 9 hardening support
+  * debian/control:
+    - drop hardening-includes build-dep.
+    - update debhelper build-dep to 8.9.4 for dpkg-buildflags support
+    - add dpkg-dev 1.16.1 build-dep for hardening support
+  * debian/compat bumped to 9.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 27 Oct 2011 21:50:31 +0200
+
 xfce4-settings (4.8.2-2) unstable; urgency=low
 
   * debian/patches:

Modified: desktop/branches/experimental/xfce4-settings/debian/compat
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/compat	2012-02-12 17:51:44 UTC (rev 6404)
+++ desktop/branches/experimental/xfce4-settings/debian/compat	2012-02-12 18:04:23 UTC (rev 6405)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/xfce4-settings/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	2012-02-12 17:51:44 UTC (rev 6404)
+++ desktop/branches/experimental/xfce4-settings/debian/control	2012-02-12 18:04:23 UTC (rev 6405)
@@ -4,10 +4,11 @@
 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),
- libxfce4ui-1-dev (>= 4.9.0), libexo-1-dev (>= 0.6.0),
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1),
+  libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.9.0), libexo-1-dev (>= 0.7.1),
  libxfconf-0-dev (>= 4.8.0), libwnck-dev, libxklavier-dev (>= 5.0), 
- libnotify-dev, intltool (>= 0.31), hardening-includes
+ libnotify-dev, intltool (>= 0.31)
 Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org

Modified: desktop/branches/experimental/xfce4-settings/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/rules	2012-02-12 17:51:44 UTC (rev 6404)
+++ desktop/branches/experimental/xfce4-settings/debian/rules	2012-02-12 18:04:23 UTC (rev 6405)
@@ -1,14 +1,8 @@
 #!/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_auto_configure:
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 	dh_auto_configure -- --enable-libnotify --enable-xcursor \

Modified: desktop/branches/experimental/xfce4-settings/debian/watch
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/watch	2012-02-12 17:51:44 UTC (rev 6404)
+++ desktop/branches/experimental/xfce4-settings/debian/watch	2012-02-12 18:04:23 UTC (rev 6405)
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/xfce/xfce4-settings/([\d\.]+)/ \
+http://archive.xfce.org/src/xfce/xfce4-settings/([\d\.]+[02468])/ \
 	xfce4-settings-([\d\.]+)\.tar\.(?:gz|bz2)


