[Pkg-xfce-commits] r7954 - in /desktop/branches/experimental/libxfce4ui/debian: ./ patches/
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Fri Sep 27 17:17:11 UTC 2013
Author: mrpouit-guest
Date: Fri Sep 27 17:17:10 2013
New Revision: 7954
URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7954
Log:
* 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.
Added:
desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.install
desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.shlibs
desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-dev.install
desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-common.install
- copied, changed from r7953, desktop/branches/experimental/libxfce4ui/debian/xfce-keyboard-shortcuts.install
Removed:
desktop/branches/experimental/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
desktop/branches/experimental/libxfce4ui/debian/patches/series
desktop/branches/experimental/libxfce4ui/debian/xfce-keyboard-shortcuts.install
Modified:
desktop/branches/experimental/libxfce4ui/debian/changelog
desktop/branches/experimental/libxfce4ui/debian/control
desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install
desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install
desktop/branches/experimental/libxfce4ui/debian/rules
Modified: desktop/branches/experimental/libxfce4ui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/changelog?rev=7954&op=diff
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/changelog (original)
+++ desktop/branches/experimental/libxfce4ui/debian/changelog Fri Sep 27 17:17:10 2013
@@ -1,7 +1,20 @@
-libxfce4ui (4.10.0-5) UNRELEASED; urgency=low
+libxfce4ui (4.11.0-1) UNRELEASED; urgency=low
+ [ Yves-Alexis Perez ]
* debian/rules:
- force disable gladeui. closes: #724037
+
+ [ 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.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 22 Sep 2013 20:55:00 +0200
Modified: desktop/branches/experimental/libxfce4ui/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/control?rev=7954&op=diff
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/control (original)
+++ desktop/branches/experimental/libxfce4ui/debian/control Fri Sep 27 17:17:10 2013
@@ -5,8 +5,9 @@
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, autotools-dev,
- libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0), dpkg-dev (>= 1.16.1)
+ libgtk2.0-dev, libgtk-3-dev, libstartup-notification0-dev, libglade2-dev,
+ autotools-dev, libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0),
+ dpkg-dev (>= 1.16.1)
Standards-Version: 3.9.4
Homepage: http://www.xfce.org/
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/libxfce4ui
@@ -16,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
@@ -37,8 +41,56 @@
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
@@ -64,10 +116,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/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install?rev=7954&op=diff
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install (original)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-0.install Fri Sep 27 17:17:10 2013
@@ -1,2 +1,2 @@
-usr/lib/*/lib*.so.*
-usr/share/locale/
+usr/lib/*/libxfce4ui-1.so.*
+usr/lib/*/libxfce4kbd-private-2.so.*
Modified: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install?rev=7954&op=diff
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install (original)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-1-dev.install Fri Sep 27 17:17:10 2013
@@ -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
Added: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.install?rev=7954&op=file
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.install (added)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.install Fri Sep 27 17:17:10 2013
@@ -0,0 +1,2 @@
+usr/lib/*/libxfce4ui-2.so.*
+usr/lib/*/libxfce4kbd-private-3.so.*
Added: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.shlibs
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.shlibs?rev=7954&op=file
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.shlibs (added)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-0.shlibs Fri Sep 27 17:17:10 2013
@@ -0,0 +1,2 @@
+libxfce4ui-2 0 libxfce4ui-2-0 (>= 4.11.0)
+libxfce4kbd-private-3 0 libxfce4ui-2-0 (>= 4.11.0)
Added: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-dev.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-dev.install?rev=7954&op=file
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-dev.install (added)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-2-dev.install Fri Sep 27 17:17:10 2013
@@ -0,0 +1,6 @@
+usr/include/xfce4/libxfce4ui-2
+usr/include/xfce4/libxfce4kbd-private-3
+usr/lib/*/libxfce4ui-2.so
+usr/lib/*/libxfce4kbd-private-3.so
+usr/lib/*/pkgconfig/libxfce4ui-2.pc
+usr/lib/*/pkgconfig/libxfce4kbd-private-3.pc
Copied: desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-common.install (from r7953, desktop/branches/experimental/libxfce4ui/debian/xfce-keyboard-shortcuts.install)
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-common.install?rev=7954&op=diff
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/xfce-keyboard-shortcuts.install (original)
+++ desktop/branches/experimental/libxfce4ui/debian/libxfce4ui-common.install Fri Sep 27 17:17:10 2013
@@ -1 +1,3 @@
etc
+usr/share/gtk-doc/*
+usr/share/locale
Modified: desktop/branches/experimental/libxfce4ui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui/debian/rules?rev=7954&op=diff
==============================================================================
--- desktop/branches/experimental/libxfce4ui/debian/rules (original)
+++ desktop/branches/experimental/libxfce4ui/debian/rules Fri Sep 27 17:17:10 2013
@@ -13,7 +13,7 @@
override_dh_auto_configure:
dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --disable-silent-rules \
- --disable-gladeui
+ --disable-gladeui --with-gtk3
override_dh_install:
ifneq ($(XFVENDOR),Xubuntu)
@@ -23,4 +23,5 @@
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
More information about the Pkg-xfce-commits
mailing list