[Pkg-xfce-commits] r7459 - in desktop/trunk/xfdesktop4: . debian
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 10:10:07 UTC 2013
Author: corsac
Date: 2013-05-21 22:10:07 +0000 (Tue, 21 May 2013)
New Revision: 7459
Modified:
desktop/trunk/xfdesktop4/
desktop/trunk/xfdesktop4/debian/changelog
desktop/trunk/xfdesktop4/debian/control
desktop/trunk/xfdesktop4/debian/rules
desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
Log:
merge changes from experimental
Property changes on: desktop/trunk/xfdesktop4
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/xfdesktop4:6488-7429
Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2013-05-21 22:06:07 UTC (rev 7458)
+++ desktop/trunk/xfdesktop4/debian/changelog 2013-05-21 22:10:07 UTC (rev 7459)
@@ -1,3 +1,68 @@
+xfdesktop4 (4.10.2-1) experimental; urgency=low
+
+ * New upstream bugfix release:
+ - Fix hang when no backdrop image is selected. closes: #702643
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 07 Apr 2013 15:17:13 +0200
+
+xfdesktop4 (4.10.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/rules:
+ - enable all hardening options.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 03 Mar 2013 15:35:09 +0100
+
+xfdesktop4 (4.10.0-2) experimental; urgency=low
+
+ * debian/control:
+ - update exo build-dep to 0.7. closes: #673730
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 21 May 2012 07:04:47 +0200
+
+xfdesktop4 (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 05 May 2012 14:15:27 +0200
+
+xfdesktop4 (4.9.3-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/xfdesktop4-data.install: updated, wallpapers have moved from
+ usr/share/xfce4/backdrops to usr/share/backgrounds/xfce.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 15 Apr 2012 16:18:20 +0200
+
+xfdesktop4 (4.9.2-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream development release:
+ - add support for single-click opening of items. closes: #547971
+ * debian/control:
+ - bumped minimal required versions of build-deps.
+ - recommends tumbler for thumbnailing support, drop xfce4-utils, deprecated
+ with Xfce 4.10.
+ * debian/rules:
+ - dropped obsolete --enable-exo configure flag, it's mandatory now.
+ - clean up unused overrides.
+ - drop --sourcedir=debian/tmp from dh_install, not needed.
+ * debian/xfdesktop4.postinst: dropped, was for 4.4 -> 4.6 upgrades only.
+ * debian/xfdesktop4-data.install: remove usr/share/doc, docs aren't generated
+ anymore and are online by default now.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update standards version to 3.9.3.
+ - update build-deps for 4.9.
+ * debian/rules:
+ - drop chrpath call.
+ - build with --parallel.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 22:24:45 +0200
+
xfdesktop4 (4.8.3-2) unstable; urgency=low
* debian/rules:
Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control 2013-05-21 22:06:07 UTC (rev 7458)
+++ desktop/trunk/xfdesktop4/debian/control 2013-05-21 22:10:07 UTC (rev 7459)
@@ -4,12 +4,12 @@
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 (>= 9), libglib2.0-dev (>= 2.18.0),
- libgtk2.0-dev (>= 2.14.0), libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0),
- libwnck-dev (>= 2.22), libxfconf-0-dev (>= 4.8.0), intltool, libdbus-glib-1-dev,
- libthunarx-2-dev (>= 1.2.0), libexo-1-dev (>= 0.6.0), libgarcon-1-0-dev (>= 0.1.2),
- libnotify-dev, chrpath, dpkg-dev (>= 1.16.1)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libglib2.0-dev, libgtk2.0-dev,
+ libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libwnck-dev,
+ libxfconf-0-dev (>= 4.10.0), intltool, libdbus-glib-1-dev (>= 0.84),
+ libthunarx-2-dev (>= 1.4.0), libexo-1-dev (>= 0.7.0),
+ libgarcon-1-0-dev (>= 0.2.0), libnotify-dev (>= 0.4.0), 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/xfdesktop4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/
Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules 2013-05-21 22:06:07 UTC (rev 7458)
+++ desktop/trunk/xfdesktop4/debian/rules 2013-05-21 22:10:07 UTC (rev 7459)
@@ -1,21 +1,14 @@
#!/usr/bin/make -f
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
override_dh_auto_configure:
- find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
dh_auto_configure -- --enable-thunarx --enable-exo \
--docdir=\$${prefix}/share/doc/xfdesktop4-data
-override_dh_auto_clean:
- rm -f po/POTFILES.skip
- dh_auto_clean
-
override_dh_install:
- chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/*
-
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --fail-missing
# why oh why is this necessary?
rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
@@ -28,4 +21,4 @@
dh_strip --dbg-package=xfdesktop4-dbg
%:
- dh $@
+ dh $@ --parallel
Modified: desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2013-05-21 22:06:07 UTC (rev 7458)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install 2013-05-21 22:10:07 UTC (rev 7459)
@@ -1,3 +1,4 @@
+usr/share/backgrounds
usr/share/icons
usr/share/locale
usr/share/man
@@ -2,3 +3 @@
usr/share/pixmaps
-usr/share/xfce4
-usr/share/doc/xfdesktop4-data
More information about the Pkg-xfce-commits
mailing list