[Pkg-xfce-commits] r7398 - in desktop/trunk/libxfce4ui: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 07:28:14 UTC 2013
Author: corsac
Date: 2013-05-21 19:28:13 +0000 (Tue, 21 May 2013)
New Revision: 7398
Added:
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs
desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.install
desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.manpages
desktop/trunk/libxfce4ui/debian/vendorinfo
desktop/trunk/libxfce4ui/debian/xfce4-about.1
Modified:
desktop/trunk/libxfce4ui/
desktop/trunk/libxfce4ui/debian/changelog
desktop/trunk/libxfce4ui/debian/compat
desktop/trunk/libxfce4ui/debian/control
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install
desktop/trunk/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
desktop/trunk/libxfce4ui/debian/rules
Log:
merge changes from experimental
Property changes on: desktop/trunk/libxfce4ui
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/libxfce4ui:6337-7388
Modified: desktop/trunk/libxfce4ui/debian/changelog
===================================================================
--- desktop/trunk/libxfce4ui/debian/changelog 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/trunk/libxfce4ui/debian/changelog 2013-05-21 19:28:13 UTC (rev 7398)
@@ -1,3 +1,56 @@
+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-2) UNRELEASED; urgency=low
* debian/patches: add missing DEP3 headers.
Modified: desktop/trunk/libxfce4ui/debian/compat
===================================================================
--- desktop/trunk/libxfce4ui/debian/compat 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/trunk/libxfce4ui/debian/compat 2013-05-21 19:28:13 UTC (rev 7398)
@@ -1 +1 @@
-7
+9
Modified: desktop/trunk/libxfce4ui/debian/control
===================================================================
--- desktop/trunk/libxfce4ui/debian/control 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/trunk/libxfce4ui/debian/control 2013-05-21 19:28:13 UTC (rev 7398)
@@ -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~), intltool (>= 0.31), pkg-config,
+Build-Depends: debhelper (>= 9), 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
+ 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
@@ -15,6 +15,7 @@
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
@@ -24,7 +25,7 @@
Section: libdevel
Architecture: any
Depends: libxfce4ui-1-0 (= ${binary:Version}), ${misc:Depends}, libgtk2.0-dev,
- libxfce4util-dev, libxfconf-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
@@ -39,12 +40,33 @@
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
-Conflicts: libxfcegui4-4 (<< 4.6.1-2)
+Breaks: libxfcegui4-4 (<< 4.6.1-2)
Description: xfce keyboard shortcuts configuration
This package only contains the default shortcut configuration for Xfce.
Modified: desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install 2013-05-21 19:28:13 UTC (rev 7398)
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
usr/share/locale/
Copied: desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs (from rev 7388, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.shlibs)
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs (rev 0)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs 2013-05-21 19:28:13 UTC (rev 7398)
@@ -0,0 +1,2 @@
+libxfce4ui-1 0 libxfce4ui-1-0 (>= 4.9.0)
+libxfce4kbd-private-2 0 libxfce4ui-1-0 (>= 4.8.0)
Modified: desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install 2013-05-21 19:28:13 UTC (rev 7398)
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/libxfce4*.so
+usr/lib/*/pkgconfig/*
usr/share/gtk-doc/*
Added: desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.install
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.install (rev 0)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.install 2013-05-21 19:28:13 UTC (rev 7398)
@@ -0,0 +1,4 @@
+usr/share/applications
+usr/share/icons
+usr/bin/xfce4-about
+debian/vendorinfo usr/share/xfce4
Copied: desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.manpages (from rev 7388, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-utils.manpages)
===================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.manpages (rev 0)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-utils.manpages 2013-05-21 19:28:13 UTC (rev 7398)
@@ -0,0 +1 @@
+debian/xfce4-about.1
Modified: desktop/trunk/libxfce4ui/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/trunk/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch 2013-05-21 19:28:13 UTC (rev 7398)
@@ -2,20 +2,20 @@
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
+Index: libxfce4ui-4.9.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"/>
+--- 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>
- </property>
- <property name="xfwm4" type="empty">
Modified: desktop/trunk/libxfce4ui/debian/rules
===================================================================
--- desktop/trunk/libxfce4ui/debian/rules 2013-05-21 18:59:38 UTC (rev 7397)
+++ desktop/trunk/libxfce4ui/debian/rules 2013-05-21 19:28:13 UTC (rev 7398)
@@ -1,22 +1,22 @@
#!/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)
+XFVENDOR=Debian
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
+ XFVENDOR=Xubuntu
+endif
-export CFLAGS LDFLAGS
-
%:
- dh $@
+ dh $@ --parallel
+override_dh_auto_configure:
+ dh_auto_configure -- --with-vendor-info=$(XFVENDOR)
+
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
+ dh_install --fail-missing -X .la
override_dh_strip:
dh_strip --dbg-package=libxfce4ui-1-dbg
Copied: desktop/trunk/libxfce4ui/debian/vendorinfo (from rev 7388, desktop/branches/experimental/libxfce4ui/debian/vendorinfo)
===================================================================
--- desktop/trunk/libxfce4ui/debian/vendorinfo (rev 0)
+++ desktop/trunk/libxfce4ui/debian/vendorinfo 2013-05-21 19:28:13 UTC (rev 7398)
@@ -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/trunk/libxfce4ui/debian/xfce4-about.1 (from rev 7388, desktop/branches/experimental/libxfce4ui/debian/xfce4-about.1)
===================================================================
--- desktop/trunk/libxfce4ui/debian/xfce4-about.1 (rev 0)
+++ desktop/trunk/libxfce4ui/debian/xfce4-about.1 2013-05-21 19:28:13 UTC (rev 7398)
@@ -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