r17654 - in /desktop/experimental/libgnomekbd/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 21 17:31:46 UTC 2008
Author: joss
Date: Fri Nov 21 17:31:46 2008
New Revision: 17654
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17654
Log:
* New upstream release.
* Rename library package to libgnomekbd3.
* Relax dependencies on libgnomekbd-common.
* Set section of the source package to gnome.
* Update build-dependencies and dependencies for the new versions.
* Drop the libgnomekbdui packages, they don’t make sense now the
libgnome dependency has gone.
* Standards version is 3.8.0.
* Introduce quilt for patch management; build-depend on quilt.
* 01_requires_private.patch: new patch. Move dependencies to
Requires.private.
Added:
desktop/experimental/libgnomekbd/debian/libgnomekbd3.install (contents, props changed)
- copied, changed from r17651, desktop/experimental/libgnomekbd/debian/libgnomekbd2.install
desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch
desktop/experimental/libgnomekbd/debian/patches/99_ltmain_as-needed.patch (contents, props changed)
- copied, changed from r17651, desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch
desktop/experimental/libgnomekbd/debian/patches/series
Removed:
desktop/experimental/libgnomekbd/debian/libgnomekbd2.install
desktop/experimental/libgnomekbd/debian/libgnomekbdui-dev.install
desktop/experimental/libgnomekbd/debian/libgnomekbdui2.install
Modified:
desktop/experimental/libgnomekbd/debian/changelog
desktop/experimental/libgnomekbd/debian/control
desktop/experimental/libgnomekbd/debian/control.in
desktop/experimental/libgnomekbd/debian/libgnomekbd-dev.install
desktop/experimental/libgnomekbd/debian/rules
Modified: desktop/experimental/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/changelog?rev=17654&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/changelog (original)
+++ desktop/experimental/libgnomekbd/debian/changelog Fri Nov 21 17:31:46 2008
@@ -1,3 +1,19 @@
+libgnomekbd (2.24.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Rename library package to libgnomekbd3.
+ * Relax dependencies on libgnomekbd-common.
+ * Set section of the source package to gnome.
+ * Update build-dependencies and dependencies for the new versions.
+ * Drop the libgnomekbdui packages, they don’t make sense now the
+ libgnome dependency has gone.
+ * Standards version is 3.8.0.
+ * Introduce quilt for patch management; build-depend on quilt.
+ * 01_requires_private.patch: new patch. Move dependencies to
+ Requires.private.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 21 Nov 2008 17:45:55 +0100
+
libgnomekbd (2.22.0-1) unstable; urgency=low
* New upstream stable release:
Modified: desktop/experimental/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control?rev=17654&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control (original)
+++ desktop/experimental/libgnomekbd/debian/control Fri Nov 21 17:31:46 2008
@@ -1,61 +1,36 @@
Source: libgnomekbd
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Marc 'HE' Brockschmidt <he at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
autotools-dev,
cdbs,
+ gnome-pkg-tools (>= 0.10),
+ dpkg-dev (>= 1.13.19),
+ quilt,
+ libglib2.0-dev (>= 2.16),
libdbus-1-dev (>= 0.92),
libdbus-glib-1-dev (>= 0.34),
- libglib2.0-dev (>= 2.6),
libgconf2-dev (>= 2.14.0),
- libgtk2.0-dev (>= 2.10.3),
+ libgtk2.0-dev (>= 2.13),
+ libglade2-dev (>= 2.6.0),
libxklavier12-dev (>= 3.2) | libxklavier-dev,
- libglade2-dev (>= 2.6.0),
- libgnome2-dev (>= 2.16.0),
- libgnomeui-dev (>= 2.16.0),
- libxml-parser-perl,
- gnome-pkg-tools (>= 0.10),
- dpkg-dev (>= 1.13.19),
intltool (>= 0.35)
-Standards-Version: 3.7.3
-Section: libs
+Standards-Version: 3.8.0
+Section: gnome
Package: libgnomekbd-dev
Section: libdevel
Architecture: any
-Depends: libgnomekbd2 (= ${binary:Version}),
- libglib2.0-dev (>= 2.6),
- libgconf2-dev,
- libx11-dev,
- libgtk2.0-dev,
+Depends: libgnomekbd3 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.16),
+ libgtk2.0-dev (>= 2.13),
+ libgconf2-dev (>= 2.14.0),
+ libxklavier12-dev (>= 3.2) | libxklavier-dev,
libdbus-1-dev (>= 0.92),
libdbus-glib-1-dev (>= 0.34),
- libxklavier12-dev | libxklavier-dev,
+ libx11-dev
Description: GNOME library to manage keyboard configuration - development files
- libgnomekbd offers an API to manage the keyboard in GNOME applications.
- .
- This package contains the development files.
-
-Package: libgnomekbd2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libgnomekbd-common (= ${source:Version})
-Description: GNOME library to manage keyboard configuration - shared library
- libgnomekbd offers an API to manage the keyboard in GNOME applications.
- .
- This package contains the shared library.
-
-Package: libgnomekbdui-dev
-Section: libdevel
-Architecture: any
-Depends: libgnomekbdui2 (= ${binary:Version}),
- libgnomekbd-dev,
- libgnomecanvas2-dev,
- libgnome-keyring-dev
-Description: User interface library for libgnomekbd - development files
libgnomekbd offers an API to manage the keyboard in GNOME applications.
.
libgnomekbdui offers an API to display a graphical user interface for
@@ -63,12 +38,13 @@
.
This package contains the development files.
-Package: libgnomekbdui2
+Package: libgnomekbd3
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: User interface library for libgnomekbd - shared library
+ ${misc:Depends},
+ libgnomekbd-common (>= ${source:Version})
+Description: GNOME library to manage keyboard configuration - shared library
libgnomekbd offers an API to manage the keyboard in GNOME applications.
.
libgnomekbdui offers an API to display a graphical user interface for
@@ -85,6 +61,9 @@
Description: GNOME library to manage keyboard configuration - common files
libgnomekbd offers an API to manage the keyboard in GNOME applications.
.
+ libgnomekbdui offers an API to display a graphical user interface for
+ libgnomekbd operations.
+ .
This package contains files common to the various libgnomekbd packages.
Package: gkbd-capplet
Modified: desktop/experimental/libgnomekbd/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control.in?rev=17654&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control.in (original)
+++ desktop/experimental/libgnomekbd/debian/control.in Fri Nov 21 17:31:46 2008
@@ -5,57 +5,32 @@
Build-Depends: debhelper (>= 5),
autotools-dev,
cdbs,
+ gnome-pkg-tools (>= 0.10),
+ dpkg-dev (>= 1.13.19),
+ quilt,
+ libglib2.0-dev (>= 2.16),
libdbus-1-dev (>= 0.92),
libdbus-glib-1-dev (>= 0.34),
- libglib2.0-dev (>= 2.6),
libgconf2-dev (>= 2.14.0),
- libgtk2.0-dev (>= 2.10.3),
+ libgtk2.0-dev (>= 2.13),
+ libglade2-dev (>= 2.6.0),
libxklavier12-dev (>= 3.2) | libxklavier-dev,
- libglade2-dev (>= 2.6.0),
- libgnome2-dev (>= 2.16.0),
- libgnomeui-dev (>= 2.16.0),
- libxml-parser-perl,
- gnome-pkg-tools (>= 0.10),
- dpkg-dev (>= 1.13.19),
intltool (>= 0.35)
-Standards-Version: 3.7.3
-Section: libs
+Standards-Version: 3.8.0
+Section: gnome
Package: libgnomekbd-dev
Section: libdevel
Architecture: any
-Depends: libgnomekbd2 (= ${binary:Version}),
- libglib2.0-dev (>= 2.6),
- libgconf2-dev,
- libx11-dev,
- libgtk2.0-dev,
+Depends: libgnomekbd3 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.16),
+ libgtk2.0-dev (>= 2.13),
+ libgconf2-dev (>= 2.14.0),
+ libxklavier12-dev (>= 3.2) | libxklavier-dev,
libdbus-1-dev (>= 0.92),
libdbus-glib-1-dev (>= 0.34),
- libxklavier12-dev | libxklavier-dev,
+ libx11-dev
Description: GNOME library to manage keyboard configuration - development files
- libgnomekbd offers an API to manage the keyboard in GNOME applications.
- .
- This package contains the development files.
-
-Package: libgnomekbd2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libgnomekbd-common (= ${source:Version})
-Description: GNOME library to manage keyboard configuration - shared library
- libgnomekbd offers an API to manage the keyboard in GNOME applications.
- .
- This package contains the shared library.
-
-Package: libgnomekbdui-dev
-Section: libdevel
-Architecture: any
-Depends: libgnomekbdui2 (= ${binary:Version}),
- libgnomekbd-dev,
- libgnomecanvas2-dev,
- libgnome-keyring-dev
-Description: User interface library for libgnomekbd - development files
libgnomekbd offers an API to manage the keyboard in GNOME applications.
.
libgnomekbdui offers an API to display a graphical user interface for
@@ -63,12 +38,13 @@
.
This package contains the development files.
-Package: libgnomekbdui2
+Package: libgnomekbd3
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: User interface library for libgnomekbd - shared library
+ ${misc:Depends},
+ libgnomekbd-common (>= ${source:Version})
+Description: GNOME library to manage keyboard configuration - shared library
libgnomekbd offers an API to manage the keyboard in GNOME applications.
.
libgnomekbdui offers an API to display a graphical user interface for
@@ -85,6 +61,9 @@
Description: GNOME library to manage keyboard configuration - common files
libgnomekbd offers an API to manage the keyboard in GNOME applications.
.
+ libgnomekbdui offers an API to display a graphical user interface for
+ libgnomekbd operations.
+ .
This package contains files common to the various libgnomekbd packages.
Package: gkbd-capplet
Modified: desktop/experimental/libgnomekbd/debian/libgnomekbd-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/libgnomekbd-dev.install?rev=17654&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/libgnomekbd-dev.install (original)
+++ desktop/experimental/libgnomekbd/debian/libgnomekbd-dev.install Fri Nov 21 17:31:46 2008
@@ -1,4 +1,4 @@
debian/tmp/usr/include
-debian/tmp/usr/lib/libgnomekbd.a
-debian/tmp/usr/lib/libgnomekbd.so
-debian/tmp/usr/lib/pkgconfig/libgnomekbd.pc
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/pkgconfig
Copied: desktop/experimental/libgnomekbd/debian/libgnomekbd3.install (from r17651, desktop/experimental/libgnomekbd/debian/libgnomekbd2.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/libgnomekbd3.install?rev=17654&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/libgnomekbd2.install (original)
+++ desktop/experimental/libgnomekbd/debian/libgnomekbd3.install Fri Nov 21 17:31:46 2008
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libgnomekbd.so.*
+debian/tmp/usr/lib/lib*.so.*
Propchange: desktop/experimental/libgnomekbd/debian/libgnomekbd3.install
------------------------------------------------------------------------------
svn:mergeinfo =
Added: desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch?rev=17654&op=file
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch (added)
+++ desktop/experimental/libgnomekbd/debian/patches/01_requires_private.patch Fri Nov 21 17:31:46 2008
@@ -1,0 +1,13 @@
+Index: libgnomekbd-2.24.0/libgnomekbd.pc.in
+===================================================================
+--- libgnomekbd-2.24.0.orig/libgnomekbd.pc.in 2008-11-21 18:15:37.700766019 +0100
++++ libgnomekbd-2.24.0/libgnomekbd.pc.in 2008-11-21 18:16:01.756340542 +0100
+@@ -6,6 +6,7 @@ includedir=@includedir@
+ Name: libgnomekbd
+ Description: GNOME keyboard shared library
+ Version: @VERSION@
+-Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
++Requires: gmodule-export-2.0
++Requires.private: gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
+ Libs: -L${libdir} -lgnomekbd
+ Cflags: -I${includedir}
Copied: desktop/experimental/libgnomekbd/debian/patches/99_ltmain_as-needed.patch (from r17651, desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/99_ltmain_as-needed.patch?rev=17654&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/libgnomekbd/debian/patches/99_ltmain_as-needed.patch Fri Nov 21 17:31:46 2008
@@ -1,9 +1,9 @@
-Index: nautilus-2.18.1/ltmain.sh
+Index: libgnomekbd-2.24.0/ltmain.sh
===================================================================
---- nautilus-2.18.1.orig/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh 2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- libgnomekbd-2.24.0.orig/ltmain.sh 2008-09-04 00:02:25.000000000 +0200
++++ libgnomekbd-2.24.0/ltmain.sh 2008-11-21 18:22:33.584842208 +0100
+@@ -4189,6 +4189,11 @@ func_mode_link ()
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -12,9 +12,9 @@
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2124,6 +2129,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -4543,6 +4548,15 @@ func_mode_link ()
lib=
found=no
case $deplib in
Propchange: desktop/experimental/libgnomekbd/debian/patches/99_ltmain_as-needed.patch
------------------------------------------------------------------------------
svn:mergeinfo =
Added: desktop/experimental/libgnomekbd/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/series?rev=17654&op=file
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/series (added)
+++ desktop/experimental/libgnomekbd/debian/patches/series Fri Nov 21 17:31:46 2008
@@ -1,0 +1,2 @@
+01_requires_private.patch
+99_ltmain_as-needed.patch
Modified: desktop/experimental/libgnomekbd/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/rules?rev=17654&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/rules (original)
+++ desktop/experimental/libgnomekbd/debian/rules Fri Nov 21 17:31:46 2008
@@ -2,11 +2,10 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
More information about the pkg-gnome-commits
mailing list