usertags 541534 + sent-patch thanks I've attached a patch to update all the files in order for the new version to be buildable.
-- bye, pabs http://wiki.debian.org/PaulWise
diff -Naur merkaartor-0.13.2/debian/changelog merkaartor-0.14/debian/changelog
--- merkaartor-0.13.2/debian/changelog 2009-09-01 14:14:25.000000000 +0800
+++ merkaartor-0.14/debian/changelog 2009-09-01 14:23:11.000000000 +0800
@@ -1,3 +1,9 @@
+merkaartor (0.14-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Paul Wise <p...@debian.org> Tue, 01 Sep 2009 14:23:11 +0800
+
merkaartor (0.13.2-2) unstable; urgency=low
* [fb902c95] Disable PROJ on build until it is fixed. (Closes:
diff -Naur merkaartor-0.13.2/debian/patches/gdal-config merkaartor-0.14/debian/patches/gdal-config
--- merkaartor-0.13.2/debian/patches/gdal-config 2009-09-01 14:14:25.000000000 +0800
+++ merkaartor-0.14/debian/patches/gdal-config 2009-09-01 14:51:59.000000000 +0800
@@ -1,15 +1,13 @@
---- a/Merkaartor.pro
-+++ b/Merkaartor.pro
-@@ -187,8 +187,10 @@ contains (GDAL, 1) {
- world_shp.path = share/world_shp
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -201,7 +201,9 @@
}
unix {
-- INCLUDEPATH += /usr/include/gdal
+ INCLUDEPATH += /usr/include/gdal
- LIBS += -lgdal
+ LIBS += $$system(gdal-config --libs)
+ QMAKE_CXXFLAGS += $$system(gdal-config --cflags)
+ QMAKE_CFLAGS += $$system(gdal-config --cflags)
-+
- world_shp.path = $${PREFIX}/share/merkaartor/world_shp
}
-
+ }
+ world_shp.path = $${SHARE_DIR}
diff -Naur merkaartor-0.13.2/debian/patches/zlib-include merkaartor-0.14/debian/patches/zlib-include
--- merkaartor-0.13.2/debian/patches/zlib-include 2009-09-01 14:14:25.000000000 +0800
+++ merkaartor-0.14/debian/patches/zlib-include 2009-09-01 14:52:01.000000000 +0800
@@ -1,5 +1,5 @@
---- a/Map/DownloadOSM.cpp
-+++ b/Map/DownloadOSM.cpp
+--- a/src/Maps/DownloadOSM.cpp
++++ b/src/Maps/DownloadOSM.cpp
@@ -28,7 +28,7 @@
#include <QStatusBar>
#include <QInputDialog>
diff -Naur merkaartor-0.13.2/debian/rules merkaartor-0.14/debian/rules
--- merkaartor-0.13.2/debian/rules 2009-09-01 14:14:25.000000000 +0800
+++ merkaartor-0.14/debian/rules 2009-09-01 15:23:41.000000000 +0800
@@ -52,7 +52,6 @@
$(CURDIR)/debian/merkaartor/usr/share/icons/merkaartor.png
install -D -m644 $(CURDIR)/debian/merkaartor.desktop \
$(CURDIR)/debian/merkaartor/usr/share/applications/merkaartor.desktop
- chmod 644 $(CURDIR)/debian/merkaartor/usr/share/merkaartor/world_shp/*
binary-indep:
diff -Naur merkaartor-0.13.2/debian/uscan_repack.sh merkaartor-0.14/debian/uscan_repack.sh
--- merkaartor-0.13.2/debian/uscan_repack.sh 2009-09-01 15:26:12.000000000 +0800
+++ merkaartor-0.14/debian/uscan_repack.sh 2009-09-01 15:25:57.000000000 +0800
@@ -11,9 +11,9 @@
version="$2"
filename="$3"
-tar xfz ${filename}
+tar xf ${filename}
-dir=`tar tfz ${filename} | head -1 | sed 's,/.*,,g'`
+dir=`tar tf ${filename} | head -1 | sed 's,/.*,,g'`
rm -f ${filename}
rm -rf ${dir}/debian
signature.asc
Description: This is a digitally signed message part
