r26552 - in /packages/unstable/memphis/debian: changelog control control.in gir1.0-memphis-0.2.install libmemphis-0.2-dev.install patches/01_link_gobject.patch patches/series rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Wed Feb 16 21:20:02 UTC 2011 

Author: pochu
Date: Wed Feb 16 21:20:00 2011
New Revision: 26552

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26552
Log:
* Remove gir1.0-memphis-0.2 to ease the gir1.2 transition.
* debian/patches/01_link_gobject.patch:
  - Link the example against gobject-2.0.
* Use dh-autoreconf for the above patch.

Added:
    packages/unstable/memphis/debian/patches/01_link_gobject.patch
    packages/unstable/memphis/debian/patches/series
Removed:
    packages/unstable/memphis/debian/gir1.0-memphis-0.2.install
Modified:
    packages/unstable/memphis/debian/changelog
    packages/unstable/memphis/debian/control
    packages/unstable/memphis/debian/control.in
    packages/unstable/memphis/debian/libmemphis-0.2-dev.install
    packages/unstable/memphis/debian/rules

Modified: packages/unstable/memphis/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/changelog?rev=26552&op=diff
==============================================================================
--- packages/unstable/memphis/debian/changelog [utf-8] (original)
+++ packages/unstable/memphis/debian/changelog [utf-8] Wed Feb 16 21:20:00 2011
@@ -1,3 +1,12 @@
+memphis (0.2.3-2) unstable; urgency=low
+
+  * Remove gir1.0-memphis-0.2 to ease the gir1.2 transition.
+  * debian/patches/01_link_gobject.patch:
+    - Link the example against gobject-2.0.
+  * Use dh-autoreconf for the above patch.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 16 Feb 2011 21:18:37 +0000
+
 memphis (0.2.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/unstable/memphis/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/control?rev=26552&op=diff
==============================================================================
--- packages/unstable/memphis/debian/control [utf-8] (original)
+++ packages/unstable/memphis/debian/control [utf-8] Wed Feb 16 21:20:00 2011
@@ -7,17 +7,15 @@
 Section: admin
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bigon at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
+               dh-autoreconf,
                gnome-pkg-tools,
                pkg-config (>= 0.9),
                libexpat1-dev,
                libglib2.0-dev (>= 2.16),
                libcairo2-dev,
                gobject-introspection,
-               libgirepository1.0-dev (>= 0.6.7),
-               gir1.0-glib-2.0,
-               gir1.0-freedesktop,
                gtk-doc-tools (>= 0.12),
                valac
 Standards-Version: 3.8.4
@@ -77,16 +75,3 @@
  It supports zoom level 12 to 18, projected with the Mercator projection. 
  .
  This package contains the debug symbols.
-
-Package: gir1.0-memphis-0.2
-Architecture: any
-Priority: extra
-Depends: ${gir:Depends}, ${misc:Depends}
-Description: A map-rendering library for OpenStreetMap (GObject Introspection files)
- LibMemphis provides a GObject based API to render OpenStreetMap data
- on a cairo surface. Libmemphis implements the 'Slippy Map Tilename'
- specification, like Mapnik and Osmarender.
- .
- It supports zoom level 12 to 18, projected with the Mercator projection. 
- .
- This package contains the GObject Introspection files.

Modified: packages/unstable/memphis/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/control.in?rev=26552&op=diff
==============================================================================
--- packages/unstable/memphis/debian/control.in [utf-8] (original)
+++ packages/unstable/memphis/debian/control.in [utf-8] Wed Feb 16 21:20:00 2011
@@ -4,15 +4,13 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 7.0.50~),
+               dh-autoreconf,
                gnome-pkg-tools,
                pkg-config (>= 0.9),
                libexpat1-dev,
                libglib2.0-dev (>= 2.16),
                libcairo2-dev,
                gobject-introspection,
-               libgirepository1.0-dev (>= 0.6.7),
-               gir1.0-glib-2.0,
-               gir1.0-freedesktop,
                gtk-doc-tools (>= 0.12),
                valac
 Standards-Version: 3.8.4
@@ -72,16 +70,3 @@
  It supports zoom level 12 to 18, projected with the Mercator projection. 
  .
  This package contains the debug symbols.
-
-Package: gir1.0-memphis-0.2
-Architecture: any
-Priority: extra
-Depends: ${gir:Depends}, ${misc:Depends}
-Description: A map-rendering library for OpenStreetMap (GObject Introspection files)
- LibMemphis provides a GObject based API to render OpenStreetMap data
- on a cairo surface. Libmemphis implements the 'Slippy Map Tilename'
- specification, like Mapnik and Osmarender.
- .
- It supports zoom level 12 to 18, projected with the Mercator projection. 
- .
- This package contains the GObject Introspection files.

Modified: packages/unstable/memphis/debian/libmemphis-0.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/libmemphis-0.2-dev.install?rev=26552&op=diff
==============================================================================
--- packages/unstable/memphis/debian/libmemphis-0.2-dev.install [utf-8] (original)
+++ packages/unstable/memphis/debian/libmemphis-0.2-dev.install [utf-8] Wed Feb 16 21:20:00 2011
@@ -2,5 +2,4 @@
 usr/lib/libmemphis-0.2.so
 usr/lib/libmemphis-0.2.a
 usr/lib/pkgconfig/memphis-0.2.pc
-usr/share/gir-1.0/Memphis-0.2.gir
 usr/share/vala/vapi/

Added: packages/unstable/memphis/debian/patches/01_link_gobject.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/patches/01_link_gobject.patch?rev=26552&op=file
==============================================================================
--- packages/unstable/memphis/debian/patches/01_link_gobject.patch (added)
+++ packages/unstable/memphis/debian/patches/01_link_gobject.patch [utf-8] Wed Feb 16 21:20:00 2011
@@ -1,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@
+     exit 0;
+   fi
+   VALA_EXAMPLE_PACKAGES="--pkg cairo --pkg memphis-0.2"
+-  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0, cairo])
++  PKG_CHECK_MODULES(VALA_EXAMPLE, [glib-2.0 gobject-2.0 cairo])
+   AC_SUBST(VALA_EXAMPLE_CFLAGS)
+   AC_SUBST(VALA_EXAMPLE_LIBS)
+   AC_SUBST(VALA_EXAMPLE_PACKAGES)

Added: packages/unstable/memphis/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/patches/series?rev=26552&op=file
==============================================================================
--- packages/unstable/memphis/debian/patches/series (added)
+++ packages/unstable/memphis/debian/patches/series [utf-8] Wed Feb 16 21:20:00 2011
@@ -1,0 +1,1 @@
+01_link_gobject.patch

Modified: packages/unstable/memphis/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/memphis/debian/rules?rev=26552&op=diff
==============================================================================
--- packages/unstable/memphis/debian/rules [utf-8] (original)
+++ packages/unstable/memphis/debian/rules [utf-8] Wed Feb 16 21:20:00 2011
@@ -1,18 +1,13 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-introspection --enable-gtk-doc --enable-vala
+	dh_auto_configure -- --enable-gtk-doc --enable-vala
 
 override_dh_strip:
 	dh_strip -plibmemphis-0.2-0 --dbg-package=libmemphis-0.2-dbg
-
-binary: build
-	dh binary --until dh_shlibdeps
-	dh_girepository
-	dh binary --after dh_shlibdeps
 
 clean::
 	dh clean

More information about the pkg-gnome-commits mailing list