The following commit has been merged in the master branch:
commit 545a4edec7adb8cb8993f08269cb96283117f326
Author: Jerome Villeneuve Larouche <jlarou...@mapgears.com>
Date: Thu Jun 20 14:30:52 2013 -0400
Small fixes to make it build
diff --git a/debian/changelog b/debian/changelog
index b8dc4e1..634ec5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
gdal (1.10.0-0~exp1) experimental; urgency=low
+ [ Jerome Villeneuve Larouche ]
+ * Renamed libgdal1 files to libgdal1h.
+ * Updated version in libgdal1h install path.
+ * Removed doc patch.
+
+ [ Francesco Paolo Lovergine ]
* Moved to new LIBKML driver instead of the old KML one. It has a much
better support for complex KML files.
* Merged NMU 1.9.0-3.1:
@@ -13,9 +19,9 @@ gdal (1.10.0-0~exp1) experimental; urgency=low
This choice implies that the API does not include anymore any *tiff
related functions: changed API declaration.
* Policy bumped to 3.9.4. No changes required.
- * New upstream version with many fixes.
+ * New upstream version with many fixes.
- -- Francesco Paolo Lovergine <fran...@debian.org> Sun, 04 Apr 2013 11:39:57
+0100
+ -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 20 Jun 2013
13:35:03 -0400
gdal (1.9.2-1~exp2) experimental; urgency=low
diff --git a/debian/libgdal1.docs b/debian/libgdal1h.docs
similarity index 100%
rename from debian/libgdal1.docs
rename to debian/libgdal1h.docs
diff --git a/debian/libgdal1.install b/debian/libgdal1h.install
similarity index 51%
rename from debian/libgdal1.install
rename to debian/libgdal1h.install
index c62b46f..f6428e7 100644
--- a/debian/libgdal1.install
+++ b/debian/libgdal1h.install
@@ -1,2 +1,2 @@
usr/lib/libgdal.so.*
-usr/share/gdal/1.9
+usr/share/gdal/1.10
diff --git a/debian/patches/series b/debian/patches/series
index 95e771e..5045b36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
ogdi
-doc
rubymakefile
man
gdalpaths
diff --git a/debian/rules b/debian/rules
index bbdb273..e09f9fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,7 +190,7 @@ install: build
install -o root -g root -m 755 $(CURDIR)/swig/python/samples/*.py
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples/.
# create lintian overrides file
echo "libgdal1: embedded-library usr/lib/libgdal.so.$$(basename
debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff" \
- >$(CURDIR)/debian/libgdal1.lintian-overrides
+ >$(CURDIR)/debian/libgdal1h.lintian-overrides
binary-common:
dh_testdir
@@ -209,8 +209,8 @@ binary-common:
dh_numpy
dh_perl
# Adds per arch symbols for compatible archs
- ln -f $(CURDIR)/debian/libgdal*.symbols.i386
$(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386
- ln -f $(CURDIR)/debian/libgdal*.symbols.amd64
$(CURDIR)/debian/libgdal1.symbols.kfreebsd-amd64
+ ln -f $(CURDIR)/debian/libgdal*.symbols.i386
$(CURDIR)/debian/libgdal1h.symbols.kfreebsd-i386
+ ln -f $(CURDIR)/debian/libgdal*.symbols.amd64
$(CURDIR)/debian/libgdal1h.symbols.kfreebsd-amd64
# Forces failure ignoring to collect new symbols on all archs
dh_makeshlibs -- -c0
# Forces failure when symbols change
--
GDAL/OGR library and tools
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
