[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-25-g268e395

Francesco Paolo Lovergine frankie at debian.org
Tue Apr 3 14:11:52 UTC 2012


The following commit has been merged in the master branch:
commit 268e3954afcade8ddbf4002259e5739267898cf5
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Apr 3 15:07:47 2012 +0200

    Moved to 3.1.0~RC2

diff --git a/debian/changelog b/debian/changelog
index b020b2c..59ea896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spatialite (3.1.0~rc2-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * Removed 05-dont_relink.patch and 06-fix_soname.patch, both merged
+    upstream.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 03 Apr 2012 15:07:12 +0200
+
 spatialite (3.0.2~20120302-1) unstable; urgency=low
 
   * New upstream pre-release.
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index 32f16b6..379a6aa 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -12,26 +12,26 @@ Forwarded: no
 
 Index: spatialite/Makefile.am
 ===================================================================
---- spatialite.orig/Makefile.am	2012-03-02 11:53:36.000000000 +0100
-+++ spatialite/Makefile.am	2012-03-02 11:55:51.000000000 +0100
+--- spatialite.orig/Makefile.am	2012-04-03 14:22:32.000000000 +0200
++++ spatialite/Makefile.am	2012-04-03 14:57:53.000000000 +0200
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -AUTOMAKE_OPTIONS = dist-zip
 +AUTOMAKE_OPTIONS = dist-zip foreign
  
- EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage
- 
+ EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \
+ 	spatialite-sql-latest.html
 Index: spatialite/Makefile.in
 ===================================================================
---- spatialite.orig/Makefile.in	2012-03-02 11:53:36.000000000 +0100
-+++ spatialite/Makefile.in	2012-03-02 11:56:25.000000000 +0100
-@@ -257,7 +257,7 @@
+--- spatialite.orig/Makefile.in	2012-04-03 14:22:32.000000000 +0200
++++ spatialite/Makefile.in	2012-04-03 14:58:36.000000000 +0200
+@@ -253,7 +253,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
 -AUTOMAKE_OPTIONS = dist-zip
 +AUTOMAKE_OPTIONS = dist-zip foreign
- EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage
- SUBDIRS = src test examples
- pkgconfigdir = $(libdir)/pkgconfig
+ EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \
+ 	spatialite-sql-latest.html
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 06c444c..b017ba2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 00-add_automake_foreign.patch
 04-fix_missing_define.patch
-05-dont_relink.patch
-06-fix_soname.patch
+#05-dont_relink.patch
+#06-fix_soname.patch
 07-fix_spatialite_pc.patch

-- 
geospatial extension for SQLite



More information about the Pkg-grass-devel mailing list