The following commit has been merged in the master branch: commit c8017634aaa0b7792a61708792d1063450f912a7 Merge: dd7e775e5223b16643a1bdb045856a280f5e3d82 3a04222871d9294d700357a2a22c10b21a3ff476 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Feb 22 14:02:18 2012 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/spatialite Conflicts: debian/changelog debian/rules diff --combined debian/changelog index d58615e,be5e24a..6de50b3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,15 +1,27 @@@ -spatialite (3.0.0~beta20110817-3) unstable; urgency=medium +spatialite (3.0.1-1) unstable; urgency=low + + * New upstream release. + * The get-orig-source target changed (again) but temporarly not working, + because tools and lib currently have different versions. + Maybe upstream likes upsetting distribution details at every new release? + * Patchset refreshed. Finally, Sandro is now following a sane policy with + SONAME versioning. Better than never. + * This version is compatible with Freexl >= 1.0.0 only. + + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 22 Feb 2012 13:48:43 +0100 + +spatialite (3.0.0~beta20110817-3) unstable; urgency=low + [ Francesco Paolo Lovergine ] * Fixed linking order for sqlite3 in debian patch 00-systemlibs.patch. (closes: #638929) - -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 03 Nov 2011 15:39:36 +0100 + [ David Paleino ] + * Conditionally disable full EPSG initialization (for srs_init.c) + on powerpc, and document what projections are available on that + architecture (Closes: #649302) + + -- David Paleino <da...@debian.org> Mon, 21 Nov 2011 12:10:43 +0100 spatialite (3.0.0~beta20110817-2) unstable; urgency=low diff --combined debian/rules index 7b0a5a5,7ad599c..d5192a0 --- a/debian/rules +++ b/debian/rules @@@ -12,20 -12,22 +12,27 @@@ FULL_VERSION := $(shell dpkg-parsechang VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/") LC_VERSION := $(shell echo $(VERSION) | tr A-Z a-z) +BASE_URL := http://www.gaia-gis.it/gaia-sins + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + # see FTBFS #649302 + ifeq ($(DEB_HOST_ARCH),powerpc) + EPSG := --disable-epsg + else + EPSG := + endif %: dh $@ +versions: + @echo "Spatialite full version: $(FULL_VERSION)" + @echo "Spatialite version: $(LC_VERSION)" + get-orig-source: mkdir -p $(CURDIR)/tmp || true for archive in $(ARCHIVES); \ do \ - wget -O $(CURDIR)/$$archive.tar.gz http://www.gaia-gis.it/spatialite-$(VERSION)/$$archive-$(LC_VERSION).tar.gz; \ + wget -O $(CURDIR)/$$archive.tar.gz $(BASE_URL)/$$archive-sources/$$archive-$(LC_VERSION).tar.gz; \ tar xzovf $(CURDIR)/$$archive.tar.gz -C $(CURDIR)/tmp; \ mv $(CURDIR)/tmp/$$archive-$(LC_VERSION) $(CURDIR)/tmp/$$archive; \ done @@@ -38,6 -40,7 +45,7 @@@ override_dh_auto_configure dh_auto_configure -Dlibspatialite -- \ --enable-geos \ --enable-proj \ + $(EPSG) \ --disable-geosadvanced dh_auto_configure -Dspatialite-tools -- geospatial extension for SQLite _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel