r24775 - in /packages/experimental/libchamplain: ./ debian/

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Fri Jul 16 16:36:36 UTC 2010 

Author: bigon
Date: Fri Jul 16 16:36:31 2010
New Revision: 24775

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24775
Log:
Merge with unstable

Added:
    packages/experimental/libchamplain/debian/python-champlain-gtk.install
      - copied unchanged from r24774, packages/unstable/libchamplain/debian/python-champlain-gtk.install
    packages/experimental/libchamplain/debian/python-champlain.install
      - copied unchanged from r24774, packages/unstable/libchamplain/debian/python-champlain.install
Removed:
    packages/experimental/libchamplain/debian/python-champlain-0.6.install
    packages/experimental/libchamplain/debian/python-champlain-gtk-0.6.install
Modified:
    packages/experimental/libchamplain/   (props changed)
    packages/experimental/libchamplain/debian/changelog
    packages/experimental/libchamplain/debian/control
    packages/experimental/libchamplain/debian/control.in
    packages/experimental/libchamplain/debian/rules

Propchange: packages/experimental/libchamplain/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 16 16:36:31 2010
@@ -1,1 +1,1 @@
-/packages/unstable/libchamplain:23001-24606
+/packages/unstable/libchamplain:23001-24774

Modified: packages/experimental/libchamplain/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libchamplain/debian/changelog?rev=24775&op=diff
==============================================================================
--- packages/experimental/libchamplain/debian/changelog [utf-8] (original)
+++ packages/experimental/libchamplain/debian/changelog [utf-8] Fri Jul 16 16:36:31 2010
@@ -1,3 +1,12 @@
+libchamplain (0.4.6-2) unstable; urgency=medium
+
+  * debian/patches/01fix_python_bindings.patch: Fix python bindings
+    (Closes: #587881)
+  * Rename python packages to remove version in the name
+  * Bump Standards-Version to 3.9.0 (no further changes)
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 16 Jul 2010 15:17:42 +0200
+
 libchamplain (0.6.1-1) experimental; urgency=low
 
   * New upstream release (Closes: #583357)

Modified: packages/experimental/libchamplain/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libchamplain/debian/control?rev=24775&op=diff
==============================================================================
--- packages/experimental/libchamplain/debian/control [utf-8] (original)
+++ packages/experimental/libchamplain/debian/control [utf-8] Fri Jul 16 16:36:31 2010
@@ -32,7 +32,7 @@
                python-gobject-dev,
                python-gtk2-dev,
                valac
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://projects.gnome.org/libchamplain/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libchamplain/
@@ -187,7 +187,7 @@
  .
  This package contains the GObject introspection file for libchamplain-gtk.
 
-Package: python-champlain-0.6
+Package: python-champlain
 Architecture: any
 Section: python
 Depends: ${python:Depends},
@@ -195,6 +195,9 @@
          ${misc:Depends},
          python-gobject,
          python-clutter
+Replaces: python-champlain-0.4, python-champlain-0.6
+Conflicts: python-champlain-0.4, python-champlain-0.6
+Provides: python-champlain-0.4, python-champlain-0.6
 XB-Python-Version: ${python:Versions}
 Description: C library providing ClutterActor to display maps (Python bindings)
  Libchamplain is a C library providing a ClutterActor to
@@ -205,7 +208,7 @@
  .
  This package contains the Python bindings for libchamplain.
 
-Package: python-champlain-gtk-0.6
+Package: python-champlain-gtk
 Architecture: any
 Section: python
 Depends: ${python:Depends},
@@ -214,6 +217,9 @@
          python-gobject,
          python-clutter,
          python-clutter-gtk
+Replaces: python-champlain-gtk-0.4, python-champlain-gtk-0.6
+Conflicts: python-champlain-gtk-0.4, python-champlain-gtk-0.6
+Provides: python-champlain-gtk-0.4, python-champlain-gtk-0.6
 XB-Python-Version: ${python:Versions}
 Description: A Gtk+ widget to display maps (Python bindings)
  Libchamplain-gtk is a C library aimed to provide a Gtk+ widget

Modified: packages/experimental/libchamplain/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libchamplain/debian/control.in?rev=24775&op=diff
==============================================================================
--- packages/experimental/libchamplain/debian/control.in [utf-8] (original)
+++ packages/experimental/libchamplain/debian/control.in [utf-8] Fri Jul 16 16:36:31 2010
@@ -27,7 +27,7 @@
                python-gobject-dev,
                python-gtk2-dev,
                valac
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://projects.gnome.org/libchamplain/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libchamplain
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libchamplain/
@@ -182,7 +182,7 @@
  .
  This package contains the GObject introspection file for libchamplain-gtk.
 
-Package: python-champlain-0.6
+Package: python-champlain
 Architecture: any
 Section: python
 Depends: ${python:Depends},
@@ -190,6 +190,9 @@
          ${misc:Depends},
          python-gobject,
          python-clutter
+Replaces: python-champlain-0.4, python-champlain-0.6
+Conflicts: python-champlain-0.4, python-champlain-0.6
+Provides: python-champlain-0.4, python-champlain-0.6
 XB-Python-Version: ${python:Versions}
 Description: C library providing ClutterActor to display maps (Python bindings)
  Libchamplain is a C library providing a ClutterActor to
@@ -200,7 +203,7 @@
  .
  This package contains the Python bindings for libchamplain.
 
-Package: python-champlain-gtk-0.6
+Package: python-champlain-gtk
 Architecture: any
 Section: python
 Depends: ${python:Depends},
@@ -209,6 +212,9 @@
          python-gobject,
          python-clutter,
          python-clutter-gtk
+Replaces: python-champlain-gtk-0.4, python-champlain-gtk-0.6
+Conflicts: python-champlain-gtk-0.4, python-champlain-gtk-0.6
+Provides: python-champlain-gtk-0.4, python-champlain-gtk-0.6
 XB-Python-Version: ${python:Versions}
 Description: A Gtk+ widget to display maps (Python bindings)
  Libchamplain-gtk is a C library aimed to provide a Gtk+ widget

Modified: packages/experimental/libchamplain/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libchamplain/debian/rules?rev=24775&op=diff
==============================================================================
--- packages/experimental/libchamplain/debian/rules [utf-8] (original)
+++ packages/experimental/libchamplain/debian/rules [utf-8] Fri Jul 16 16:36:31 2010
@@ -2,7 +2,7 @@
 
 DEB_BUILDDIR = debian/build
 DEB_PYTHON_SYSTEM = pysupport
-DEB_PYTHON_MODULE_PACKAGES = python-champlain-0.6 python-champlain-gtk-0.6
+DEB_PYTHON_MODULE_PACKAGES = python-champlain python-champlain-gtk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-autotools.mk

More information about the pkg-gnome-commits mailing list