Merging with bzed's package on alioth (second pass)

* updated debian/changelog
* refreshed debian/patches/remove-libmdb.diff
* fixed debian/rules to first run autogen.sh

diff --git a/debian/changelog b/debian/changelog
index 4976782..02456ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,28 @@
-navit (0.1.1.~svn2032-2) unstable; urgency=low
-
-  * debian/rules:
-    + DEB_CONFIGURE_SCRIPT_ENV: removed experimental PKG_CONFIG_PATH of no use
-      right now.
-
- -- Gilles Filippini <gilles.filippini@free.fr>  Fri, 13 Feb 2009 21:08:30 +0100
+navit (0.1.1.~svn2051-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+  * Moved the packaging on alioth and merged there with bzed's package:
+    + debian/copyright: added bzed
+    + debian/control:
+      - Section: moved to misc
+      - Depends:
+        . Removed debhelper (pulled by cdbs)
+        . Removed librsvg2-common (unused)
+        . Moved gpsd to Recommends:
+      - Description:
+        . Merged short description with bzed's
+        . Typo: It's -> Its
+      - Added git related stanzas
+    + debian/rules:
+      - Merged configure flags with bzed's
+      - Removed get-orig-source (not needed anymore)
+      - Updated to run autogen.sh
+    + patches:
+      - Added remove-libmdb.diff from bzed
+      - Removed clean_pngs.autoreconf: not used anymore
+
+ -- Gilles Filippini <gilles.filippini@free.fr>  Tue, 17 Feb 2009 22:47:15 +0100
 
 navit (0.1.1.~svn2032-1) unstable; urgency=low
 

diff --git a/debian/patches/remove-libmdb.diff b/debian/patches/remove-libmdb.diff
index c7f28d7..bd01e7b 100644 (file)
--- a/debian/patches/remove-libmdb.diff
+++ b/debian/patches/remove-libmdb.diff
@@ -1,22 +1,27 @@
---- a/navit/data/poi_geodownload/Makefile.am
-+++ b/navit/data/poi_geodownload/Makefile.am
-@@ -1,6 +1,5 @@
+Index: navit/navit/map/poi_geodownload/Makefile.am
+===================================================================
+--- navit.orig/navit/map/poi_geodownload/Makefile.am   2009-02-17 21:35:29.000000000 +0100
++++ navit/navit/map/poi_geodownload/Makefile.am        2009-02-17 22:42:03.000000000 +0100
+@@ -1,7 +1,6 @@
 -SUBDIRS=libmdb
  include $(top_srcdir)/Makefile.inc
--AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -DMODULE=data_poi_geodownload
-+AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=data_poi_geodownload
- moduledata_LTLIBRARIES = libdata_poi_geodownload.la
- libdata_poi_geodownload_la_SOURCES = poi_geodownload.c
--libdata_poi_geodownload_la_LIBADD = -Llibmdb -lmdb
-+libdata_poi_geodownload_la_LIBADD = -lmdb
---- a/configure.in
-+++ b/configure.in
-@@ -573,8 +573,6 @@ navit/data/textfile/Makefile
- navit/data/binfile/Makefile
- navit/data/garmin/Makefile
- navit/data/poi_geodownload/Makefile
--navit/data/poi_geodownload/libmdb/Makefile
--navit/data/poi_geodownload/libmdb/include/Makefile
+-AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -DMODULE=map_poi_geodownload
++AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_poi_geodownload
+ modulemap_LTLIBRARIES = libmap_poi_geodownload.la
+ libmap_poi_geodownload_la_SOURCES = poi_geodownload.c
+-libmap_poi_geodownload_la_LIBADD = -Llibmdb -lmdb
++libmap_poi_geodownload_la_LIBADD = -lmdb
+ libmap_poi_geodownload_la_LDFLAGS = -module
+Index: navit/configure.in
+===================================================================
+--- navit.orig/configure.in    2009-02-17 21:35:28.000000000 +0100
++++ navit/configure.in 2009-02-17 22:43:26.000000000 +0100
+@@ -831,8 +831,6 @@
+ navit/map/binfile/Makefile
+ navit/map/garmin/Makefile
+ navit/map/poi_geodownload/Makefile
+-navit/map/poi_geodownload/libmdb/Makefile
+-navit/map/poi_geodownload/libmdb/include/Makefile
  navit/fib-1.1/Makefile
- navit/graphics/Makefile
- navit/graphics/gtk_drawing_area/Makefile
+ navit/font/Makefile
+ navit/font/freetype/Makefile

diff --git a/debian/rules b/debian/rules
index 78824f8..38e1393 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -24,15 +24,9 @@ DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-Wall"
 
 DEB_DH_INSTALLINIT_ARGS = -- start 20 S .
 
-# Yes... I know... Quite ugly!
-post-patches:: post-patches-stamp
-
-post-patches-stamp: Makefile.in
-       touch aclocal.m4
-       touch config.h.in
-       touch configure
-       find $(CURDIR) -name Makefile.in -exec touch {} \;
-       touch post-patches-stamp
+post-patches::
+       [ -f configure ] || sh autogen.sh
 
 clean::
-       rm -f post-patches-stamp
+       rm configure
+       find . -name Makefile.in -exec rm {} \;