[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 02635d20c1f3fb11feca1d52dce32eb45208db0a Author: David Paleino da...@debian.org Date: Sun Dec 2 09:22:46 2012 +0100 Updated debian/watch. diff --git a/debian/changelog b/debian/changelog index 586e9b8..d0f1704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +librasterlite (1.1~svn11-3) UNRELEASED; urgency=low + + * Updated debian/watch. + + -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:22:29 +0100 + librasterlite (1.1~svn11-2) unstable; urgency=low [ Francesco Paolo Lovergine ] diff --git a/debian/watch b/debian/watch index ed3ec8b..159eb8a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ version=3 -http://www.gaia-gis.it/spatialite/sources.html \ -librasterlite-(\d+.*)\.tar\.gz +http://www.gaia-gis.it/gaia-sins/librasterlite-sources/librasterlite-(\d+.*)\.tar\.gz -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 095fe3daf70c38860d9265c60f6dff811d537bfe Merge: 02635d20c1f3fb11feca1d52dce32eb45208db0a 118d80c211c063d0059edc01c5061095ca923b49 Author: David Paleino da...@debian.org Date: Sun Dec 2 09:32:06 2012 +0100 Merge tag 'upstream/1.1d' Upstream version 1.1d Conflicts: Makefile.am Makefile.in README configure configure.ac epsilon/Makefile.am epsilon/Makefile.in epsilon/bit_io.c epsilon/bit_io.h epsilon/checksum.c epsilon/checksum.h epsilon/cobs.c epsilon/cobs.h epsilon/color.c epsilon/color.h epsilon/common.c epsilon/common.h epsilon/daub97lift.h epsilon/dc_level.c epsilon/dc_level.h epsilon/epsilon.h epsilon/filter.c epsilon/filter.h epsilon/filterbank.c epsilon/filterbank.h epsilon/libmain.c epsilon/libmain.h epsilon/list.c epsilon/list.h epsilon/mem_alloc.c epsilon/mem_alloc.h epsilon/merge_split.c epsilon/merge_split.h epsilon/pad.c epsilon/pad.h epsilon/resample.c epsilon/resample.h epsilon/speck.c epsilon/speck.h headers/rasterlite.h headers/rasterlite_internals.h lib/Makefile.in lib/rasterlite.c lib/rasterlite_aux.c lib/rasterlite_gif.c lib/rasterlite_image.c lib/rasterlite_io.c lib/rasterlite_jpeg.c lib/rasterlite_png.c lib/rasterlite_quantize.c lib/rasterlite_tiff.c lib/rasterlite_wavelet.c makefile.vc nmake.opt src/rasterlite_grid.c src/rasterlite_load.c src/rasterlite_pyramid.c src/rasterlite_tool.c src/rasterlite_topmost.c -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 82ab0aef1a9d3fa9ea4972044ff32f8e109602b9 Author: David Paleino da...@debian.org Date: Sun Dec 2 10:00:15 2012 +0100 Fixed changelog diff --git a/debian/changelog b/debian/changelog index 130e66e..1a2924e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -librasterlite (1.1~svn11-3) UNRELEASED; urgency=low +librasterlite (1.1d-1) UNRELEASED; urgency=low + * New upstream version. * Updated debian/watch. * Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore embedded. -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit da09eb8bf6660cea4b8b5e7337203a61726531d7 Author: David Paleino da...@debian.org Date: Sun Dec 2 10:00:40 2012 +0100 SONAME bump diff --git a/debian/patches/03-fix_library_version.patch b/debian/patches/03-fix_library_version.patch index 57068d2..7fa58b7 100644 --- a/debian/patches/03-fix_library_version.patch +++ b/debian/patches/03-fix_library_version.patch @@ -14,7 +14,7 @@ Forwarded: no rasterlite.c -librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined -+librasterlite_la_LDFLAGS = -version-info 2:0:1 -no-undefined ++librasterlite_la_LDFLAGS = -version-info 2:0:0 -no-undefined librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ -lgeotiff -ltiff -ljpeg -lspatialite -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit a94199bc372e7846ba697167ef80079e4ea81968 Author: David Paleino da...@debian.org Date: Sun Dec 2 09:38:42 2012 +0100 Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore embedded. diff --git a/debian/changelog b/debian/changelog index d0f1704..d8fa728 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ librasterlite (1.1~svn11-3) UNRELEASED; urgency=low * Updated debian/watch. + * Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore +embedded. - -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:22:29 +0100 + -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:38:12 +0100 librasterlite (1.1~svn11-2) unstable; urgency=low diff --git a/debian/patches/00-systemwide_libepsilon.patch b/debian/patches/00-systemwide_libepsilon.patch deleted file mode 100644 index ec6b17d..000 --- a/debian/patches/00-systemwide_libepsilon.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: David Paleino da...@debian.org -Subject: use system-wide libepsilon -Forwarded: not-needed - - Makefile.am |2 +- - configure.ac|1 - - lib/Makefile.am |4 ++-- - src/Makefile.am |3 ++- - 4 files changed, 5 insertions(+), 5 deletions(-) - librasterlite.orig/Makefile.am -+++ librasterlite/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = headers epsilon lib src -+SUBDIRS = headers lib src - - AUTOMAKE_OPTIONS = dist-zip - librasterlite.orig/lib/Makefile.am -+++ librasterlite/lib/Makefile.am -@@ -3,7 +3,7 @@ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFS - - INCLUDES = @CFLAGS@ - INCLUDES += -I$(top_srcdir)/headers --INCLUDES += -I$(top_srcdir)/epsilon -+INCLUDES += -I/usr/include/ - - lib_LTLIBRARIES = librasterlite.la - -@@ -22,6 +22,6 @@ librasterlite_la_SOURCES = \ - librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined - - librasterlite_la_LIBADD = \ -- ../epsilon/libepsilon.la \ -+ -lepsilon \ - -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj - librasterlite.orig/src/Makefile.am -+++ librasterlite/src/Makefile.am -@@ -9,7 +9,7 @@ bin_PROGRAMS =rasterlite_load \ - - INCLUDES = @CFLAGS@ - INCLUDES += -I$(top_srcdir)/headers --INCLUDES += -I$(top_srcdir)/epsilon -+INCLUDES += -I/usr/include/ - - rasterlite_load_SOURCES = rasterlite_load.c - rasterlite_pyramid_SOURCES = rasterlite_pyramid.c -@@ -18,5 +18,6 @@ rasterlite_grid_SOURCES = rasterlite_gri - rasterlite_tool_SOURCES = rasterlite_tool.c - - LDADD = ../lib/.libs/librasterlite.a \ -+-lepsilon \ - -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj - librasterlite.orig/configure.ac -+++ librasterlite/configure.ac -@@ -50,7 +50,6 @@ AC_CHECK_FUNCS([memset sqrt strcasecmp s - - AC_CONFIG_FILES([Makefile \ - headers/Makefile \ -- epsilon/Makefile \ - lib/Makefile \ - src/Makefile \ - rasterlite.pc]) diff --git a/debian/patches/series b/debian/patches/series index 8eb800a..1cac149 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -00-systemwide_libepsilon.patch 01-fix_build.patch 02-fix_typos.patch 03-fix_library_version.patch -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch:
commit 23b5f9a1bd16d791f4f101b9319ab2b771bc4a36
Author: David Paleino da...@debian.org
Date: Sun Dec 2 10:07:16 2012 +0100
SONAME bump: librasterlite1 → librasterlite2. Wavelet-related functions
have been dropped.
diff --git a/debian/changelog b/debian/changelog
index 1a2924e..a87326c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ librasterlite (1.1d-1) UNRELEASED; urgency=low
embedded.
* Add 'foreign' to automake options.
* Standards-Version bump to 3.9.4, no changes needed.
+ * SONAME bump: librasterlite1 → librasterlite2. Wavelet-related
+functions have been dropped.
- -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:53:05 +0100
+ -- David Paleino da...@debian.org Sun, 02 Dec 2012 10:06:53 +0100
librasterlite (1.1~svn11-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6528acb..3cca9a6 100644
--- a/debian/control
+++ b/debian/control
@@ -28,14 +28,14 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends}
- , librasterlite1 (= ${binary:Version})
+ , librasterlite2 (= ${binary:Version})
Description: library supporting raster data sources for spatialite - headers
librasterlite is a library supporting raster data sources within a SpatiaLite
DataBase, and any releated command-line management tool.
.
This package contains development files.
-Package: librasterlite1
+Package: librasterlite2
Multi-Arch: same
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
@@ -68,7 +68,7 @@ Architecture: any
Depends:
${shlibs:Depends}
, ${misc:Depends}
- , librasterlite1 (= ${binary:Version})
+ , librasterlite2 (= ${binary:Version})
Description: command line tools for librasterlite
librasterlite is a library supporting raster data sources within a SpatiaLite
DataBase, and any releated command-line management tool.
diff --git a/debian/librasterlite1.dirs b/debian/librasterlite2.dirs
similarity index 100%
rename from debian/librasterlite1.dirs
rename to debian/librasterlite2.dirs
diff --git a/debian/librasterlite1.install b/debian/librasterlite2.install
similarity index 100%
rename from debian/librasterlite1.install
rename to debian/librasterlite2.install
diff --git a/debian/librasterlite1.symbols b/debian/librasterlite2.symbols
similarity index 92%
rename from debian/librasterlite1.symbols
rename to debian/librasterlite2.symbols
index fc27e2c..5401ab4 100644
--- a/debian/librasterlite1.symbols
+++ b/debian/librasterlite2.symbols
@@ -1,4 +1,4 @@
-librasterlite.so.1 librasterlite1 #MINVER#
+librasterlite.so.2 librasterlite2 #MINVER#
image_create@Base 1.0
image_destroy@Base 1.0
image_fill@Base 1.0
@@ -11,7 +11,6 @@ librasterlite.so.1 librasterlite1 #MINVER#
image_from_rgb_array@Base 1.1~svn11
image_from_rgba_array@Base 1.1~svn11
image_from_tiff@Base 1.0
- image_from_wavelet@Base 1.0
image_resample_as_palette256@Base 1.1~svn11
image_resize@Base 1.0
image_to_argb_array@Base 1.1~svn11
@@ -29,8 +28,6 @@ librasterlite.so.1 librasterlite1 #MINVER#
image_to_tiff_grayscale@Base 1.0
image_to_tiff_palette@Base 1.0
image_to_tiff_rgb@Base 1.0
- image_to_wavelet@Base 1.0
- image_to_wavelet_grayscale@Base 1.0
is_image_grayscale@Base 1.1~svn11
is_image_monochrome@Base 1.1~svn11
is_image_palette256@Base 1.1~svn11
@@ -59,6 +56,7 @@ librasterlite.so.1 librasterlite1 #MINVER#
rasterliteGetSrid@Base 1.0
rasterliteGetTablePrefix@Base 1.0
rasterliteGetTransparentColor@Base 1.0
+ rasterliteGetVersion@Base 1.1d
rasterliteGifBlobToRawImage@Base 1.1~svn11
rasterliteHasTransparentColor@Base 1.0
rasterliteIsError@Base 1.0
@@ -76,8 +74,7 @@ librasterlite.so.1 librasterlite1 #MINVER#
rasterliteSetBackgroundColor@Base 1.0
rasterliteSetTransparentColor@Base 1.0
rasterliteTiffBlobToRawImage@Base 1.1~svn11
- rasterliteWaveletBlobToRawImage@Base 1.1~svn11
- rasterliteWaveletToPng@Base 1.0
+ rasterliteversion@Base 1.1d
write_geotiff@Base 1.0
xgdDPExtractData@Base 1.0
xgdGetBuf@Base 1.0
--
library supporting raster data sources for spatialite
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit b3a9ab93b0dc24789e4a2759c93959dd9ffd1c20 Author: David Paleino da...@debian.org Date: Sun Dec 2 09:39:03 2012 +0100 Patches refreshed diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch index 7c4e340..80a2860 100644 --- a/debian/patches/01-fix_build.patch +++ b/debian/patches/01-fix_build.patch @@ -3,47 +3,46 @@ Subject: fix compile- and link-time issues Forwarded: no --- - lib/Makefile.am |6 +++--- - src/Makefile.am |7 --- - 2 files changed, 7 insertions(+), 6 deletions(-) + lib/Makefile.am |4 +++- + src/Makefile.am |5 - + 2 files changed, 7 insertions(+), 2 deletions(-) --- librasterlite.orig/lib/Makefile.am +++ librasterlite/lib/Makefile.am -@@ -4,6 +4,7 @@ AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFS +@@ -3,6 +3,8 @@ AM_CFLAGS = $(GCOV_FLAGS) + INCLUDES = @CFLAGS@ INCLUDES += -I$(top_srcdir)/headers - INCLUDES += -I/usr/include/ ++INCLUDES += -I/usr/include/ +INCLUDES += -I/usr/include/geotiff/ lib_LTLIBRARIES = librasterlite.la -@@ -22,6 +23,5 @@ librasterlite_la_SOURCES = \ +@@ -21,6 +23,6 @@ librasterlite_la_SOURCES = \ librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined - librasterlite_la_LIBADD = \ -- -lepsilon \ -- -lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj -- -+ -lepsilon -lsqlite3 \ -+ -lgeotiff -ltiff -ljpeg -lpng -lspatialite + librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ +- -lgeotiff -ltiff -ljpeg -lspatialite -lproj ++ -lgeotiff -ltiff -ljpeg -lspatialite + + MOSTLYCLEANFILES = *.gcna *.gcno *.gcda --- librasterlite.orig/src/Makefile.am +++ librasterlite/src/Makefile.am -@@ -10,6 +10,7 @@ bin_PROGRAMS =rasterlite_load \ +@@ -7,6 +7,8 @@ bin_PROGRAMS =rasterlite_load \ + INCLUDES = @CFLAGS@ INCLUDES += -I$(top_srcdir)/headers - INCLUDES += -I/usr/include/ ++INCLUDES += -I/usr/include/ +INCLUDES += -I/usr/include/geotiff/ rasterlite_load_SOURCES = rasterlite_load.c rasterlite_pyramid_SOURCES = rasterlite_pyramid.c -@@ -17,7 +18,7 @@ rasterlite_topmost_SOURCES = rasterlite_ - rasterlite_grid_SOURCES = rasterlite_grid.c - rasterlite_tool_SOURCES = rasterlite_tool.c - --LDADD = ../lib/.libs/librasterlite.a \ ---lepsilon \ ---lgeotiff -ltiff -ljpeg -lpng -lspatialite -lproj -+LDADD = ../lib/.libs/librasterlite.la \ -+-lsqlite3 -lm \ +@@ -16,6 +18,7 @@ rasterlite_tool_SOURCES = rasterlite_too + + LDADD = ../lib/.libs/librasterlite.a \ + @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ +--lgeotiff -ltiff -ljpeg -lspatialite -lproj ++ -lsqlite3 -lm \ +-lgeotiff -ltiff -lspatialite + MOSTLYCLEANFILES = *.gcna *.gcno *.gcda diff --git a/debian/patches/02-fix_typos.patch b/debian/patches/02-fix_typos.patch index 4dc807a..d26e7df 100644 --- a/debian/patches/02-fix_typos.patch +++ b/debian/patches/02-fix_typos.patch @@ -8,7 +8,7 @@ Forwarded: no --- librasterlite.orig/src/rasterlite_pyramid.c +++ librasterlite/src/rasterlite_pyramid.c -@@ -1020,7 +1020,7 @@ build_pyramid_level (sqlite3 * handle, c +@@ -1029,7 +1029,7 @@ build_pyramid_level (sqlite3 * handle, c goto error2; } diff --git a/debian/patches/03-fix_library_version.patch b/debian/patches/03-fix_library_version.patch index f0f9704..57068d2 100644 --- a/debian/patches/03-fix_library_version.patch +++ b/debian/patches/03-fix_library_version.patch @@ -10,11 +10,11 @@ Forwarded: no --- librasterlite.orig/lib/Makefile.am +++ librasterlite/lib/Makefile.am @@ -20,7 +20,7 @@ librasterlite_la_SOURCES = \ - rasterlite_wavelet.c \ + rasterlite_version.c \ rasterlite.c -librasterlite_la_LDFLAGS = -version-info 1:0:1 -no-undefined +librasterlite_la_LDFLAGS = -version-info 2:0:1 -no-undefined - librasterlite_la_LIBADD = \ - -lepsilon -lsqlite3 \ + librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ + -lgeotiff -ltiff -ljpeg -lspatialite -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit e863d0d50b0a414762987a2524234a3e1987dc36 Author: David Paleino da...@debian.org Date: Sun Dec 2 09:53:15 2012 +0100 Standards-Version bump to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index a3ee900..130e66e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ librasterlite (1.1~svn11-3) UNRELEASED; urgency=low * Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore embedded. * Add 'foreign' to automake options. + * Standards-Version bump to 3.9.4, no changes needed. - -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:52:16 +0100 + -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:53:05 +0100 librasterlite (1.1~svn11-2) unstable; urgency=low diff --git a/debian/control b/debian/control index c34a689..6528acb 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: , libspatialite-dev , libproj-dev , libsqlite3-dev -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Section: libs Homepage: http://www.gaia-gis.it/spatialite/ Vcs-Git: git://git.debian.org/pkg-grass/librasterlite.git -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit b18a70b357e34a34432f5584b65115aeeb2ac2a0 Author: David Paleino da...@debian.org Date: Sun Dec 2 10:11:55 2012 +0100 Remove useless .dirs files diff --git a/debian/librasterlite2.dirs b/debian/librasterlite2.dirs deleted file mode 100644 index 6845771..000 --- a/debian/librasterlite2.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/rasterlite-bin.dirs b/debian/rasterlite-bin.dirs deleted file mode 100644 index e772481..000 --- a/debian/rasterlite-bin.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 1d592a4794f56fc81c776e8d8f94a254938c85de Author: David Paleino da...@debian.org Date: Sun Dec 2 09:52:33 2012 +0100 Add 'foreign' to automake options. diff --git a/debian/changelog b/debian/changelog index d8fa728..a3ee900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ librasterlite (1.1~svn11-3) UNRELEASED; urgency=low * Updated debian/watch. * Dropped 00-systemwide_libepsilon.patch: libepsilon isn't anymore embedded. + * Add 'foreign' to automake options. - -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:38:12 +0100 + -- David Paleino da...@debian.org Sun, 02 Dec 2012 09:52:16 +0100 librasterlite (1.1~svn11-2) unstable; urgency=low diff --git a/debian/clean b/debian/clean deleted file mode 100644 index abb4ee4..000 --- a/debian/clean +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -ChangeLog diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch index 80a2860..4d00399 100644 --- a/debian/patches/01-fix_build.patch +++ b/debian/patches/01-fix_build.patch @@ -3,9 +3,10 @@ Subject: fix compile- and link-time issues Forwarded: no --- + Makefile.am |2 +- lib/Makefile.am |4 +++- src/Makefile.am |5 - - 2 files changed, 7 insertions(+), 2 deletions(-) + 3 files changed, 8 insertions(+), 3 deletions(-) --- librasterlite.orig/lib/Makefile.am +++ librasterlite/lib/Makefile.am @@ -46,3 +47,14 @@ Forwarded: no +-lgeotiff -ltiff -lspatialite MOSTLYCLEANFILES = *.gcna *.gcno *.gcda +--- librasterlite.orig/Makefile.am librasterlite/Makefile.am +@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = headers lib src test + +-AUTOMAKE_OPTIONS = dist-zip ++AUTOMAKE_OPTIONS = dist-zip foreign + + EXTRA_DIST = Makefile-static-MinGW Makefile-static-Linux \ + Makefile-static-MacOsX makefile.vc nmake.opt diff --git a/debian/rules b/debian/rules index b452e3a..26022cf 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,5 @@ dh $@ \ --with autoreconf -override_dh_autoreconf: - touch NEWS ChangeLog - dh_autoreconf - override_dh_strip: dh_strip --dbg-package=rasterlite-dbg -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit dac1c7e97e24ec7750a9e39d6eebea02f45230e7 Author: David Paleino da...@debian.org Date: Sun Dec 2 10:14:52 2012 +0100 Disable tests diff --git a/debian/rules b/debian/rules index 26022cf..3765206 100755 --- a/debian/rules +++ b/debian/rules @@ -10,3 +10,5 @@ override_dh_strip: dh_strip --dbg-package=rasterlite-dbg + +override_dh_auto_test: -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 8ce0ca4224e7ad24e7d2aeef1d43b595c106608d Author: David Paleino da...@debian.org Date: Sun Dec 2 10:08:03 2012 +0100 debian/copyright: drop references to epsilon/*, since it's not present anymore in the source tree. diff --git a/debian/changelog b/debian/changelog index a87326c..ba2c588 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ librasterlite (1.1d-1) UNRELEASED; urgency=low * Standards-Version bump to 3.9.4, no changes needed. * SONAME bump: librasterlite1 → librasterlite2. Wavelet-related functions have been dropped. + * debian/copyright: drop references to epsilon/*, since it's not +present anymore in the source tree. - -- David Paleino da...@debian.org Sun, 02 Dec 2012 10:06:53 +0100 + -- David Paleino da...@debian.org Sun, 02 Dec 2012 10:07:42 +0100 librasterlite (1.1~svn11-2) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 144604b..ec7cca0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,19 +10,6 @@ Copyright: © 2011-2012, David Paleino da...@debian.org © 2012, Francesco Paolo Lovergine fran...@debian.org License: GPL-3+ -Files: epsilon/* -Copyright: © 2006-2010, Alexander Simakov xan...@entropyware.info -License: GPL-3+ -Comment: - This embedded code copy is not used. The buildsystem has been patched - to use the system-wide libepsilon. Please see the patch - debian/patches/00-systemwide_libepsilon.patch . - -Files: epsilon/msvc/inttypes.h - epsilon/msvc/stdint.h -Copyright: © 2006-2008, Alexander Chemeris -License: BSD-3 - Files: lib/rasterlite_quantize.c Copyright: © 2009, Alessandro Furieri a.furi...@lqt.it © 2001-2002, Martin Weber @@ -61,28 +48,3 @@ License: GPL-3+ . On Debian systems, the complete text of the GNU General Public License version 3 can be found in /usr/share/common-licenses/GPL-3. - -License: BSD-3 - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - . - 3. The name of the author may be used to endorse or promote products - derived from this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 68505abc6770cd360535e490b4226b3c798f84f1 Author: David Paleino da...@debian.org Date: Sun Dec 2 11:46:09 2012 +0100 Add note about disabling tests diff --git a/debian/rules b/debian/rules index 3765206..a32eb0f 100755 --- a/debian/rules +++ b/debian/rules @@ -12,3 +12,5 @@ override_dh_strip: dh_strip --dbg-package=rasterlite-dbg override_dh_auto_test: + # Temporarily disable build-time tests, due to missing .jpg referenced + # from the testsuite. Already wrote to upstream about this. -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit bf44c23192c1b145a334cfc08f7ac519ae6e3ded Author: David Paleino da...@debian.org Date: Sun Dec 2 11:46:20 2012 +0100 Uploading to experimental diff --git a/debian/changelog b/debian/changelog index ba2c588..1055ad2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -librasterlite (1.1d-1) UNRELEASED; urgency=low +librasterlite (1.1d-1) experimental; urgency=low * New upstream version. * Updated debian/watch. @@ -11,7 +11,7 @@ librasterlite (1.1d-1) UNRELEASED; urgency=low * debian/copyright: drop references to epsilon/*, since it's not present anymore in the source tree. - -- David Paleino da...@debian.org Sun, 02 Dec 2012 10:07:42 +0100 + -- David Paleino da...@debian.org Sun, 02 Dec 2012 11:46:13 +0100 librasterlite (1.1~svn11-2) unstable; urgency=low -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit d674ee879e3f7ebf5e80c897ff4dc778ac0a725f Author: David Paleino da...@debian.org Date: Sun Dec 2 10:21:28 2012 +0100 Fix buildsystem diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch index 4d00399..7fe80a8 100644 --- a/debian/patches/01-fix_build.patch +++ b/debian/patches/01-fix_build.patch @@ -4,9 +4,10 @@ Forwarded: no --- Makefile.am |2 +- + configure.ac|4 ++-- lib/Makefile.am |4 +++- src/Makefile.am |5 - - 3 files changed, 8 insertions(+), 3 deletions(-) + 4 files changed, 10 insertions(+), 5 deletions(-) --- librasterlite.orig/lib/Makefile.am +++ librasterlite/lib/Makefile.am @@ -58,3 +59,19 @@ Forwarded: no EXTRA_DIST = Makefile-static-MinGW Makefile-static-Linux \ Makefile-static-MacOsX makefile.vc nmake.opt +--- librasterlite.orig/configure.ac librasterlite/configure.ac +@@ -79,11 +79,11 @@ AC_CHECK_LIB(tiff,TIFFClientOpen,,AC_MSG + AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm) + AC_CHECK_LIB(geotiff,GTIFSetFromProj4,,AC_MSG_ERROR(['libgeotiff' [= v.1.2.5] is required but it doesn't seem to be installed on this system.]),-lm) + +-PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) ++PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], [], AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.])) + AC_SUBST(LIBSPATIALITE_CFLAGS) + AC_SUBST(LIBSPATIALITE_LIBS) + +-PKG_CHECK_MODULES([LIBPNG], [libpng], , AC_MSG_ERROR(['libpng' is required but it doesn't seem to be installed on this system.])) ++PKG_CHECK_MODULES([LIBPNG], [libpng], [], AC_MSG_ERROR(['libpng' is required but it doesn't seem to be installed on this system.])) + AC_SUBST(LIBPNG_CFLAGS) + AC_SUBST(LIBPNG_LIBS) + -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 9e78eaa71ede67dcef5aa2c81be0d574bb0672ae Author: David Paleino da...@debian.org Date: Sun Dec 2 11:10:10 2012 +0100 Add Build-Depends on pkg-config diff --git a/debian/control b/debian/control index 3cca9a6..742939e 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: , libspatialite-dev , libproj-dev , libsqlite3-dev + , pkg-config Standards-Version: 3.9.4 Section: libs Homepage: http://www.gaia-gis.it/spatialite/ -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] librasterlite branch, master, updated. debian/1.1_svn11-2-21-gbf44c23
The following commit has been merged in the master branch: commit 81c7ae56fcfd12a2bc99f5f6c5b6b5a9372f3357 Author: David Paleino da...@debian.org Date: Sun Dec 2 11:30:45 2012 +0100 Also link to sqlite diff --git a/debian/patches/01-fix_build.patch b/debian/patches/01-fix_build.patch index 7fe80a8..99d363c 100644 --- a/debian/patches/01-fix_build.patch +++ b/debian/patches/01-fix_build.patch @@ -25,7 +25,7 @@ Forwarded: no librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ - -lgeotiff -ltiff -ljpeg -lspatialite -lproj -+ -lgeotiff -ltiff -ljpeg -lspatialite ++ -lgeotiff -ltiff -ljpeg -lspatialite -lsqlite3 MOSTLYCLEANFILES = *.gcna *.gcno *.gcda --- librasterlite.orig/src/Makefile.am @@ -44,7 +44,7 @@ Forwarded: no LDADD = ../lib/.libs/librasterlite.a \ @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ --lgeotiff -ltiff -ljpeg -lspatialite -lproj -+ -lsqlite3 -lm \ ++-lsqlite3 -lm \ +-lgeotiff -ltiff -lspatialite MOSTLYCLEANFILES = *.gcna *.gcno *.gcda diff --git a/debian/patches/03-fix_library_version.patch b/debian/patches/03-fix_library_version.patch index 7fa58b7..102e727 100644 --- a/debian/patches/03-fix_library_version.patch +++ b/debian/patches/03-fix_library_version.patch @@ -17,4 +17,4 @@ Forwarded: no +librasterlite_la_LDFLAGS = -version-info 2:0:0 -no-undefined librasterlite_la_LIBADD = @LIBSPATIALITE_LIBS@ @LIBPNG_LIBS@ \ - -lgeotiff -ltiff -ljpeg -lspatialite + -lgeotiff -ltiff -ljpeg -lspatialite -lsqlite3 -- library supporting raster data sources for spatialite ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
