r21832 - in /desktop/unstable/libxklavier/debian: changelog control control.in libxklavier-dev.install libxklavier12-dev.install libxklavier12.install libxklavier15.install patches/ rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Oct 8 07:55:57 UTC 2009


Author: pochu
Date: Thu Oct  8 07:55:56 2009
New Revision: 21832

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21832
Log:
  - 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.

Added:
    desktop/unstable/libxklavier/debian/libxklavier-dev.install
      - copied unchanged from r21830, desktop/unstable/libxklavier/debian/libxklavier12-dev.install
    desktop/unstable/libxklavier/debian/libxklavier15.install
      - copied unchanged from r21830, desktop/unstable/libxklavier/debian/libxklavier12.install
Removed:
    desktop/unstable/libxklavier/debian/libxklavier12-dev.install
    desktop/unstable/libxklavier/debian/libxklavier12.install
    desktop/unstable/libxklavier/debian/patches/
Modified:
    desktop/unstable/libxklavier/debian/changelog
    desktop/unstable/libxklavier/debian/control
    desktop/unstable/libxklavier/debian/control.in
    desktop/unstable/libxklavier/debian/rules

Modified: desktop/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/changelog?rev=21832&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/changelog [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/changelog [utf-8] Thu Oct  8 07:55:56 2009
@@ -6,6 +6,22 @@
 
   [ 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
 

Modified: desktop/unstable/libxklavier/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/control?rev=21832&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/control [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/control [utf-8] Thu Oct  8 07:55:56 2009
@@ -2,50 +2,45 @@
 Priority: optional
 Section: libs
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at 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>
 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.1
+Standards-Version: 3.8.3
 Homepage: http://www.freedesktop.org/wiki/Software/LibXklavier
 
-Package: libxklavier12
+Package: libxklavier15
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          xkb-data (>= 0.8) | xkb-data-legacy,
          x11-xkb-utils
-Replaces: libxklavier7,
-          libxklavier8,
-          libxklavier10,
+Replaces: 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.
 
-# 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
+Package: libxklavier-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libxklavier12 (= ${binary:Version}),
+         libxklavier15 (= ${binary:Version}),
          libglib2.0-dev (>= 2.6.0),
          libxml2-dev (>= 2.0.0),
          libx11-dev
-Replaces: libxklavier-dev, libxklavier11-dev
-Conflicts: libxklavier-dev, libxklavier11-dev
+Replaces: libxklavier11-dev
+Conflicts: libxklavier11-dev
 Description: Development files for libxklavier
  These are headers and other files needed to develop with libxklavier.

Modified: desktop/unstable/libxklavier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/control.in?rev=21832&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/control.in [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/control.in [utf-8] Thu Oct  8 07:55:56 2009
@@ -15,39 +15,32 @@
                gnome-pkg-tools (>= 0.12.3),
                iso-codes,
                libglib2.0-doc
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.freedesktop.org/wiki/Software/LibXklavier
 
-Package: libxklavier12
+Package: libxklavier15
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          xkb-data (>= 0.8) | xkb-data-legacy,
          x11-xkb-utils
-Replaces: libxklavier7,
-          libxklavier8,
-          libxklavier10,
+Replaces: 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.
 
-# 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
+Package: libxklavier-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libxklavier12 (= ${binary:Version}),
+         libxklavier15 (= ${binary:Version}),
          libglib2.0-dev (>= 2.6.0),
          libxml2-dev (>= 2.0.0),
          libx11-dev
-Replaces: libxklavier-dev, libxklavier11-dev
-Conflicts: libxklavier-dev, libxklavier11-dev
+Replaces: libxklavier11-dev
+Conflicts: libxklavier11-dev
 Description: Development files for libxklavier
  These are headers and other files needed to develop with libxklavier.

Modified: desktop/unstable/libxklavier/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/rules?rev=21832&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/rules [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/rules [utf-8] Thu Oct  8 07:55:56 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) (>= 3.8)'
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libxklavierN) (>= 4.0)'




More information about the pkg-gnome-commits mailing list