[Pkg-xfce-commits] r8814 - in /desktop/trunk/libxfce4ui: ./ debian/ debian/patches/
Yves-Alexis Perez
corsac at moszumanska.debian.org
Tue Mar 3 21:07:22 UTC 2015
Author: corsac
Date: Tue Mar 3 21:07:22 2015
New Revision: 8814
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8814
Log:
merge changes from experimental
Added:
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.lintian-overrides
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.lintian-overrides
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.symbols
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.symbols
desktop/trunk/libxfce4ui/debian/libxfce4ui-2-0.install
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.install
desktop/trunk/libxfce4ui/debian/libxfce4ui-2-0.lintian-overrides
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.lintian-overrides
desktop/trunk/libxfce4ui/debian/libxfce4ui-2-0.shlibs
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.shlibs
desktop/trunk/libxfce4ui/debian/libxfce4ui-2-0.symbols
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.symbols
desktop/trunk/libxfce4ui/debian/libxfce4ui-2-dev.install
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-dev.install
desktop/trunk/libxfce4ui/debian/libxfce4ui-common.install
- copied unchanged from r8810, desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-common.install
Removed:
desktop/trunk/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
desktop/trunk/libxfce4ui/debian/patches/series
desktop/trunk/libxfce4ui/debian/xfce-keyboard-shortcuts.install
Modified:
desktop/trunk/libxfce4ui/ (props changed)
desktop/trunk/libxfce4ui/debian/changelog
desktop/trunk/libxfce4ui/debian/control
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs
desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install
desktop/trunk/libxfce4ui/debian/rules
desktop/trunk/libxfce4ui/debian/vendorinfo
Propchange: desktop/trunk/libxfce4ui/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 21:07:22 2015
@@ -1 +1 @@
-/desktop/branches/experimental/libxfce4ui:6337-7388
+/desktop/branches/experimental/libxfce4ui:6337-7388,7953-8810
Modified: desktop/trunk/libxfce4ui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/changelog?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/changelog (original)
+++ desktop/trunk/libxfce4ui/debian/changelog Tue Mar 3 21:07:22 2015
@@ -1,3 +1,56 @@
+libxfce4ui (4.12.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * debian/control:
+ - Bump standards-version to 3.9.6.
+ - Bump minimal xfce devel depends to 4.12.
+
+ -- Mateusz Åukasik <mati75 at linuxmint.pl> Wed, 18 Feb 2015 21:05:13 +0100
+
+libxfce4ui (4.11.1-2) experimental; urgency=medium
+
+ [ Lionel Le Folgoc ]
+ * debian/*.symbols: added.
+ * debian/rules: override dh_makeshlibs to ignore libxfce4kbd-private.
+ * debian/{vendorinfo,control}: update my email address.
+ * debian/control: relax libxfce4ui-utils dependency on libxfce4ui-1-0.
+
+ [ Yves-Alexis Perez ]
+ * debian/libxfce4ui-{2,3}-0.lintian-overrides added, add lintian overrides
+ for not having libxfce4kbd-private in symbols files.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 16 Mar 2014 16:20:55 +0100
+
+libxfce4ui (4.11.1-1) experimental; urgency=medium
+
+ [ Jackson Doak ]
+ * New upstream release
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 23 Feb 2014 21:01:51 +0100
+
+libxfce4ui (4.11.0-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/rules:
+ - force disable gladeui. closes: #724037
+ * debian/control:
+ - update standards version to 3.9.5.
+
+ [ Lionel Le Folgoc ]
+ * New upstream development release.
+ * Enable gtk3 support:
+ - Introduce libxfce4ui-2-* binary packages for the Gtk+3 variant.
+ - Introduce libxfce4ui-common for arch-indep files since they are used by
+ both variants, and change xfce-keyboard-shortcuts into a transitional
+ package depending on it.
+ * debian/rules: pass --with-gtk3 to configure.
+ * debian/control: add b-dep on libgtk-3-dev.
+ * debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch: dropped,
+ included upstream.
+ * debian/libxfce4ui-1-0.shlibs: bumped to >= 4.11.0 for the new symbols.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Dec 2013 23:59:54 +0100
+
libxfce4ui (4.10.0-6) unstable; urgency=medium
* debian/rules:
Modified: desktop/trunk/libxfce4ui/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/control?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/control (original)
+++ desktop/trunk/libxfce4ui/debian/control Tue Mar 3 21:07:22 2015
@@ -3,12 +3,12 @@
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>
+ Lionel Le Folgoc <lionel at lefolgoc.net>
Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config,
- libgtk2.0-dev, libstartup-notification0-dev, libglade2-dev,
- libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0),
- dpkg-dev (>= 1.16.1), xfce4-dev-tools
-Standards-Version: 3.9.5
+ libgtk2.0-dev, libgtk-3-dev, libstartup-notification0-dev, libglade2-dev,
+ autotools-dev, libxfce4util-dev (>= 4.12), libxfconf-0-dev (>= 4.12),
+ dpkg-dev (>= 1.16.1)
+Standards-Version: 3.9.6
Homepage: http://www.xfce.org/
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/libxfce4ui
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/libxfce4ui
@@ -17,20 +17,23 @@
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts
-Description: widget library for Xfce
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4ui-common (>= 4.11)
+Description: widget library for Xfce - Gtk+2 variant
libxfce4ui is used to share commonly used Xfce widgets among the Xfce
applications.
+ .
+ This package provides the Gtk+2 variant of libxfce4ui.
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
+Description: Development files for libxfce4ui - Gtk+2 variant
This package contains the headers and the static library
for libxfce4ui.
+ .
+ This package provides development files for the Gtk+2 variant of libxfce4ui.
Package: libxfce4ui-1-dbg
Section: debug
@@ -38,14 +41,61 @@
Architecture: any
Depends: ${shlibs:Depends}, libxfce4ui-1-0 (= ${binary:Version}),
${misc:Depends}
-Description: debugging symbols for libxfce4ui
+Description: debugging symbols for libxfce4ui - Gtk+2 variant
This package contains debugging symbols and information for libxfce4ui.
+ .
+ This package provides debugging symbols for the Gtk+2 variant of libxfce4ui.
+
+Package: libxfce4ui-2-0
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4ui-common (>= 4.11)
+Description: widget library for Xfce - Gtk+3 variant
+ libxfce4ui is used to share commonly used Xfce widgets among the Xfce
+ applications.
+ .
+ This package provides the Gtk+3 variant of libxfce4ui.
+
+Package: libxfce4ui-2-dev
+Section: libdevel
+Architecture: any
+Depends: libxfce4ui-2-0 (= ${binary:Version}), ${misc:Depends}, libgtk-3-dev,
+ libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0)
+Description: Development files for libxfce4ui - Gtk+3 variant
+ This package contains the headers and the static library
+ for libxfce4ui.
+ .
+ This package provides development files for the Gtk+3 variant of libxfce4ui.
+
+Package: libxfce4ui-2-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, libxfce4ui-2-0 (= ${binary:Version}),
+ ${misc:Depends}
+Description: debugging symbols for libxfce4ui - Gtk+3 variant
+ This package contains debugging symbols and information for libxfce4ui.
+ .
+ This package provides debugging symbols for the Gtk+3 variant of libxfce4ui.
+
+Package: libxfce4ui-common
+Section: xfce
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libxfce4ui-2-0 | libxfce4ui-1-0, devhelp
+Provides: xfce-keyboard-shortcuts
+Breaks: xfce-keyboard-shortcuts (<< 4.11), libxfce4ui-1-0 (<< 4.11),
+ libxfce4ui-1-dev (<< 4.11)
+Replaces: xfce-keyboard-shortcuts (<< 4.11), libxfce4ui-1-0 (<< 4.11),
+ libxfce4ui-1-dev (<< 4.11)
+Description: common files for libxfce4ui
+ This package contains the common files for both variants of libxfce4ui.
Package: libxfce4ui-utils
Section: xfce
Architecture: any
-Depends: libxfce4ui-1-0 (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: xfce4-utils
Replaces: xfce4-utils
Description: Utility files for libxfce4ui
@@ -65,10 +115,12 @@
This package contains debugging symbols and information for libxfce4ui-utils.
Package: xfce-keyboard-shortcuts
-Section: xfce
+Section: oldlibs
+Priority: extra
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libxfce4ui-1-0
-Breaks: libxfcegui4-4 (<< 4.6.1-2)
-Description: xfce keyboard shortcuts configuration
+Depends: ${misc:Depends}, libxfce4ui-common
+Description: xfce keyboard shortcuts configuration (transitional package)
This package only contains the default shortcut configuration for Xfce.
+ .
+ This package ensures a smooth upgrades from previous versions of Debian.
+ It can safely be removed if no other packages depend on it.
Modified: desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install (original)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.install Tue Mar 3 21:07:22 2015
@@ -1,2 +1,2 @@
-usr/lib/*/lib*.so.*
-usr/share/locale/
+usr/lib/*/libxfce4ui-1.so.*
+usr/lib/*/libxfce4kbd-private-2.so.*
Modified: desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs (original)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-1-0.shlibs Tue Mar 3 21:07:22 2015
@@ -1,2 +1,2 @@
-libxfce4ui-1 0 libxfce4ui-1-0 (>= 4.9.0)
-libxfce4kbd-private-2 0 libxfce4ui-1-0 (>= 4.8.0)
+libxfce4ui-1 0 libxfce4ui-1-0
+libxfce4kbd-private-2 0 libxfce4ui-1-0 (>= 4.11.0)
Modified: desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install (original)
+++ desktop/trunk/libxfce4ui/debian/libxfce4ui-1-dev.install Tue Mar 3 21:07:22 2015
@@ -1,4 +1,6 @@
-usr/include/*
-usr/lib/*/libxfce4*.so
-usr/lib/*/pkgconfig/*
-usr/share/gtk-doc/*
+usr/include/xfce4/libxfce4ui-1
+usr/include/xfce4/libxfce4kbd-private-2
+usr/lib/*/libxfce4ui-1.so
+usr/lib/*/libxfce4kbd-private-2.so
+usr/lib/*/pkgconfig/libxfce4ui-1.pc
+usr/lib/*/pkgconfig/libxfce4kbd-private-2.pc
Modified: desktop/trunk/libxfce4ui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/rules?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/rules (original)
+++ desktop/trunk/libxfce4ui/debian/rules Tue Mar 3 21:07:22 2015
@@ -14,7 +14,7 @@
override_dh_auto_configure:
NOCONFIGURE=xdt-autogen
dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --disable-silent-rules \
- --disable-gladeui
+ --disable-gladeui --with-gtk3
override_dh_install:
ifneq ($(XFVENDOR),Xubuntu)
@@ -24,4 +24,9 @@
override_dh_strip:
dh_strip -plibxfce4ui-1-0 --dbg-package=libxfce4ui-1-dbg
+ dh_strip -plibxfce4ui-2-0 --dbg-package=libxfce4ui-2-dbg
dh_strip -plibxfce4ui-utils --dbg-package=libxfce4ui-utils-dbg
+
+override_dh_makeshlibs:
+ dh_makeshlibs -plibxfce4ui-1-0 -Xlibxfce4kbd-private
+ dh_makeshlibs -plibxfce4ui-2-0 -Xlibxfce4kbd-private
Modified: desktop/trunk/libxfce4ui/debian/vendorinfo
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4ui/debian/vendorinfo?rev=8814&op=diff
==============================================================================
--- desktop/trunk/libxfce4ui/debian/vendorinfo (original)
+++ desktop/trunk/libxfce4ui/debian/vendorinfo Tue Mar 3 21:07:22 2015
@@ -3,7 +3,7 @@
Co maintainers are:
Yves-Alexis Perez <corsac at debian.org>
-Lionel Le Folgoc <mrpouit at gmail.com>
+Lionel Le Folgoc <lionel at lefolgoc.net>
Bugs should be reported to Debian BTS at: http://bugs.debian.org or using
reportbug.
More information about the Pkg-xfce-commits
mailing list