[Pkg-xfce-commits] r7410 - in desktop/tags/libxfce4ui: . 4.10.0-2 4.10.0-2/debian 4.10.0-2/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 08:01:55 UTC 2013
Author: corsac
Date: 2013-05-21 20:01:55 +0000 (Tue, 21 May 2013)
New Revision: 7410
Added:
desktop/tags/libxfce4ui/4.10.0-2/
desktop/tags/libxfce4ui/4.10.0-2/debian/
desktop/tags/libxfce4ui/4.10.0-2/debian/changelog
desktop/tags/libxfce4ui/4.10.0-2/debian/compat
desktop/tags/libxfce4ui/4.10.0-2/debian/control
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.shlibs
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.install
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.manpages
desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
desktop/tags/libxfce4ui/4.10.0-2/debian/rules
desktop/tags/libxfce4ui/4.10.0-2/debian/vendorinfo
desktop/tags/libxfce4ui/4.10.0-2/debian/xfce4-about.1
Removed:
desktop/tags/libxfce4ui/4.10.0-2/debian/
desktop/tags/libxfce4ui/4.10.0-2/debian/changelog
desktop/tags/libxfce4ui/4.10.0-2/debian/compat
desktop/tags/libxfce4ui/4.10.0-2/debian/control
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install
desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install
desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
desktop/tags/libxfce4ui/4.10.0-2/debian/rules
Log:
[svn-buildpackage] Tagging libxfce4ui 4.10.0-2
Property changes on: desktop/tags/libxfce4ui/4.10.0-2
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/libxfce4ui:6337-7388
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/changelog
===================================================================
--- desktop/trunk/libxfce4ui/debian/changelog 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/changelog 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1,47 +0,0 @@
-libxfce4ui (4.8.1-2) UNRELEASED; urgency=low
-
- * debian/patches: add missing DEP3 headers.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 20 Feb 2012 21:42:45 +0100
-
-libxfce4ui (4.8.1-1) unstable; urgency=low
-
- * New upstream bugfix release, including:
- - updated dutch translation. lp: #781043
- * debian/copyright: fix EOLs.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 28 Dec 2011 21:20:37 +0100
-
-libxfce4ui (4.8.0-4) unstable; urgency=low
-
- * debian/control:
- - fix glade-xfce Recommends on libxfce4ui-1-dev.
- * debian/patches:
- - 01_replace-ctrl-primary-gtk-shortcuts added, replace Control by Primary
- in keyboard shortcuts since Gtk+ switch broke current shortcuts.
- * debian/NEWS added to tell people how to rebind shortcuts broken by the
- Gtk+ upgrade.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 Dec 2011 15:39:18 +0100
-
-libxfce4ui (4.8.0-3) unstable; urgency=low
-
- * debian/rules:
- - cleanup .la files for glade too. closes: #633239
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 09 Jul 2011 15:34:01 +0200
-
-libxfce4ui (4.8.0-2) unstable; urgency=low
-
- * Upload to unstable.
- * debian/control:
- - drop Emanuele, Simon and Mike from uploaders.
- - update standards version to 3.9.2.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 15:56:59 +0200
-
-libxfce4ui (4.8.0-1) experimental; urgency=low
-
- * Initial release. closes: #612048
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 16:53:52 +0100
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/changelog (from rev 7404, desktop/trunk/libxfce4ui/debian/changelog)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/changelog (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/changelog 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,102 @@
+libxfce4ui (4.10.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/rules:
+ - enable all hardening flags.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 21 May 2013 21:32:57 +0200
+
+libxfce4ui (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/patches:
+ - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Fri, 04 May 2012 22:48:03 +0200
+
+libxfce4ui (4.9.2-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/xfce4-about.1, debian/libxfce4ui-utils.manpages: ship a manpage
+ for xfce4-about.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 15 Apr 2012 15:29:29 +0200
+
+libxfce4ui (4.9.1-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream development release.
+ * debian/control:
+ - add a new binary package libxfce4ui-utils to contain xfce4-about files
+ - libxfce4ui-utils breaks/replaces pre 4.10 xfce4-utils package, as it
+ previously shipped xfce4-about.
+ - use Breaks instead of Conflicts when possible.
+ * debian/patches:
+ - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly
+ and add DEP-3 headers.
+ * debian/libxfce4ui-1-0.shlibs: added.
+ * debian/rules: take vendor handling code from xfce4-utils for xfce4-about.
+ * debian/vendorinfo: added, taken from xfce4-utils, and renamed from
+ debian/Debian.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update standards version to 3.9.3.
+ - 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}.
+ - build-dep on libxfce4util6-dev to start using the new API and make the
+ -dev package depends on it.
+ * debian/rules:
+ - use hardening support in debhelper 9 and dpkg-dev 1.16.1
+ - multi-archify the paths.
+ - build with --parallel.
+ * debian/*.install:
+ - multi-archify the paths.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 16:03:09 +0200
+
+libxfce4ui (4.8.1-1) unstable; urgency=low
+
+ * New upstream bugfix release, including:
+ - updated dutch translation. lp: #781043
+ * debian/copyright: fix EOLs.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 28 Dec 2011 21:20:37 +0100
+
+libxfce4ui (4.8.0-4) unstable; urgency=low
+
+ * debian/control:
+ - fix glade-xfce Recommends on libxfce4ui-1-dev.
+ * debian/patches:
+ - 01_replace-ctrl-primary-gtk-shortcuts added, replace Control by Primary
+ in keyboard shortcuts since Gtk+ switch broke current shortcuts.
+ * debian/NEWS added to tell people how to rebind shortcuts broken by the
+ Gtk+ upgrade.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 Dec 2011 15:39:18 +0100
+
+libxfce4ui (4.8.0-3) unstable; urgency=low
+
+ * debian/rules:
+ - cleanup .la files for glade too. closes: #633239
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 09 Jul 2011 15:34:01 +0200
+
+libxfce4ui (4.8.0-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control:
+ - drop Emanuele, Simon and Mike from uploaders.
+ - update standards version to 3.9.2.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 15:56:59 +0200
+
+libxfce4ui (4.8.0-1) experimental; urgency=low
+
+ * Initial release. closes: #612048
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 16:53:52 +0100
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/compat
===================================================================
--- desktop/trunk/libxfce4ui/debian/compat 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/compat 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1 +0,0 @@
-7
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/compat (from rev 7398, desktop/trunk/libxfce4ui/debian/compat)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/compat (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/compat 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1 @@
+9
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/control
===================================================================
--- desktop/trunk/libxfce4ui/debian/control 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/control 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1,58 +0,0 @@
-Source: libxfce4ui
-Priority: optional
-Section: xfce
-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,
- libgtk2.0-dev, libstartup-notification0-dev, libglade2-dev, libgladeui-1-dev,
- libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), hardening-includes
-Standards-Version: 3.9.2
-Homepage: http://www.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/branches/experimental/libxfce4ui
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui
-
-Package: libxfce4ui-1-0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts
-Description: widget library for Xfce
- libxfce4ui is used to share commonly used Xfce widgets among the Xfce
- applications.
-
-Package: libxfce4ui-1-dev
-Section: libdevel
-Architecture: any
-Depends: libxfce4ui-1-0 (= ${binary:Version}), ${misc:Depends}, libgtk2.0-dev,
- libxfce4util-dev, libxfconf-0-dev
-Suggests: devhelp
-Description: Development files for libxfce4ui
- This package contains the headers and the static library
- for libxfce4ui.
-
-Package: libxfce4ui-1-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}, libxfce4ui-1-0 (= ${binary:Version}),
- ${misc:Depends}
-Description: debugging symbols for libxfce4ui
- This package contains debugging symbols and information for libxfce4ui.
-
-Package: xfce-keyboard-shortcuts
-Section: xfce
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libxfce4ui-1-0
-Conflicts: libxfcegui4-4 (<< 4.6.1-2)
-Description: xfce keyboard shortcuts configuration
- This package only contains the default shortcut configuration for Xfce.
-
-Package: glade-xfce
-Section: xfce
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: glade, libxfce4ui-1-dev
-Description: glade modules for xfce
- This package contains the modules that allow Glade to provide Xfce widgets in
- its palette.
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/control (from rev 7398, desktop/trunk/libxfce4ui/debian/control)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/control (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/control 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,80 @@
+Source: libxfce4ui
+Priority: optional
+Section: xfce
+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), intltool (>= 0.31), pkg-config,
+ libgtk2.0-dev, libstartup-notification0-dev, libglade2-dev, libgladeui-1-dev,
+ libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.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/branches/experimental/libxfce4ui
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui
+
+Package: libxfce4ui-1-0
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts
+Description: widget library for Xfce
+ libxfce4ui is used to share commonly used Xfce widgets among the Xfce
+ applications.
+
+Package: libxfce4ui-1-dev
+Section: libdevel
+Architecture: any
+Depends: libxfce4ui-1-0 (= ${binary:Version}), ${misc:Depends}, libgtk2.0-dev,
+ libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0)
+Suggests: devhelp
+Description: Development files for libxfce4ui
+ This package contains the headers and the static library
+ for libxfce4ui.
+
+Package: libxfce4ui-1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, libxfce4ui-1-0 (= ${binary:Version}),
+ ${misc:Depends}
+Description: debugging symbols for libxfce4ui
+ This package contains debugging symbols and information for libxfce4ui.
+
+Package: libxfce4ui-utils
+Section: xfce
+Architecture: any
+Depends: libxfce4ui-1-0 (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: xfce4-utils
+Replaces: xfce4-utils
+Description: Utility files for libxfce4ui
+ This package contains the Xfce settings plugin and the utility files for
+ libxfce4ui-1-0 which are:
+ - xfce4-about
+
+Package: libxfce4ui-utils-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libxfce4ui-utils (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}
+Description: debugging symbols for libxfce4ui-utils
+ This package contains debugging symbols and information for libxfce4ui-utils.
+
+Package: xfce-keyboard-shortcuts
+Section: xfce
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libxfce4ui-1-0
+Breaks: libxfcegui4-4 (<< 4.6.1-2)
+Description: xfce keyboard shortcuts configuration
+ This package only contains the default shortcut configuration for Xfce.
+
+Package: glade-xfce
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: glade, libxfce4ui-1-dev
+Description: glade modules for xfce
+ This package contains the modules that allow Glade to provide Xfce widgets in
+ its palette.
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1,2 +0,0 @@
-usr/lib/lib*.so.*
-usr/share/locale/
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install (from rev 7398, desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.install 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/share/locale/
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.shlibs (from rev 7398, desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.shlibs (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-0.shlibs 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,2 @@
+libxfce4ui-1 0 libxfce4ui-1-0 (>= 4.9.0)
+libxfce4kbd-private-2 0 libxfce4ui-1-0 (>= 4.8.0)
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/share/gtk-doc/*
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install (from rev 7398, desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-1-dev.install 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/libxfce4*.so
+usr/lib/*/pkgconfig/*
+usr/share/gtk-doc/*
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.install (from rev 7398, desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.install)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.install (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.install 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,4 @@
+usr/share/applications
+usr/share/icons
+usr/bin/xfce4-about
+debian/vendorinfo usr/share/xfce4
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.manpages (from rev 7398, desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.manpages)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.manpages (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/libxfce4ui-utils.manpages 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1 @@
+debian/xfce4-about.1
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
===================================================================
--- desktop/trunk/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1,21 +0,0 @@
-Description: Control modifier appears as Primary when setting shortcuts with gtk >= 2.24.7
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8056
-
-Index: libxfce4ui-4.8.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
-===================================================================
---- libxfce4ui-4.8.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-01-16 16:01:09.000000000 +0100
-+++ libxfce4ui-4.8.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-11-28 16:04:43.777907660 +0100
-@@ -4,10 +4,10 @@
- <property name="commands" type="empty">
- <property name="default" type="empty">
- <property name="<Alt>F2" type="string" value="xfrun4"/>
-- <property name="<Control><Alt>Delete" type="string" value="xflock4"/>
-+ <property name="<Primary><Alt>Delete" type="string" value="xflock4"/>
- <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
- <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
-- <property name="<Control>Escape" type="string" value="xfdesktop --menu"/>
-+ <property name="<Primary>Escape" type="string" value="xfdesktop --menu"/>
- </property>
- </property>
- <property name="xfwm4" type="empty">
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch (from rev 7398, desktop/trunk/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,21 @@
+Description: Control modifier appears as Primary when setting shortcuts with gtk >= 2.24.7
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8056
+
+Index: libxfce4ui-4.9.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
+===================================================================
+--- libxfce4ui-4.9.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-01-16 16:01:09.000000000 +0100
++++ libxfce4ui-4.9.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-11-28 16:04:43.777907660 +0100
+@@ -10,10 +10,10 @@
+ <property name="<Alt>F3" type="string" value="xfce4-appfinder">
+ <property name="startup-notify" type="bool" value="true"/>
+ </property>
+- <property name="<Control><Alt>Delete" type="string" value="xflock4"/>
++ <property name="<Primary><Alt>Delete" type="string" value="xflock4"/>
+ <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+ <property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
+- <property name="<Control>Escape" type="string" value="xfdesktop --menu"/>
++ <property name="<Primary>Escape" type="string" value="xfdesktop --menu"/>
+ <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
+ <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+ </property>
Deleted: desktop/tags/libxfce4ui/4.10.0-2/debian/rules
===================================================================
--- desktop/trunk/libxfce4ui/debian/rules 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/rules 2013-05-21 20:01:55 UTC (rev 7410)
@@ -1,22 +0,0 @@
-#!/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 CFLAGS LDFLAGS
-
-%:
- dh $@
-
-override_dh_install:
- rm $(CURDIR)/debian/tmp/usr/lib/*.la
- rm $(CURDIR)/debian/tmp/usr/lib/glade3/modules/*.la
- rm $(CURDIR)/debian/tmp/usr/share/glade3/catalogs/libxfce4ui.xml.in
- dh_install --fail-missing
-
-override_dh_strip:
- dh_strip --dbg-package=libxfce4ui-1-dbg
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/rules (from rev 7400, desktop/trunk/libxfce4ui/debian/rules)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/rules (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/rules 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+XFVENDOR=Debian
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
+ XFVENDOR=Xubuntu
+endif
+
+%:
+ dh $@ --parallel
+
+override_dh_auto_configure:
+ dh_auto_configure -- --with-vendor-info=$(XFVENDOR)
+
+override_dh_install:
+ rm $(CURDIR)/debian/tmp/usr/share/glade3/catalogs/libxfce4ui.xml.in
+ dh_install --fail-missing -X .la
+
+override_dh_strip:
+ dh_strip --dbg-package=libxfce4ui-1-dbg
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/vendorinfo (from rev 7398, desktop/trunk/libxfce4ui/debian/vendorinfo)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/vendorinfo (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/vendorinfo 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,9 @@
+Debian Xfce Team is <pkg-xfce-devel at lists.alioth.debian.org>
+
+Co maintainers are:
+
+Yves-Alexis Perez <corsac at debian.org>
+Lionel Le Folgoc <mrpouit at gmail.com>
+
+Bugs should be reported to Debian BTS at: http://bugs.debian.org or using
+reportbug.
Copied: desktop/tags/libxfce4ui/4.10.0-2/debian/xfce4-about.1 (from rev 7398, desktop/trunk/libxfce4ui/debian/xfce4-about.1)
===================================================================
--- desktop/tags/libxfce4ui/4.10.0-2/debian/xfce4-about.1 (rev 0)
+++ desktop/tags/libxfce4ui/4.10.0-2/debian/xfce4-about.1 2013-05-21 20:01:55 UTC (rev 7410)
@@ -0,0 +1,31 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.8.
+.TH XFCE4-ABOUT "1" "April 2012" "xfce4-about 4.9.2 (Xfce 4.10)" "User Commands"
+.SH NAME
+xfce4-about \- About and Credits dialog for Xfce
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+xfce4\-about [OPTION...]
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Version information
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+.SH COPYRIGHT
+Copyright \(co 2008\-2011
+.IP
+The Xfce development team. All rights reserved.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/>.
More information about the Pkg-xfce-commits
mailing list