r27510 - in /packages/unstable/emerillon/debian: changelog control control.in patches/02_libchamplain-0.8.patch patches/99-autoconf.patch patches/series rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Wed Apr 13 12:33:22 UTC 2011
Author: bigon
Date: Wed Apr 13 12:33:22 2011
New Revision: 27510
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27510
Log:
* New upstream release
* Add debian/patches/02_libchamplain-0.8.patch: Use libchamplain 0.8
* debian/control.in:
- Bump libchamplain build-dependencies
- Add explicit version on build-dependencies
- Add valac as build-dependency
- Add gtk-doc-tools, gnome-doc-utils and gobject-introspection
as build-dependencies, needed to regenerate configure
- Add dh-autoreconf as build-dependency
* debian/rules:
- Drop include patchsys-quilt.mk, we are using 3.0 (quilt) format
- Drop --enable-deprecations=no, not used in configure anymore
* Drop debian/patches/99-autoconf.patch, use dh-autoreconf instead
Added:
packages/unstable/emerillon/debian/patches/02_libchamplain-0.8.patch
Removed:
packages/unstable/emerillon/debian/patches/99-autoconf.patch
Modified:
packages/unstable/emerillon/debian/changelog
packages/unstable/emerillon/debian/control
packages/unstable/emerillon/debian/control.in
packages/unstable/emerillon/debian/patches/series
packages/unstable/emerillon/debian/rules
Modified: packages/unstable/emerillon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/debian/changelog?rev=27510&op=diff
==============================================================================
--- packages/unstable/emerillon/debian/changelog [utf-8] (original)
+++ packages/unstable/emerillon/debian/changelog [utf-8] Wed Apr 13 12:33:22 2011
@@ -1,3 +1,21 @@
+emerillon (0.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Add debian/patches/02_libchamplain-0.8.patch: Use libchamplain 0.8
+ * debian/control.in:
+ - Bump libchamplain build-dependencies
+ - Add explicit version on build-dependencies
+ - Add valac as build-dependency
+ - Add gtk-doc-tools, gnome-doc-utils and gobject-introspection
+ as build-dependencies, needed to regenerate configure
+ - Add dh-autoreconf as build-dependency
+ * debian/rules:
+ - Drop include patchsys-quilt.mk, we are using 3.0 (quilt) format
+ - Drop --enable-deprecations=no, not used in configure anymore
+ * Drop debian/patches/99-autoconf.patch, use dh-autoreconf instead
+
+ -- Laurent Bigonville <bigon at debian.org> Wed, 13 Apr 2011 14:20:32 +0200
+
emerillon (0.1.1-3) unstable; urgency=low
[ Łukasz "DeeJay1" Jernaś ]
Modified: packages/unstable/emerillon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/debian/control?rev=27510&op=diff
==============================================================================
--- packages/unstable/emerillon/debian/control [utf-8] (original)
+++ packages/unstable/emerillon/debian/control [utf-8] Wed Apr 13 12:33:22 2011
@@ -9,25 +9,30 @@
Maintainer: Mathieu Trudel <mathieu.tl at gmail.com>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Laurent Bigonville <bigon at debian.org>
Build-Depends: debhelper (>= 7.3.15),
- automake1.9,
+ dh-autoreconf,
cdbs,
quilt,
gnome-common,
- libgconf2-dev,
+ libgconf2-dev (>= 2.5.90),
libdbus-1-dev,
libdbus-glib-1-dev,
- libgtk2.0-dev,
+ libglib2.0-dev (>= 2.12),
+ libgtk2.0-dev (>= 2.20),
libxml2-dev,
- librest-dev,
+ librest-dev (>= 0.7),
libsoup2.4-dev,
libclutter-1.0-dev,
libclutter-gtk-0.10-dev,
- libchamplain-0.4-dev,
- libchamplain-gtk-0.4-dev,
- libethos-dev,
- libethos-ui-dev,
+ libchamplain-0.8-dev (>= 0.7.1),
+ libchamplain-gtk-0.8-dev (>= 0.7.1),
+ libethos-dev (>= 0.2),
+ libethos-ui-dev (>= 0.2),
gnome-pkg-tools,
- libgeoclue-dev
+ libgeoclue-dev (>= 0.11.1),
+# Added for autotools file regeneration
+ gtk-doc-tools (>= 1.14),
+ gnome-doc-utils,
+ gobject-introspection
Standards-Version: 3.9.1
Homepage: http://projects.gnome.org/emerillon/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/emerillon/
Modified: packages/unstable/emerillon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/debian/control.in?rev=27510&op=diff
==============================================================================
--- packages/unstable/emerillon/debian/control.in [utf-8] (original)
+++ packages/unstable/emerillon/debian/control.in [utf-8] Wed Apr 13 12:33:22 2011
@@ -4,25 +4,31 @@
Maintainer: Mathieu Trudel <mathieu.tl at gmail.com>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 7.3.15),
- automake1.9,
+ dh-autoreconf,
cdbs,
quilt,
gnome-common,
- libgconf2-dev,
+ libgconf2-dev (>= 2.5.90),
libdbus-1-dev,
libdbus-glib-1-dev,
- libgtk2.0-dev,
+ libglib2.0-dev (>= 2.12),
+ libgtk2.0-dev (>= 2.20),
libxml2-dev,
- librest-dev,
+ librest-dev (>= 0.7),
libsoup2.4-dev,
libclutter-1.0-dev,
libclutter-gtk-0.10-dev,
- libchamplain-0.4-dev,
- libchamplain-gtk-0.4-dev,
- libethos-dev,
- libethos-ui-dev,
+ libchamplain-0.8-dev (>= 0.7.1),
+ libchamplain-gtk-0.8-dev (>= 0.7.1),
+ libethos-dev (>= 0.2),
+ libethos-ui-dev (>= 0.2),
gnome-pkg-tools,
- libgeoclue-dev
+ libgeoclue-dev (>= 0.11.1),
+ valac,
+# Added for autotools file regeneration
+ gtk-doc-tools (>= 1.14),
+ gnome-doc-utils,
+ gobject-introspection
Standards-Version: 3.9.1
Homepage: http://projects.gnome.org/emerillon/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/emerillon/
Added: packages/unstable/emerillon/debian/patches/02_libchamplain-0.8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/debian/patches/02_libchamplain-0.8.patch?rev=27510&op=file
==============================================================================
--- packages/unstable/emerillon/debian/patches/02_libchamplain-0.8.patch (added)
+++ packages/unstable/emerillon/debian/patches/02_libchamplain-0.8.patch [utf-8] Wed Apr 13 12:33:22 2011
@@ -1,0 +1,51 @@
+Index: emerillon-0.1.2/configure.ac
+===================================================================
+--- emerillon-0.1.2.orig/configure.ac 2011-01-11 13:16:52.770818155 -0500
++++ emerillon-0.1.2/configure.ac 2011-01-11 13:18:05.367407506 -0500
+@@ -85,8 +85,8 @@
+ GTHREAD_REQUIRED=2.12.0
+ GTK_REQUIRED=2.20.0
+ GCONF_REQUIRED=2.5.90
+-CHAMPLAIN_REQUIRED=0.6.0
+-CHAMPLAIN_GTK_REQUIRED=0.6.0
++CHAMPLAIN_REQUIRED=0.7.1
++CHAMPLAIN_GTK_REQUIRED=0.7.1
+ GEOCLUE_REQUIRED=0.11.1
+ ETHOS_REQUIRED=0.2
+ ETHOS_UI_REQUIRED=0.2
+@@ -96,8 +96,8 @@
+ gthread-2.0 >= $GTHREAD_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+- champlain-0.6 >= $CHAMPLAIN_REQUIRED
+- champlain-gtk-0.6 >= $CHAMPLAIN_GTK_REQUIRED
++ champlain-0.8 >= $CHAMPLAIN_REQUIRED
++ champlain-gtk-0.8 >= $CHAMPLAIN_GTK_REQUIRED
+ geoclue >= $GEOCLUE_REQUIRED
+ ethos-1.0 >= $ETHOS_REQUIRED
+ ethos-ui-1.0 >= $ETHOS_UI_REQUIRED
+Index: emerillon-0.1.2/data/emerillon.pc.in
+===================================================================
+--- emerillon-0.1.2.orig/data/emerillon.pc.in 2011-01-11 13:16:58.598865463 -0500
++++ emerillon-0.1.2/data/emerillon.pc.in 2011-01-11 13:18:32.119624715 -0500
+@@ -6,6 +6,6 @@
+
+ Name: Emerillon
+ Description: A map viewer for the GNOME desktop
+-Requires: gtk+-2.0, gconf-2.0, clutter-1.0, champlain-0.6
++Requires: gtk+-2.0, gconf-2.0, clutter-1.0, champlain-0.8
+ Version: @VERSION@
+ Cflags: -I${includedir}
+Index: emerillon-0.1.2/emerillon/Makefile.am
+===================================================================
+--- emerillon-0.1.2.orig/emerillon/Makefile.am 2011-01-11 13:17:21.855054251 -0500
++++ emerillon-0.1.2/emerillon/Makefile.am 2011-01-11 13:19:45.088213973 -0500
+@@ -61,7 +61,7 @@
+ introspection_sources = $(libemerillon_la_SOURCES)
+
+ Emerillon-0.1.gir: $(libemerillon_la_SOURCES) $(bin_PROGRAMS)
+- Emerillon_0_1_gir_INCLUDES = GObject-2.0 Gtk-2.0 Clutter-1.0 Champlain-0.6 GtkChamplain-0.6
++ Emerillon_0_1_gir_INCLUDES = GObject-2.0 Gtk-2.0 Clutter-1.0 Champlain-0.8 GtkChamplain-0.8
+ Emerillon_0_1_gir_CFLAGS = -I$(top_srcdir) $(EMERILLON_CFLAGS) -DEMERILLON_COMPILATION
+ Emerillon_0_1_gir_PROGRAM = ./$(bin_PROGRAMS)
+ Emerillon_0_1_gir_FILES = $(top_srcdir)/emerillon/emerillon.h $(top_srcdir)/emerillon/window.h $(top_srcdir)/emerillon/sidebar.h
Modified: packages/unstable/emerillon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/debian/patches/series?rev=27510&op=diff
==============================================================================
--- packages/unstable/emerillon/debian/patches/series [utf-8] (original)
+++ packages/unstable/emerillon/debian/patches/series [utf-8] Wed Apr 13 12:33:22 2011
@@ -1,2 +1,2 @@
01-ftbfs-librest.patch
-99-autoconf.patch
+02_libchamplain-0.8.patch
Modified: packages/unstable/emerillon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/emerillon/debian/rules?rev=27510&op=diff
==============================================================================
--- packages/unstable/emerillon/debian/rules [utf-8] (original)
+++ packages/unstable/emerillon/debian/rules [utf-8] Wed Apr 13 12:33:22 2011
@@ -3,13 +3,12 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
DEB_INSTALL_DOCS_ALL := README AUTHORS
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-deprecations=no
DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/emerillon/plugins/
pre-build::
More information about the pkg-gnome-commits
mailing list