r21836 - in /packages/unstable/libxklavier: ./ debian/changelog debian/control debian/control.in debian/libxklavier-dev.install debian/libxklavier12-dev.install debian/libxklavier12.install debian/libxklavier15.install debian/patches/ debian/rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Thu Oct 8 09:28:43 UTC 2009
Author: pochu
Date: Thu Oct 8 09:28:43 2009
New Revision: 21836
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21836
Log:
revert to the previous state
Added:
packages/unstable/libxklavier/debian/libxklavier12-dev.install
- copied unchanged from r21046, desktop/unstable/libxklavier/debian/libxklavier12-dev.install
packages/unstable/libxklavier/debian/libxklavier12.install
- copied unchanged from r21046, desktop/unstable/libxklavier/debian/libxklavier12.install
packages/unstable/libxklavier/debian/patches/
- copied from r21046, desktop/unstable/libxklavier/debian/patches/
Removed:
packages/unstable/libxklavier/debian/libxklavier-dev.install
packages/unstable/libxklavier/debian/libxklavier15.install
Modified:
packages/unstable/libxklavier/ (props changed)
packages/unstable/libxklavier/debian/changelog
packages/unstable/libxklavier/debian/control
packages/unstable/libxklavier/debian/control.in
packages/unstable/libxklavier/debian/rules
Propchange: packages/unstable/libxklavier/
('svn:mergeinfo' removed)
Modified: packages/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/changelog?rev=21836&op=diff
==============================================================================
--- packages/unstable/libxklavier/debian/changelog [utf-8] (original)
+++ packages/unstable/libxklavier/debian/changelog [utf-8] Thu Oct 8 09:28:43 2009
@@ -1,29 +1,9 @@
-libxklavier (4.0-1) UNRELEASED; urgency=low
-
- [ Josselin Mouette ]
+libxklavier (3.9-2) UNRELEASED; urgency=low
+
* Don’t install the .la file, it’s not referenced anywhere.
* Drop the clean-la.mk include accordingly.
- [ Emilio Pozuelo Monfort ]
- * New upstream release. Closes: #547645.
- - debian/patches/10_realloc-layout-names.patch:
- + Removed, fixed upstream.
- - debian/rules:
- + Bump shlibs.
- - debian/control.in,
- debian/libxklavier12-dev.install,
- debian/libxklavier-dev.install,
- debian/libxklavier12.install,
- debian/libxklavier15.install:
- + Rename libxklavier12 to libxklavier15 for the new SONAME.
- + Rename libxklavier12-dev to libxklavier-dev, no need to put the
- SONAME in the dev package since most packages usually still build
- after a new xklavier SONAME and we only ship one version at a time.
- * debian/control.in:
- - Standards-Version is 3.8.3, no changes needed.
- - Remove old conflicts/replaces.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 08 Oct 2009 09:06:43 +0200
+ -- Josselin Mouette <joss at debian.org> Tue, 25 Aug 2009 10:22:04 +0200
libxklavier (3.9-1) unstable; urgency=low
Modified: packages/unstable/libxklavier/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/control?rev=21836&op=diff
==============================================================================
--- packages/unstable/libxklavier/debian/control [utf-8] (original)
+++ packages/unstable/libxklavier/debian/control [utf-8] Thu Oct 8 09:28:43 2009
@@ -2,45 +2,50 @@
Priority: optional
Section: libs
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
- gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.16.0),
libxml2-dev (>= 2.0.0),
pkg-config,
libxkbfile-dev,
libxt-dev,
- libxi-dev (>= 2:1.1.3),
gnome-pkg-tools (>= 0.12.3),
iso-codes,
libglib2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.1
Homepage: http://www.freedesktop.org/wiki/Software/LibXklavier
-Package: libxklavier15
+Package: libxklavier12
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
xkb-data (>= 0.8) | xkb-data-legacy,
x11-xkb-utils
-Replaces: libxklavier10,
+Replaces: libxklavier7,
+ libxklavier8,
+ libxklavier10,
libxklavier11
+Conflicts: libxklavier8
Suggests: iso-codes
Description: X Keyboard Extension high-level API
Libxklavier provides programmers an API for high(er) level access to the
X Keyboard Extension, to ease creating XKB related applications.
-Package: libxklavier-dev
+# please rename to libxklavier-dev with next SONAME change; in most cases the
+# rbdeps will still build and it doesn't make sense to rename the API package
+# all the time unless we actually ship two libxklavier sources and -dev
+# packages
+Package: libxklavier12-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- libxklavier15 (= ${binary:Version}),
+ libxklavier12 (= ${binary:Version}),
libglib2.0-dev (>= 2.6.0),
libxml2-dev (>= 2.0.0),
libx11-dev
-Replaces: libxklavier11-dev
-Conflicts: libxklavier11-dev
+Replaces: libxklavier-dev, libxklavier11-dev
+Conflicts: libxklavier-dev, libxklavier11-dev
Description: Development files for libxklavier
These are headers and other files needed to develop with libxklavier.
Modified: packages/unstable/libxklavier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/control.in?rev=21836&op=diff
==============================================================================
--- packages/unstable/libxklavier/debian/control.in [utf-8] (original)
+++ packages/unstable/libxklavier/debian/control.in [utf-8] Thu Oct 8 09:28:43 2009
@@ -15,32 +15,39 @@
gnome-pkg-tools (>= 0.12.3),
iso-codes,
libglib2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.1
Homepage: http://www.freedesktop.org/wiki/Software/LibXklavier
-Package: libxklavier15
+Package: libxklavier12
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
xkb-data (>= 0.8) | xkb-data-legacy,
x11-xkb-utils
-Replaces: libxklavier10,
+Replaces: libxklavier7,
+ libxklavier8,
+ libxklavier10,
libxklavier11
+Conflicts: libxklavier8
Suggests: iso-codes
Description: X Keyboard Extension high-level API
Libxklavier provides programmers an API for high(er) level access to the
X Keyboard Extension, to ease creating XKB related applications.
-Package: libxklavier-dev
+# please rename to libxklavier-dev with next SONAME change; in most cases the
+# rbdeps will still build and it doesn't make sense to rename the API package
+# all the time unless we actually ship two libxklavier sources and -dev
+# packages
+Package: libxklavier12-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- libxklavier15 (= ${binary:Version}),
+ libxklavier12 (= ${binary:Version}),
libglib2.0-dev (>= 2.6.0),
libxml2-dev (>= 2.0.0),
libx11-dev
-Replaces: libxklavier11-dev
-Conflicts: libxklavier11-dev
+Replaces: libxklavier-dev, libxklavier11-dev
+Conflicts: libxklavier-dev, libxklavier11-dev
Description: Development files for libxklavier
These are headers and other files needed to develop with libxklavier.
Modified: packages/unstable/libxklavier/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libxklavier/debian/rules?rev=21836&op=diff
==============================================================================
--- packages/unstable/libxklavier/debian/rules [utf-8] (original)
+++ packages/unstable/libxklavier/debian/rules [utf-8] Thu Oct 8 09:28:43 2009
@@ -14,4 +14,4 @@
DEB_CONFIGURE_EXTRA_FLAGS += --with-xkb-base=/usr/share/X11/xkb \
--with-xkb-bin-base=/usr/bin
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libxklavierN) (>= 4.0)'
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libxklavierN) (>= 3.8)'
More information about the pkg-gnome-commits
mailing list