[SCM] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c
The following commit has been merged in the master branch: commit 521138cc13660cfeb22825da490366abdb96e295 Merge: f6464d1fb22b000dd685aeb6f6e7cb9c09609cf0 977fc73c45d270c273f875ebadcff3a1b1b86162 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 10 15:06:51 2013 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/libkml Conflicts: debian/changelog debian/control debian/patches/reautoconfiscated.diff debian/patches/series debian/patches/swig.diff debian/rules diff --combined debian/rules index 5335b57,a295754..25c8f08 --- a/debian/rules +++ b/debian/rules @@@ -1,62 -1,45 +1,104 @@@ #!/usr/bin/make -f ++ HEAD +PY_VERSIONS = $(shell pyversions --requested debian/control) + ++=== ++ 977fc73c45d270c273f875ebadcff3a1b1b86162 JAVA_HOME = /usr/lib/jvm/default-java - include /usr/share/cdbs/1/rules/debhelper.mk - include /usr/share/cdbs/1/class/autotools.mk - DEB_CONFIGURE_EXTRA_FLAGS = --enable-systempython --with-java-include-dir=$(JAVA_HOME)/include ++ HEAD +DEB_MAKE_CHECK_TARGET = check + +DEB_BUILDDIR := build + +# These targets do allow building multiple Python versions extensions +# when autoconf is used - as in this case - instead of Distutils. + +configure/python-kml:: $(addprefix configure-stamp-, $(PY_VERSIONS)) + +configure-stamp-%: + mkdir build-$* + cd build-$* PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \ + $(DEB_CONFIGURE_SCRIPT) \ + $(DEB_CONFIGURE_NORMAL_ARGS) \ + --disable-maintainer-mode \ + $(cdbs_configure_flags) \ + $(DEB_CONFIGURE_EXTRA_FLAGS) \ + $(DEB_CONFIGURE_USER_FLAGS) + touch $@ + +build-stamp-%: + $(MAKE) -C build-$* PYTHON=`which $*` + touch $@ + +build/python-kml:: $(addprefix build-stamp-, $(PY_VERSIONS)) + +install-stamp-%: + $(MAKE) -C build-$* PYTHON=`which $*` DESTDIR=$(CURDIR)/debian/tmp install + touch $@ + +install/python-kml:: $(addprefix install-stamp-, $(PY_VERSIONS)) + +binary-install/python-kml:: install/python-kml + # removes build-time rpaths + for version in $(PY_VERSIONS); \ + do \ + chrpath --delete $(CURDIR)/debian/python-kml/usr/lib/$$version/*-packages/*.so ; \ + done + dh_python2 -ppython-kml + +binary-install/libkml-dev:: + # removes autotools stuff + find $(CURDIR)/debian/libkml-dev/usr/share/doc/libkml-dev/examples -type f -name Makefile.* -delete + # removes python related stuff + find $(CURDIR)/debian/libkml-dev/usr/lib -name libkml*python*.so* -delete + +clean:: + -rm -rf $(addprefix build-, $(PY_VERSIONS)) + -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) + -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) + -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) ++=== + + DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + + %: + dh $@ --with autoreconf,python2 + + override_dh_auto_configure: + dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) + + override_dh_auto_install: + dh_auto_install + + # Strip RPATH + chrpath --delete $(CURDIR)/debian/tmp/usr/lib/python*/*-packages/*.so + + # Remove autotools stuff + find $(CURDIR)/examples/ -type f -name Makefile* -delete + + # Remove python swig + find $(CURDIR)/debian/tmp/usr/lib -name libkml*python*.so* -delete + + # Remove la files + find $(CURDIR)/debian/tmp/usr/lib -name *.la -delete + + # Move libraries from libkml subdirectory + mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libkml/* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ + + # libminizip headers + install -m755 -d $(CURDIR)/debian/tmp/usr/include/minizip + install -m644 $(CURDIR)/third_party/zlib-*/contrib/minizip/*h $(CURDIR)/debian/tmp/usr/include/minizip/ + + override_dh_install: + dh_install --autodest --list-missing + + override_dh_makeshlibs: + dh_makeshlibs -Xpython-kml + + override_dh_python: + dh_python2 -ppython-kml ++ 977fc73c45d270c273f875ebadcff3a1b1b86162 -- A library to manipulate KML 2.2 OGC standard files ___ 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] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c
The following commit has been merged in the master branch: commit 26d5f27e647bfe17fe21eae8401b344381f77b5c Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 14 13:30:25 2012 +0100 Closing residual reports. diff --git a/debian/changelog b/debian/changelog index 7ea1833..14b88f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ libkml (1.3.0~r863-4) unstable; urgency=low * Moved to dh_python2 instead of python-central. * Policy bumped to 3.9.3, no changes required. * Debhelper level set to 9. + * Refreshed reautoconfiscated.diff to remove a backup file. Thanks doko. +(closes: #650525) + * The ld-as-needed case has been already managed. +(closes: #641681) - -- Francesco Paolo Lovergine fran...@debian.org Wed, 14 Mar 2012 13:15:52 +0100 + -- Francesco Paolo Lovergine fran...@debian.org Wed, 14 Mar 2012 13:29:51 +0100 libkml (1.3.0~r863-3) unstable; urgency=low diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff index 7722b8c..ae03793 100644 --- a/debian/patches/reautoconfiscated.diff +++ b/debian/patches/reautoconfiscated.diff @@ -1,116 +1,3 @@ -Index: git/config.h.in~ -=== /dev/null 1970-01-01 00:00:00.0 + -+++ git/config.h.in~ 2011-03-29 14:52:31.0 +0200 -@@ -0,0 +1,108 @@ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if you have the dlfcn.h header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the expat.h header file. */ -+#undef HAVE_EXPAT_H -+ -+/* Define to 1 if you have the float.h header file. */ -+#undef HAVE_FLOAT_H -+ -+/* Define to 1 if you have the `floor' function. */ -+#undef HAVE_FLOOR -+ -+/* Define to 1 if you have the inttypes.h header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the `expat' library (-lexpat). */ -+#undef HAVE_LIBEXPAT -+ -+/* Define to 1 if you have the limits.h header file. */ -+#undef HAVE_LIMITS_H -+ -+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and -+ to 0 otherwise. */ -+#undef HAVE_MALLOC -+ -+/* Define to 1 if you have the memory.h header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the `memset' function. */ -+#undef HAVE_MEMSET -+ -+/* Define to 1 if stdbool.h conforms to C99. */ -+#undef HAVE_STDBOOL_H -+ -+/* Define to 1 if you have the stdint.h header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the stdlib.h header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the strings.h header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the string.h header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the `strstr' function. */ -+#undef HAVE_STRSTR -+ -+/* Define to 1 if you have the sys/stat.h header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the sys/types.h header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the unistd.h header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define to 1 if the system has the type `_Bool'. */ -+#undef HAVE__BOOL -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Version number of package */ -+#undef VERSION -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+#undef const -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+#undef inline -+#endif -+ -+/* Define to rpl_malloc if the replacement function should be used. */ -+#undef malloc -+ -+/* Define to `unsigned int' if sys/types.h does not define. */ -+#undef size_t Index: git/configure === --- git.orig/configure 2011-03-29 14:50:08.0 +0200 diff --git a/debian/patches/series b/debian/patches/series index 8033dd2..9c7fd47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ ld-as-needed.diff feature_view_test.diff geometry_test.diff swig +ldasneeded.diff +ldasneeded -- A library to manipulate KML 2.2 OGC standard files ___ Pkg-grass-devel mailing list Pkg-grass-devel
[SCM] libkml branch, master, updated. upstream/1.3.0_r863-51-g02f8e96
The following commit has been merged in the master branch: commit 02f8e9667892cf389f023524adefa0c03e7490e1 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 10 15:10:57 2013 +0200 Merged Bas' changes to move to dhelper diff --git a/debian/rules b/debian/rules index 25c8f08..a295754 100755 --- a/debian/rules +++ b/debian/rules @@ -1,66 +1,8 @@ #!/usr/bin/make -f - HEAD -PY_VERSIONS = $(shell pyversions --requested debian/control) - -=== - 977fc73c45d270c273f875ebadcff3a1b1b86162 JAVA_HOME = /usr/lib/jvm/default-java DEB_CONFIGURE_EXTRA_FLAGS = --enable-systempython --with-java-include-dir=$(JAVA_HOME)/include - HEAD -DEB_MAKE_CHECK_TARGET = check - -DEB_BUILDDIR := build - -# These targets do allow building multiple Python versions extensions -# when autoconf is used - as in this case - instead of Distutils. - -configure/python-kml:: $(addprefix configure-stamp-, $(PY_VERSIONS)) - -configure-stamp-%: - mkdir build-$* - cd build-$* PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \ - $(DEB_CONFIGURE_SCRIPT) \ - $(DEB_CONFIGURE_NORMAL_ARGS) \ - --disable-maintainer-mode \ - $(cdbs_configure_flags) \ - $(DEB_CONFIGURE_EXTRA_FLAGS) \ - $(DEB_CONFIGURE_USER_FLAGS) - touch $@ - -build-stamp-%: - $(MAKE) -C build-$* PYTHON=`which $*` - touch $@ - -build/python-kml:: $(addprefix build-stamp-, $(PY_VERSIONS)) - -install-stamp-%: - $(MAKE) -C build-$* PYTHON=`which $*` DESTDIR=$(CURDIR)/debian/tmp install - touch $@ - -install/python-kml:: $(addprefix install-stamp-, $(PY_VERSIONS)) - -binary-install/python-kml:: install/python-kml - # removes build-time rpaths - for version in $(PY_VERSIONS); \ - do \ - chrpath --delete $(CURDIR)/debian/python-kml/usr/lib/$$version/*-packages/*.so ; \ - done - dh_python2 -ppython-kml - -binary-install/libkml-dev:: - # removes autotools stuff - find $(CURDIR)/debian/libkml-dev/usr/share/doc/libkml-dev/examples -type f -name Makefile.* -delete - # removes python related stuff - find $(CURDIR)/debian/libkml-dev/usr/lib -name libkml*python*.so* -delete - -clean:: - -rm -rf $(addprefix build-, $(PY_VERSIONS)) - -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) -=== DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -100,5 +42,4 @@ override_dh_makeshlibs: override_dh_python: dh_python2 -ppython-kml - 977fc73c45d270c273f875ebadcff3a1b1b86162 -- A library to manipulate KML 2.2 OGC standard files ___ 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] libkml branch, master, updated. upstream/1.3.0_r863-54-g5db8f17
The following commit has been merged in the master branch: commit 5db8f171eb105bad8e26e2018e7e32d647ab977e Merge: 0b7e71fa3326ea43cfb32de04517ebdf24b664b3 8f4c5edcfee2696e4f38242dd8830ceee75bd580 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 10 16:35:49 2013 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/libkml -- A library to manipulate KML 2.2 OGC standard files ___ 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] libkml branch, master, updated. upstream/1.3.0_r863-54-g5db8f17
The following commit has been merged in the master branch: commit 0b7e71fa3326ea43cfb32de04517ebdf24b664b3 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 10 16:27:32 2013 +0200 Removed obsolete patch. diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff deleted file mode 100644 index ae03793..000 --- a/debian/patches/reautoconfiscated.diff +++ /dev/null @@ -1,495 +0,0 @@ -Index: git/configure -=== git.orig/configure 2011-03-29 14:50:08.0 +0200 -+++ git/configure 2011-03-29 14:52:31.0 +0200 -@@ -14847,7 +14847,7 @@ - PLATFORM= - SHLIBSUFFIX= - case `uname -s` in -- Linux) PLATFORM=linux -+ Linux|GNU/kFreeBSD) PLATFORM=linux - SHLIBSUFFIX=so - ;; - Darwin) PLATFORM=darwin -Index: git/examples/engine/Makefile.in -=== git.orig/examples/engine/Makefile.in 2011-03-29 14:50:08.0 +0200 -+++ git/examples/engine/Makefile.in2011-03-29 14:52:31.0 +0200 -@@ -308,7 +308,7 @@ - AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 - --@GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti -+@GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti - balloonwalker_SOURCES = balloonwalker.cc - balloonwalker_LDADD = \ - $(top_builddir)/src/kml/engine/libkmlengine.la \ -Index: git/examples/gpx/Makefile.in -=== git.orig/examples/gpx/Makefile.in 2011-03-29 14:50:08.0 +0200 -+++ git/examples/gpx/Makefile.in 2011-03-29 14:52:31.0 +0200 -@@ -209,7 +209,7 @@ - AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 - --@GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti -+@GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti - gpxtracktokml_SOURCES = gpxtracktokml.cc - gpxtracktokml_LDADD = \ - $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ -Index: git/examples/gx/Makefile.in -=== git.orig/examples/gx/Makefile.in 2011-03-29 14:50:08.0 +0200 -+++ git/examples/gx/Makefile.in2011-03-29 14:52:31.0 +0200 -@@ -216,7 +216,7 @@ - AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_srcdir)/third_party/boost_1_34_1 - --@GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti -+@GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti - gpxfly_SOURCES = gpxfly.cc - gpxfly_LDADD = \ - $(top_builddir)/src/kml/convenience/libkmlconvenience.la \ -Index: git/examples/hellonet/Makefile.in -=== git.orig/examples/hellonet/Makefile.in 2011-03-29 14:50:08.0 +0200 -+++ git/examples/hellonet/Makefile.in 2011-03-29 14:52:31.0 +0200 -@@ -384,7 +384,7 @@ - @HAVE_CURL_TRUE@-I$(top_srcdir)/examples/hellonet \ - @HAVE_CURL_TRUE@-I$(top_srcdir)/third_party/boost_1_34_1 - --@GCC_TRUE@@HAVE_CURL_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti -+@GCC_TRUE@@HAVE_CURL_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti - @HAVE_CURL_TRUE@noinst_LTLIBRARIES = libcurlfetch.la - @HAVE_CURL_TRUE@libcurlfetch_la_SOURCES = curlfetch.cc - @HAVE_CURL_TRUE@libcurlfetch_la_LIBADD = -lcurl -Index: git/examples/helloworld/Makefile.in -=== git.orig/examples/helloworld/Makefile.in 2011-03-29 14:50:08.0 +0200 -+++ git/examples/helloworld/Makefile.in2011-03-29 14:52:31.0 +0200 -@@ -332,7 +332,7 @@ - -I$(top_srcdir)/examples/helloworld \ - -I$(top_srcdir)/third_party/boost_1_34_1 - --@GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti -+@GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti - noinst_LTLIBRARIES = libhelloutil.la - libhelloutil_la_SOURCES = print.cc - libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la -Index: git/examples/regionator/Makefile.in -=== git.orig/examples/regionator/Makefile.in 2011-03-29 14:50:08.0 +0200 -+++ git/examples/regionator/Makefile.in2011-03-29 14:52:31.0 +0200 -@@ -219,7 +219,7 @@ - -I$(top_srcdir)/third_party/boost_1_34_1 \ - -I$(top_srcdir)/third_party/zlib-1.2.3/contrib - --@GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti -+@GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti - csvregionator_SOURCES = csvregionator.cc - csvregionator_LDADD = \ - $(top_builddir)/src/kml/base/libkmlbase.la \ -Index: git/examples/xsd/Makefile.in -=== git.orig
[SCM] grass branch, alioth/alioth/svn-import/6.2.1, created. debian/6.2.1-3-5-g1a7c8ac
The branch, alioth/alioth/svn-import/6.2.1 has been created at 1a7c8ac35d554402576cab59490ab13759dfbdb2 (commit) - Shortlog commit 1a7c8ac35d554402576cab59490ab13759dfbdb2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Jun 22 12:13:12 2007 + Fixing #429969 commit 2d6921ba0245dd80223f045bebec052b239f695d Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat May 26 17:45:21 2007 + Fixing priority commit 6ad3e15dd9ebdc39dbc17328fdb92e722ce92e86 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat May 26 17:44:06 2007 + Fixing grass.conf path commit ac768cc3f7de2cd8145622d9d7dd2c807823059e Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat May 26 17:01:04 2007 + Changes for ld.so commit 7e8e7ce7139792b41eabdf8308d8ba2a8cc9acf7 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu May 17 16:33:08 2007 + New patch xterm.dpatch commit 6dde9a1e86effbae9114dcddb137d7c837b47f0e Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Apr 30 14:42:42 2007 + Preparing 6.2.1-3 commit a58b02026006c23281ac095a05431626b094b275 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Apr 30 14:35:28 2007 + Banching for 6.2.1 commit 814ef3c329d1b575003c851b73706021aa75b876 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Apr 10 15:37:35 2007 + Tagging 6.2.1-2 --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/6.2.0, created. 9592271c38df5c89c08e838b67b0b3a4946facde
The branch, alioth/alioth/svn-import/6.2.0 has been created at 9592271c38df5c89c08e838b67b0b3a4946facde (commit) - Shortlog --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/6.4.0%7Erc4-lenny-bpo, created. debian/6.4.0%7Erc4-3-3-ge9880e5
The branch, alioth/alioth/svn-import/6.4.0%7Erc4-lenny-bpo has been created at e9880e50143c532c5c04ff8b018171a603a949a9 (commit) - Shortlog commit e9880e50143c532c5c04ff8b018171a603a949a9 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jul 16 13:01:23 2009 + commit c9f6a2a82e90d36c0cc2eaff86fafaaad31ac890 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jul 16 12:54:16 2009 + Branching for bpo from current testing version commit 2ebe80f425ec913a82a59ddcee5f7c771f2db474 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 12 21:14:35 2009 + [svn-buildpackage] Tagging grass (6.4.0~rc4-3) --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/master, created. upstream/6.4.0-14-gb85e169
The branch, alioth/alioth/master has been created at b85e1693fbdd618f047287a08ff3b64beb0d40b5 (commit) - Shortlog --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/upstream, created. upstream/6.4.0-2-gd17e780
The branch, alioth/alioth/upstream has been created at d17e78060eb7f982378e0a918660f838708d9941 (commit) - Shortlog --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/6.2.3, created. debian/6.2.3-2-6-g4cd2862
The branch, alioth/alioth/svn-import/6.2.3 has been created at 4cd28621cb61bd4812460f41ae4d708b6e532d59 (commit) - Shortlog commit 4cd28621cb61bd4812460f41ae4d708b6e532d59 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jul 10 09:06:13 2008 + Branching 6.2.3 --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/etch, created. debian/6.0.2-6-2-g5b2885b
The branch, alioth/alioth/svn-import/etch has been created at 5b2885b5bf5ceb1fc1ef340bc103a96e24b49f62 (commit) - Shortlog commit 5b2885b5bf5ceb1fc1ef340bc103a96e24b49f62 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Mar 6 09:10:02 2007 + Creating etch branch from 6.0 series --- -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-126-g1ce5722
The following commit has been merged in the master branch: commit 1ce572249ac08b6738bea5df5155bd221d860fd2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Sep 18 14:51:20 2013 +0200 Missing b-d on hardening-includes added. diff --git a/debian/changelog b/debian/changelog index 5816cb6..70b5de5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ grass (6.4.3-1) unstable; urgency=low [ Francesco Paolo Lovergine ] * Modified libtiff dependencies to work as in current plan for libtiff migration. + * Added missing hardening-includes build-dep. -- Francesco Paolo Lovergine fran...@debian.org Wed, 18 Sep 2013 13:50:49 +0200 diff --git a/debian/control b/debian/control index cfffed7..9f11910 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,8 @@ Build-depends: python-wxgtk2.8, libwxgtk2.8-dev, python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), - unixodbc-dev + unixodbc-dev, + hardening-includes Standards-Version: 3.9.3 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ diff --git a/debian/control.in b/debian/control.in index 4e10ba7..1b254ce 100644 --- a/debian/control.in +++ b/debian/control.in @@ -34,7 +34,8 @@ Build-depends: python-wxgtk2.8, libwxgtk2.8-dev, python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), - unixodbc-dev + unixodbc-dev, + hardening-includes Standards-Version: 3.9.3 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ -- Geographic Resources Analysis Support System ___ 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] grass tag, upstream/6.4.3, created. upstream/6.4.1-3-g019c645
The tag, upstream/6.4.3 has been created at 019c64525ca680069e4f25d03937dd6b148cf7b8 (commit) - Shortlog commit 019c64525ca680069e4f25d03937dd6b148cf7b8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Sep 18 14:15:22 2013 +0200 Updated upstream branch for 6.4.3 --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/6.1, created. 46842ab39b7e71acc1a5d2fac2a52aac4dbfd71a
The branch, alioth/alioth/svn-import/6.1 has been created at 46842ab39b7e71acc1a5d2fac2a52aac4dbfd71a (commit) - Shortlog --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/6.0, created. debian/6.0.2-6-1-g00ee129
The branch, alioth/alioth/svn-import/6.0 has been created at 00ee129400f8a2700ea3e5d1959ffe8237a9829e (commit) - Shortlog --- -- Geographic Resources Analysis Support System ___ 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] grass tag, debian/6.4.3-1, created. upstream/6.4.1-126-g1ce5722
The tag, debian/6.4.3-1 has been created at 1ce572249ac08b6738bea5df5155bd221d860fd2 (commit) - Shortlog commit 1ce572249ac08b6738bea5df5155bd221d860fd2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Sep 18 14:51:20 2013 +0200 Missing b-d on hardening-includes added. --- -- Geographic Resources Analysis Support System ___ 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] grass branch, alioth/alioth/svn-import/tcl85, created. debian/6.4.0%7Erc5+41380-1-7-gd317185
The branch, alioth/alioth/svn-import/tcl85 has been created at d3171854560afee1f96831684862fb125177a706 (commit) - Shortlog commit d3171854560afee1f96831684862fb125177a706 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 14 15:08:10 2010 + Merging fix of #594492 commit 6f53a54268bef3afa534be0778360a063e17f1a8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Oct 14 14:23:53 2010 + Moving to 6.4.0 in experimental. commit 5fbbc9ab0321fd13bf9debe4fa78bb1a4ce881f4 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jun 1 12:40:01 2010 + Experimental builds with tcl/tk transition. commit 75bc73d489ed868c503c7082ba065502d4e6bd37 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 24 22:55:53 2010 + Ready for experimental. commit 72d9f730d6b79ada337c863fc1d34b8eddd2fc26 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 24 22:51:54 2010 + Creating branch for Tcl migration in experimental staging area. --- -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-125-ge7a553f
The following commit has been merged in the master branch: commit e7a553fb17dc82705f04aaa7a5f816571fa26003 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Sep 18 14:04:36 2013 +0200 Fixed for new tiff migration. diff --git a/debian/changelog b/debian/changelog index 1d49914..5816cb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ grass (6.4.3-1) unstable; urgency=low + [ M. Hamish Bowman ] * Packaged new upstream version. * Build-Depends on libpng-dev for LibPNG transition. (closes: #662361) @@ -10,7 +11,11 @@ grass (6.4.3-1) unstable; urgency=low * Partial enable of the hardening flags. * Prepare for libtiff-dev transition. (debian-release/2013/05/msg00127.html) - -- M. Hamish Bowman hamis...@yahoo.com Wed, 11 Sep 2013 14:17:50 +1200 + [ Francesco Paolo Lovergine ] + * Modified libtiff dependencies to work as in current plan for libtiff +migration. + + -- Francesco Paolo Lovergine fran...@debian.org Wed, 18 Sep 2013 13:50:49 +0200 grass (6.4.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 159729a..cfffed7 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-depends: libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, - libtiff5-dev | libtiff-dev | libtiff4-dev, + libtiff-dev ( 4.0.3-1~) | libtiff5-dev, libmysqlclient-dev | libmysqlclient15-dev, libncurses5-dev, libpq-dev, @@ -89,7 +89,7 @@ Suggests: wget | curl, # used by r.in.wms xml2 -Provides: grass642 +Provides: grass643 Description: GRASS GIS core components Commonly referred to as GRASS, this is a Geographic Information System (GIS) used for geospatial data management and analysis, diff --git a/debian/control.in b/debian/control.in index 2cb89b8..4e10ba7 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,7 +19,7 @@ Build-depends: libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng-dev | libpng12-dev, - libtiff5-dev | libtiff4-dev, + libtiff-dev ( 4.0.3-1~) | libtiff5-dev, libmysqlclient-dev | libmysqlclient15-dev, libncurses5-dev, libpq-dev, -- Geographic Resources Analysis Support System ___ 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] mapserver tag, debian/debian/6.2.1-3, created. upstream/6.2.1-105-gf2e65d9
The tag, debian/debian/6.2.1-3 has been created at f2e65d9661da48193516e615645ad0460e92de05 (commit) - Shortlog commit f2e65d9661da48193516e615645ad0460e92de05 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jul 23 16:46:00 2013 +0200 Fixing building failure. --- -- Packaging for MapServer ___ 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] mapserver branch, master, updated. upstream/6.2.1-105-gf2e65d9
The following commit has been merged in the master branch: commit f2e65d9661da48193516e615645ad0460e92de05 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jul 23 16:46:00 2013 +0200 Fixing building failure. diff --git a/debian/changelog b/debian/changelog index b9b49d2..9f8e78e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ mapserver (6.2.1-3) unstable; urgency=low + [ Bas Couwenberg ] * Upload for Debian closes: #706157 * Merge changes from 6.0.1-4: - Migrated to debhelper level 9. @@ -46,6 +47,10 @@ mapserver (6.2.1-3) unstable; urgency=low don't call ldconfig for php5-mapscript. * Use dh_autoreconf for retooling. + [ Francesco Paolo Lovergine ] + * Relaxing dh_makeshlibs checking to avoid failure but document +changes in symbols. + -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Jun 2013 22:00:07 +0200 mapserver (6.2.1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 3b2ffbb..c7ccede 100755 --- a/debian/rules +++ b/debian/rules @@ -192,7 +192,7 @@ override_dh_compress: dh_compress -X.xml -X.xsd -X.xsl override_dh_makeshlibs: - dh_makeshlibs -Xphp_mapscript + dh_makeshlibs -Xphp_mapscript -- -c0 override_dh_python2: dh_python2 -ppython-mapscript -- Packaging for MapServer ___ 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] mapserver tag, debian/6.2.1-3, updated. upstream/6.2.1-105-gf2e65d9
The tag, debian/6.2.1-3 has been updated to f2e65d9661da48193516e615645ad0460e92de05 (commit) from 2dc9da437e935eb9d0488b359aaacf380736dbdb - Shortlog commit f2e65d9661da48193516e615645ad0460e92de05 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jul 23 16:46:00 2013 +0200 Fixing building failure. --- -- Packaging for MapServer ___ 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] mapserver tag, debian/debian/6.2.1-3, deleted. upstream/6.2.1-105-gf2e65d9
The tag, debian/debian/6.2.1-3 has been deleted was f2e65d9661da48193516e615645ad0460e92de05 --- f2e65d9661da48193516e615645ad0460e92de05 Fixing building failure. --- -- Packaging for MapServer ___ 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] mapserver tag, debian/6.0.1-3, created. upstream/6.0.1-25-g98327ed
The tag, debian/6.0.1-3 has been created at 98327ede46bfa4cfb9db03113c41207203447f15 (commit) - Shortlog commit 98327ede46bfa4cfb9db03113c41207203447f15 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Mar 5 15:41:26 2012 +0100 The old function_entry typedef renamed in zend_function_entry. --- -- Packaging for MapServer ___ 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] saga tag, debian/2.0.8+dfsg-3, created. upstream/2.0.8-119-g864c173
The tag, debian/2.0.8+dfsg-3 has been created at 864c173c2549f6935fbf86cfffee7279856671aa (commit) - Shortlog commit 864c173c2549f6935fbf86cfffee7279856671aa Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jun 18 14:30:50 2012 +0200 Fixed #669468 --- -- Saga GIS ___ 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] geos tag, debian/3.3.3-1, created. upstream/3.3.3-61-g75719df
The tag, debian/3.3.3-1 has been created at 75719df948a066ebdebb37155fea19f645c5c177 (commit) - Shortlog commit 75719df948a066ebdebb37155fea19f645c5c177 Merge: 70c720e 722309c Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 23 17:40:27 2012 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/geos Conflicts: debian/changelog debian/patches/geos-config --- -- Geometry engine for Geographic Information Systems ___ 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] gdal branch, master, updated. upstream/1.10.0-157-g72ed954
The following commit has been merged in the master branch: commit c8e53a2fcfd689cee86a4318432a0770b180435b Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jul 1 10:29:50 2013 +0200 Fixed symbols files and plugins related patch. diff --git a/debian/changelog b/debian/changelog index 3036852..0d5558d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -gdal (1.10.0-0~exp3) UNRELEASED; urgency=low +gdal (1.10.0-0~exp3) experimental; urgency=low * Added netcdf-bin build-dep to get nc-config, as required by current config. + * Fixed gdalpaths patch for version 1.10. + * Fixed symbols files to manage correctly library dependencies. -- Francesco Paolo Lovergine fran...@debian.org Wed, 26 Jun 2013 11:19:15 +0200 diff --git a/debian/libgdal1h.symbols.amd64 b/debian/libgdal1h.symbols.amd64 index 09caf16..34e77e7 100644 --- a/debian/libgdal1h.symbols.amd64 +++ b/debian/libgdal1h.symbols.amd64 @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.8.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.8.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.8.0 diff --git a/debian/libgdal1h.symbols.armel b/debian/libgdal1h.symbols.armel index 75e925d..9a8fc13 100644 --- a/debian/libgdal1h.symbols.armel +++ b/debian/libgdal1h.symbols.armel @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.8.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.8.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.8.0 diff --git a/debian/libgdal1h.symbols.armhf b/debian/libgdal1h.symbols.armhf index 75e925d..9a8fc13 100644 --- a/debian/libgdal1h.symbols.armhf +++ b/debian/libgdal1h.symbols.armhf @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.8.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.8.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.8.0 diff --git a/debian/libgdal1.symbols.common b/debian/libgdal1h.symbols.common similarity index 100% rename from debian/libgdal1.symbols.common rename to debian/libgdal1h.symbols.common diff --git a/debian/libgdal1h.symbols.i386 b/debian/libgdal1h.symbols.i386 index bd3bb93..ae1f3b1 100644 --- a/debian/libgdal1h.symbols.i386 +++ b/debian/libgdal1h.symbols.i386 @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.9.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.9.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.9.0 diff --git a/debian/libgdal1h.symbols.ia64 b/debian/libgdal1h.symbols.ia64 index dc3e815..b1884f8 100644 --- a/debian/libgdal1h.symbols.ia64 +++ b/debian/libgdal1h.symbols.ia64 @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.9.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.9.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.9.0 diff --git a/debian/libgdal1h.symbols.mips b/debian/libgdal1h.symbols.mips index a4e856f..85c74d6 100644 --- a/debian/libgdal1h.symbols.mips +++ b/debian/libgdal1h.symbols.mips @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.9.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.9.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.9.0 diff --git a/debian/libgdal1h.symbols.mipsel b/debian/libgdal1h.symbols.mipsel index a4e856f..85c74d6 100644 --- a/debian/libgdal1h.symbols.mipsel +++ b/debian/libgdal1h.symbols.mipsel @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.9.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.9.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.9.0 diff --git a/debian/libgdal1h.symbols.powerpc b/debian/libgdal1h.symbols.powerpc index 762faee..080a47a 100644 --- a/debian/libgdal1h.symbols.powerpc +++ b/debian/libgdal1h.symbols.powerpc @@ -1,5 +1,5 @@ -libgdal.so.1 libgdal1 #MINVER# -#include libgdal1.symbols.common +libgdal.so.1 libgdal1h #MINVER# +#include libgdal1h.symbols.common (c++)CheckASCII(unsigned char*, int)@GDAL_1.8 1.8.0 (c++)CreatePath(HDF5GroupObjects*)@GDAL_1.8 1.8.0 (c++)DDFScanInt(char const*, int)@GDAL_1.8 1.8.0 diff --git a/debian/libgdal1h.symbols.s390 b/debian/libgdal1h.symbols.s390 index 0e265ba..89a52ce 100644 --- a/debian
[SCM] gdal branch, master, updated. upstream/1.10.0-157-g72ed954
The following commit has been merged in the master branch:
commit e33fce35bf4e4f5fd842642231b24fc89a610972
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Jul 1 12:09:49 2013 +0200
Added java support.
diff --git a/debian/changelog b/debian/changelog
index 0d5558d..d8d3ca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gdal (1.10.0-0~exp3) experimental; urgency=low
* Added netcdf-bin build-dep to get nc-config, as required by current config.
* Fixed gdalpaths patch for version 1.10.
* Fixed symbols files to manage correctly library dependencies.
+ * Added java support. Thanks Ezequiel Lara Gómez for initial patch.
+(closes: #628022)
-- Francesco Paolo Lovergine fran...@debian.org Wed, 26 Jun 2013 11:19:15
+0200
diff --git a/debian/control b/debian/control
index 05ffe88..9fffca6 100644
--- a/debian/control
+++ b/debian/control
@@ -264,3 +264,28 @@ Depends: libgdal-ruby1.8, ${misc:Depends}
Description: Ruby bindings to the Geospatial Data Abstraction Library
This is a dummy package which depends on current ruby version
to support GDAL/OGR library binding upgrades.
+
+Package: libgdal-java
+Section: java
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Homepage: http://map.hut.fi/doc/Geo-GDAL/html/
+Description: Java bindings to the Geospatial Data Abstraction Library
+ GDAL is a translator library for raster geospatial data formats.
+ As a library, it presents a single abstract data model to the
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports 40+ popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more.
+ .
+ This package contains Java bindings for GDAL/OGR library.
+
diff --git a/debian/libgdal-java.install b/debian/libgdal-java.install
new file mode 100644
index 000..ca4ff23
--- /dev/null
+++ b/debian/libgdal-java.install
@@ -0,0 +1,2 @@
+usr/lib/jni/*
+usr/share/java/*
diff --git a/debian/patches/java.opt b/debian/patches/java.opt
new file mode 100644
index 000..d290356
--- /dev/null
+++ b/debian/patches/java.opt
@@ -0,0 +1,13 @@
+Index: gdal/swig/java/java.opt
+===
+--- gdal.orig/swig/java/java.opt 2013-07-01 12:07:30.0 +0200
gdal/swig/java/java.opt2013-07-01 12:07:50.0 +0200
+@@ -1,7 +1,7 @@
+ #
+ # Java Stuff
+ #JAVA_HOME = C:\Program Files\Java\jdk1.6.0_16
+-JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
++JAVA_HOME = /usr/lib/jvm/default-java/
+ JAVADOC=$(JAVA_HOME)/bin/javadoc
+ JAVAC=$(JAVA_HOME)/bin/javac
+ JAVA=$(JAVA_HOME)/bin/java
diff --git a/debian/patches/series b/debian/patches/series
index 95e771e..e52fe93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ mrsid-plugin
symver
spatialite
force-ruby1.8
+java.opt
diff --git a/debian/rules b/debian/rules
index 769188b..2d598be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,7 @@ configure-stamp:
--with-mysql \
--with-perl \
--with-ruby \
+ --with-java=/usr/lib/jvm/default-java \
--with-python \
--with-odbc \
--with-ogdi \
@@ -114,6 +115,7 @@ build-stamp: configure-stamp
rm -rf $(CURDIR)/swig/perl/*.c $(CURDIR)/swig/perl/*.cpp
$(MAKE) -C $(CURDIR)/swig/perl generate build
$(MAKE) -C $(CURDIR)/swig/ruby generate build
+ $(MAKE) -C $(CURDIR)/swig/java clean generate build
# It needs pre-installing just after the building due to intermediate
cleaning.
# Apply conditionally an on-fly patch for pre 1.3.38 swig versions.
@@ -138,6 +140,7 @@ clean:
[ ! -f GDALmake.opt ] || $(MAKE) distclean
rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
+ rm -rf $(CURDIR)/swig/java/*.so $(CURDIR)/swig/java/*.o
$(CURDIR)/swig/java/build/ $(CURDIR)/swig/java/*.jar $(CURDIR)/swig/java/.libs
rm -rf $(CURDIR)/.libs
rm -f GDALmake.opt-*
rm -rf $(CURDIR)/man/man1
@@ -156,7 +159,7 @@ install: build
dh_installdirs
cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
- $(MAKE) install BINDINGS=perl ruby DESTDIR=$(CURDIR)/debian/tmp \
+ $(MAKE) install BINDINGS=perl ruby java DESTDIR=$(CURDIR)/debian/tmp \
INST_DATA=\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)
$(MAKE) install-docs
[SCM] gdal branch, master, updated. upstream/1.10.0-157-g72ed954
The following commit has been merged in the master branch: commit 72ed954b193eacb885544cb496d9b830bf5e0d42 Merge: 7e6c12966be02831bc5fd38a2a6dd02d99f7ad41 282cd7d1384987d8d39b4a11df4d41483eb23898 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jul 1 15:16:01 2013 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal Conflicts: debian/changelog diff --combined debian/patches/series index f827348,5045b36..b8f3b9a --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,5 -1,4 +1,4 @@@ ogdi - doc rubymakefile man gdalpaths @@@ -10,5 -9,3 +9,5 @@@ mrsid-plugi symver spatialite force-ruby1.8 +java.opt +java-make -- 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
[SCM] gdal branch, master, updated. upstream/1.10.0-157-g72ed954
The following commit has been merged in the master branch:
commit 7e6c12966be02831bc5fd38a2a6dd02d99f7ad41
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Jul 1 13:39:44 2013 +0200
Fixed a b-d for java and added a new patch.
diff --git a/debian/changelog b/debian/changelog
index d8d3ca5..5e93140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ gdal (1.10.0-0~exp3) experimental; urgency=low
* Added netcdf-bin build-dep to get nc-config, as required by current config.
* Fixed gdalpaths patch for version 1.10.
* Fixed symbols files to manage correctly library dependencies.
- * Added java support. Thanks Ezequiel Lara Gómez for initial patch.
+ * Added java support. Thanks Ezequiel Lara Gómez for the initial patch.
+Added a pair of new b-deps for that, along with two new patches java*.
(closes: #628022)
-- Francesco Paolo Lovergine fran...@debian.org Wed, 26 Jun 2013 11:19:15
+0200
diff --git a/debian/control b/debian/control
index e87467d..48948c2 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev
(= 1:4.0.0),
libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev
(= 0.9.1-1~),
libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (= 1.0.0),
libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy,
- netcdf-bin, default-jdk
+ netcdf-bin, default-jdk, ant
Build-Conflicts: python-setuptools
Standards-Version: 3.9.4
XS-Python-Version: all
diff --git a/debian/patches/java-make b/debian/patches/java-make
new file mode 100644
index 000..82506e8
--- /dev/null
+++ b/debian/patches/java-make
@@ -0,0 +1,13 @@
+Index: gdal/swig/java/GNUmakefile
+===
+--- gdal.orig/swig/java/GNUmakefile2013-07-01 13:38:05.0 +0200
gdal/swig/java/GNUmakefile 2013-07-01 13:38:19.0 +0200
+@@ -35,7 +35,7 @@
+
+ clean:
+ -rm -f ${JAVA_MODULES}
+- -rm *.$(OBJ_EXT)
++ -rm -f *.$(OBJ_EXT)
+ ant clean
+
+ veryclean: clean
diff --git a/debian/patches/series b/debian/patches/series
index e52fe93..f827348 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ symver
spatialite
force-ruby1.8
java.opt
+java-make
--
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
[SCM] gdal branch, master, updated. upstream/1.10.0-157-g72ed954
The following commit has been merged in the master branch: commit 1a3e2edde302b881fcdb9c2a0baa18f93b23458e Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jul 1 12:34:37 2013 +0200 Added missing b-d for java. diff --git a/debian/control b/debian/control index 9fffca6..e87467d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0), libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev (= 0.9.1-1~), libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (= 1.0.0), libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy, - netcdf-bin + netcdf-bin, default-jdk Build-Conflicts: python-setuptools Standards-Version: 3.9.4 XS-Python-Version: all -- 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
[SCM] gdal tag, debian/1.9.2-1%7Eexp3, created. upstream/1.10.0-145-g7e6c129
The tag, debian/1.9.2-1%7Eexp3 has been created at 7e6c12966be02831bc5fd38a2a6dd02d99f7ad41 (commit) - Shortlog commit 7e6c12966be02831bc5fd38a2a6dd02d99f7ad41 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jul 1 13:39:44 2013 +0200 Fixed a b-d for java and added a new patch. --- -- 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
[SCM] gmt branch, master, updated. upstream/4.5.5-33-g22e8a31
The following commit has been merged in the master branch:
commit 62bec927e4f6ef45484e3aa6b7c0116da9855680
Merge: 228b4c8cc13b8a31ef29d795c9465f08534039b1
c90a8590caa089d2967f3f7b355320c4f900d6a1
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Fri Mar 16 14:33:26 2012 +0100
Merge branch 'fix'
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 5228c05,2ba810a..157d76e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,25 +1,42 @@@
+gmt (4.5.7-2~exp1) experimental; urgency=low
+
+ * Added Octave support and an ad-hoc new package for that.
+ * Added octave-gmt package for supporting grid files in GNU octave.
+ * Revised build-deps.
+ * Debhelper level set to 9.
+ * Lintian-based cleanups:
- - Fixed debian/changelog for a couple of silly warnings.
- - Added ${misc:Depends} to all pkgs.
++ - Fixed debian/changelog for a couple of silly warnings.
++ - Added ${misc:Depends} to all pkgs.
+ * Revised for Suggestions.
+ * Fixed previous changelog for layout and contents.
+
- -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 11:38:26
+0100
++ -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 14:33:15
+0100
++
+ gmt (4.5.7-2) unstable; urgency=low
+
+ * A link moved from gmt to gmt-doc, so conflicting current gmt-doc with
+ old gmt.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 14:14:25
+0100
gmt (4.5.7-1) unstable; urgency=low
* New upstream version with a new compact distribution.
(closes: #663099)
* Policy bumped to 3.9.3, no changes required.
- * Now use in embedded mode quilt and all tar/unpack/patch target have been
dropped.
- * Get-orig-source and all other special target dropped due to semplification
+ * Now use in embedded mode quilt and all tar/unpack/patch target have been
+dropped.
+ * Get-orig-source and all other special target dropped due to simplification
of the distribution.
* Added a build-dep on autotools-dev and provided usual snippets to override
config.{sub,guess} files before configuring.
* Moved to copyright format version 1.0. Note that in 4.5.6 GMT team added
compatibility with any later version for GPL-2.
- * Splitted links helper in different files for each package to avoid
+ * Split links helper in different files for each package to avoid
unresolved links.
- * This package requires GSHHS = 2.2, as provided by a new separate package.
+ * This package is compatible with GSHHS = 2.2, as provided by a new
separate
+package. Note that upstream no more distributes old datasets, so any
+previous package cannot use anymore high/full resolutions.
* Fixed some symlinks.
(closes: #343383)
* Added a patch kfreebsd to allow working with GNU/kFreeBSD.
@@@ -37,7 -27,7 +44,7 @@@
* Fixed bashism in psbbox.sh with patch bashism.
(closes: #581103)
- -- Francesco Paolo Lovergine fran...@debian.org Tue, 13 Mar 2012 14:24:33
+0100
+ -- Francesco Paolo Lovergine fran...@debian.org Tue, 13 Mar 2012 16:40:33
+0100
gmt (4.5.6-1) unstable; urgency=low
diff --combined debian/control
index e0c42b2,8a3d872..83f81b7
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,8 +3,9 @@@ Section: scienc
Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Torsten Landschoff tors...@debian.org, Francesco Paolo Lovergine
fran...@debian.org
-Build-Depends: libnetcdf-dev, debhelper (= 8), bzip2, libxmu-headers,
libxaw7-dev, autotools-dev
-Build-Depends-Indep: debhelper (= 8), quilt, bzip2
+Build-Depends: libnetcdf-dev, debhelper (= 8), bzip2, libxmu-headers,
+ libxaw7-dev, autotools-dev, octave-pkg-dev (= 1.0.0)
+Build-Depends-Indep: debhelper (= 9)
Standards-Version: 3.9.3
Homepage: http://gmt.soest.hawaii.edu/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gmt.git
@@@ -61,7 -60,6 +61,7 @@@ Package: gmt-doc-pd
Architecture: all
Section: doc
Suggests: pdf-viewer
+Depends: ${misc:Depends}
Description: PDF docs for GMT, the Generic Mapping Tools
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@@ -78,7 -76,6 +78,7 @@@ Package: gmt-tutorial-pd
Architecture: all
Section: doc
Suggests: pdf-viewer
+Depends: ${misc:Depends}
Description: Tutorial for GMT, the Generic Mapping Tools (PDF)
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@@ -95,7 -92,7 +95,8 @@@ Package: gmt-do
Architecture: all
Section: doc
Suggests: www-browser
+Depends: ${misc:Depends}
+ Conflicts: gmt ( 4.5.7-1~)
Description: HTML documentation for GMT, the Generic Mapping Tools
GMT is a collection of UNIX tools that allow users to manipulate
(x,y) and (x,y,z) data sets
[SCM] gmt branch, master, updated. upstream/4.5.5-33-g22e8a31
The following commit has been merged in the master branch: commit 3fbb4d1f515af7a79a0f974ca343198c8c932838 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Mar 16 14:53:54 2012 +0100 Fixed experimental version. diff --git a/debian/changelog b/debian/changelog index 157d76e..4a34030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gmt (4.5.7-2~exp1) experimental; urgency=low +gmt (4.5.7-3~exp1) experimental; urgency=low * Added Octave support and an ad-hoc new package for that. * Added octave-gmt package for supporting grid files in GNU octave. @@ -10,7 +10,7 @@ gmt (4.5.7-2~exp1) experimental; urgency=low * Revised for Suggestions. * Fixed previous changelog for layout and contents. - -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 14:33:15 +0100 + -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 14:53:42 +0100 gmt (4.5.7-2) unstable; urgency=low -- Generic Mapping 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
[SCM] gmt branch, master, updated. upstream/4.5.5-33-g22e8a31
The following commit has been merged in the master branch: commit c90a8590caa089d2967f3f7b355320c4f900d6a1 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Mar 16 14:15:26 2012 +0100 Fixed conflicts between gmt-doc and old gmt. diff --git a/debian/changelog b/debian/changelog index f8aa7fd..2ba810a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gmt (4.5.7-2) unstable; urgency=low + + * A link moved from gmt to gmt-doc, so conflicting current gmt-doc with +old gmt. + + -- Francesco Paolo Lovergine fran...@debian.org Fri, 16 Mar 2012 14:14:25 +0100 + gmt (4.5.7-1) unstable; urgency=low * New upstream version with a new compact distribution. diff --git a/debian/control b/debian/control index 57e95e6..8a3d872 100644 --- a/debian/control +++ b/debian/control @@ -92,6 +92,7 @@ Package: gmt-doc Architecture: all Section: doc Suggests: www-browser +Conflicts: gmt ( 4.5.7-1~) Description: HTML documentation for GMT, the Generic Mapping Tools GMT is a collection of UNIX tools that allow users to manipulate (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding, -- Generic Mapping 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
[SCM] gmt branch, master, updated. upstream/4.5.5-33-g22e8a31
The following commit has been merged in the master branch: commit 22e8a31efa2e2fdd37df764bbf0c1461c993 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Jun 26 11:17:23 2013 +0200 Changing version. diff --git a/debian/changelog b/debian/changelog index 4a34030..bd67ab6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gmt (4.5.7-3~exp1) experimental; urgency=low +gmt (4.5.7-3) UNRELEASED; urgency=low * Added Octave support and an ad-hoc new package for that. * Added octave-gmt package for supporting grid files in GNU octave. -- Generic Mapping 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
[SCM] gdal branch, master, updated. upstream/1.10.0-141-g456e99c
The following commit has been merged in the master branch:
commit 5300a2db583224d6eeff4a96a55f452ddcd37474
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Tue Jun 25 16:38:26 2013 +0200
Fixed Provides:
diff --git a/debian/changelog b/debian/changelog
index 69ca7cf..5fc1da4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.10.0-0~exp2) experimental; urgency=low
+
+ * Removed Provides: libgdal1 in debian/control.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Tue, 25 Jun 2013 16:30:39
+0200
+
gdal (1.10.0-0~exp1) experimental; urgency=low
* Moved to new LIBKML driver instead of the old KML one. It has a much
diff --git a/debian/control b/debian/control
index eac038f..2272aec 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: proj-bin
-Provides: libgdal1
Replaces: libgdal1
Conflicts: libgdal1 (= 1.10.0-0~)
Breaks: libgdal1-1.6.0
--
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
[SCM] gdal branch, master, updated. upstream/1.10.0-141-g456e99c
The following commit has been merged in the master branch: commit 456e99c0a82e0355f62f20f053b6e87f0ab5f681 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Jun 26 11:20:15 2013 +0200 Added a new build-dep diff --git a/debian/changelog b/debian/changelog index 5fc1da4..3036852 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gdal (1.10.0-0~exp3) UNRELEASED; urgency=low + + * Added netcdf-bin build-dep to get nc-config, as required by current config. + + -- Francesco Paolo Lovergine fran...@debian.org Wed, 26 Jun 2013 11:19:15 +0200 + gdal (1.10.0-0~exp2) experimental; urgency=low * Removed Provides: libgdal1 in debian/control. diff --git a/debian/control b/debian/control index 2272aec..05ffe88 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0), ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev, libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev (= 0.9.1-1~), libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (= 1.0.0), - libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy + libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy, + netcdf-bin Build-Conflicts: python-setuptools Standards-Version: 3.9.4 XS-Python-Version: all -- 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
[SCM] gdal branch, master, updated. upstream/1.10.0-135-gc977e24
The following commit has been merged in the master branch: commit cd730eac3ed78841a8e40de7aa262ee04551951c Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jun 20 10:06:29 2013 +0200 Refreshed patches for 1.10 diff --git a/debian/changelog b/debian/changelog index b8dc4e1..59d3526 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ 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. All patches refreshed. -- Francesco Paolo Lovergine fran...@debian.org Sun, 04 Apr 2013 11:39:57 +0100 diff --git a/debian/patches/doc b/debian/patches/doc index 5513ef8..48627d6 100644 --- a/debian/patches/doc +++ b/debian/patches/doc @@ -1,10 +1,10 @@ Index: gdal/doc/index.dox === gdal.orig/doc/index.dox2012-02-20 11:45:37.0 +0100 -+++ gdal/doc/index.dox 2012-02-20 11:56:28.0 +0100 +--- gdal.orig/doc/index.dox2013-06-20 10:03:58.0 +0200 gdal/doc/index.dox 2013-06-20 10:03:58.0 +0200 @@ -19,7 +19,7 @@ - a href=http://trac.osgeo.org/gdal/wiki/Release/1.8.1-News;NEWS/a - page describes the July 2011 GDAL/OGR 1.8.1 release. + a href=http://trac.osgeo.org/gdal/wiki/Release/1.9.2-News;NEWS/a + page describes the October 2012 GDAL/OGR 1.9.2 release. -The related a href=ogr/index.htmlOGR/a library (which lives within the GDAL source tree) +The related a href=../ogr/index.htmlOGR/a library (which lives within the GDAL source tree) @@ -13,8 +13,8 @@ Index: gdal/doc/index.dox Master: http://www.gdal.orgbr Index: gdal/ogr/index.dox === gdal.orig/ogr/index.dox2012-02-20 11:45:37.0 +0100 -+++ gdal/ogr/index.dox 2012-02-20 11:56:28.0 +0100 +--- gdal.orig/ogr/index.dox2013-06-20 10:03:58.0 +0200 gdal/ogr/index.dox 2013-06-20 10:03:58.0 +0200 @@ -6,7 +6,7 @@ formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, and Mapinfo mid/mif and TAB formats.p diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin index f0719d5..58ee099 100644 --- a/debian/patches/ecw-plugin +++ b/debian/patches/ecw-plugin @@ -1,8 +1,8 @@ -Index: gdal-1.9.0/frmts/ecw/GNUmakefile +Index: gdal/frmts/ecw/GNUmakefile === gdal-1.9.0.orig/frmts/ecw/GNUmakefile 2012-02-20 16:01:45.0 +0100 -+++ gdal-1.9.0/frmts/ecw/GNUmakefile 2012-02-20 16:02:27.0 +0100 -@@ -20,3 +20,12 @@ +--- gdal.orig/frmts/ecw/GNUmakefile2013-06-20 10:05:05.0 +0200 gdal/frmts/ecw/GNUmakefile 2013-06-20 10:05:05.0 +0200 +@@ -21,3 +21,12 @@ $(PLUGIN_SO): $(OBJ) $(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \ -o $(PLUGIN_SO) @@ -15,10 +15,10 @@ Index: gdal-1.9.0/frmts/ecw/GNUmakefile + tar czvf libgdal-ecw-$(GDAL_VER).tar.gz ./libgdal-ecw-$(GDAL_VER) + rm -rf libgdal-ecw-$(GDAL_VER) + -Index: gdal-1.9.0/frmts/ecw/pkg/Makefile.in +Index: gdal/frmts/ecw/pkg/Makefile.in === --- /dev/null 1970-01-01 00:00:00.0 + -+++ gdal-1.9.0/frmts/ecw/pkg/Makefile.in 2012-02-20 16:02:27.0 +0100 gdal/frmts/ecw/pkg/Makefile.in 2013-06-20 10:05:05.0 +0200 @@ -0,0 +1,36 @@ +CC= @CC@ +CXX = @CXX@ @@ -56,10 +56,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/Makefile.in +%.o: %.cpp + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $ + -Index: gdal-1.9.0/frmts/ecw/pkg/README +Index: gdal/frmts/ecw/pkg/README === --- /dev/null 1970-01-01 00:00:00.0 + -+++ gdal-1.9.0/frmts/ecw/pkg/README2012-02-20 16:02:27.0 +0100 gdal/frmts/ecw/pkg/README 2013-06-20 10:05:05.0 +0200 @@ -0,0 +1,30 @@ + Standalone ECW 3.3 Drivers for GDAL + === @@ -91,10 +91,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/README + http://www.ermapper.com/ + http://ermapper.com/Downloads.aspx?v=315 + -Index: gdal-1.9.0/frmts/ecw/pkg/aclocal.m4 +Index: gdal/frmts/ecw/pkg/aclocal.m4 === --- /dev/null 1970-01-01 00:00:00.0 + -+++ gdal-1.9.0/frmts/ecw/pkg/aclocal.m42012-02-20 16:02:27.0 +0100 gdal/frmts/ecw/pkg/aclocal.m4 2013-06-20 10:05:05.0 +0200 @@ -0,0 +1,202 @@ +AC_DEFUN(AC_COMPILER_LOCALHACK, +[ @@ -298,10 +298,10 @@ Index: gdal-1.9.0/frmts/ecw/pkg/aclocal.m4 + AC_SUBST(LD_SHARED,$LD_SHARED) + AC_SUBST(SO_EXT,$SO_EXT) +]) -Index: gdal-1.9.0
[SCM] gdal branch, master, updated. upstream/1.10.0-135-gc977e24
The following commit has been merged in the master branch:
commit c30ab3ffa5babf503d8003059f0865868d479932
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu Jun 20 10:01:40 2013 +0200
Added a required Replaces: in debian/control
It is required because the same library is provided by
the old and new packages.
diff --git a/debian/control b/debian/control
index 5bc0c5a..c238f38 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: proj-bin
Provides: libgdal1
+Replaces: libgdal1
Conflicts: libgdal1 (= 1.10.0-0~)
Description: Geospatial Data Abstraction Library
GDAL is a translator library for raster geospatial data formats.
--
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
[SCM] gdal branch, master, updated. upstream/1.10.0-135-gc977e24
The following commit has been merged in the master branch: commit c977e24e4de49054efab016a33ef101977968a5a Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Jun 21 10:52:28 2013 +0200 A few deb-bugs now are fixed. diff --git a/debian/changelog b/debian/changelog index 59d3526..69ca7cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ gdal (1.10.0-0~exp1) experimental; urgency=low * Moved to new LIBKML driver instead of the old KML one. It has a much -better support for complex KML files. +better support for complex KML files. (closes: #685695) * Merged NMU 1.9.0-3.1: Fix FTBFS when ruby1.9.1 installed: force building with ruby1.8: set variables in debian/rules and new patch force-ruby1.8 to ruby1.8. Thanks to Cédric Boutillier for reviewing and testing this patch. -(Closes: #684433) +(closes: #684433) * Added libarmadillo support. * Added TIFF/GEOTIFF symbols rename to definitively solve problem of symbol collisions for programs that both links geotiff/tiff libraries. @@ -14,6 +14,13 @@ gdal (1.10.0-0~exp1) experimental; urgency=low related functions: changed API declaration. * Policy bumped to 3.9.4. No changes required. * New upstream version with many fixes. All patches refreshed. + (closes: #679887) + * Added a Breaks: libgdal1-1.6.0. I don't know if it still makes sense, +but for sure it does not hurt. (closes: #677403) + * Now debian/rules should be parallel-safe for making. Thanks Gregor Hermann +for the patch. (closes: #686014) + * Now it depends explicitly on epsilon = 0.9.1 by upstream. +(closes: #672738) -- Francesco Paolo Lovergine fran...@debian.org Sun, 04 Apr 2013 11:39:57 +0100 diff --git a/debian/control b/debian/control index c238f38..eac038f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0), python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, python-all-dev (= 2.6.6-3~), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev, ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev, - libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev (= 0.9.1), + libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev (= 0.9.1-1~), libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (= 1.0.0), libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy Build-Conflicts: python-setuptools @@ -28,6 +28,7 @@ Recommends: proj-bin Provides: libgdal1 Replaces: libgdal1 Conflicts: libgdal1 (= 1.10.0-0~) +Breaks: libgdal1-1.6.0 Description: Geospatial Data Abstraction Library GDAL is a translator library for raster geospatial data formats. As a library, it presents a single abstract data model to the diff --git a/debian/rules b/debian/rules index bbdb273..88cd3d4 100755 --- a/debian/rules +++ b/debian/rules @@ -105,8 +105,8 @@ configure-stamp: build-arch: build build-indep: build -build: configure-stamp build-stamp -build-stamp: +build: build-stamp +build-stamp: configure-stamp dh_testdir cp `ls GDALmake.opt-*|tail -1` GDALmake.opt @@ -189,8 +189,8 @@ install: build install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples 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 + echo libgdal1h: embedded-library usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff \ + $(CURDIR)/debian/libgdal1h.lintian-overrides binary-common: dh_testdir @@ -209,14 +209,14 @@ 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 #dh_makeshlibs dh_installdeb - dh_shlibdeps -L libgdal1 -l debian/libgdal1/usr/lib + dh_shlibdeps -L libgdal1 -l debian/libgdal1h/usr/lib dh_gencontrol dh_md5sums dh_builddeb -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing
[SCM] gdal branch, master, updated. upstream/1.10.0-137-gb3d529a
The following commit has been merged in the master branch: commit 351cea5ce472ff4dd204bf251f8987b3aa2c3da6 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Jun 21 14:47:30 2013 +0200 Fixed for libgdal1h use. 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/libgdal1.symbols.amd64 b/debian/libgdal1h.symbols.amd64 similarity index 100% rename from debian/libgdal1.symbols.amd64 rename to debian/libgdal1h.symbols.amd64 diff --git a/debian/libgdal1.symbols.armel b/debian/libgdal1h.symbols.armel similarity index 100% rename from debian/libgdal1.symbols.armel rename to debian/libgdal1h.symbols.armel diff --git a/debian/libgdal1.symbols.armhf b/debian/libgdal1h.symbols.armhf similarity index 100% rename from debian/libgdal1.symbols.armhf rename to debian/libgdal1h.symbols.armhf diff --git a/debian/libgdal1.symbols.common b/debian/libgdal1h.symbols.common similarity index 100% rename from debian/libgdal1.symbols.common rename to debian/libgdal1h.symbols.common diff --git a/debian/libgdal1.symbols.i386 b/debian/libgdal1h.symbols.i386 similarity index 100% rename from debian/libgdal1.symbols.i386 rename to debian/libgdal1h.symbols.i386 diff --git a/debian/libgdal1.symbols.ia64 b/debian/libgdal1h.symbols.ia64 similarity index 100% rename from debian/libgdal1.symbols.ia64 rename to debian/libgdal1h.symbols.ia64 diff --git a/debian/libgdal1.symbols.mips b/debian/libgdal1h.symbols.mips similarity index 100% rename from debian/libgdal1.symbols.mips rename to debian/libgdal1h.symbols.mips diff --git a/debian/libgdal1.symbols.mipsel b/debian/libgdal1h.symbols.mipsel similarity index 100% rename from debian/libgdal1.symbols.mipsel rename to debian/libgdal1h.symbols.mipsel diff --git a/debian/libgdal1.symbols.powerpc b/debian/libgdal1h.symbols.powerpc similarity index 100% rename from debian/libgdal1.symbols.powerpc rename to debian/libgdal1h.symbols.powerpc diff --git a/debian/libgdal1.symbols.s390 b/debian/libgdal1h.symbols.s390 similarity index 100% rename from debian/libgdal1.symbols.s390 rename to debian/libgdal1h.symbols.s390 diff --git a/debian/libgdal1.symbols.s390x b/debian/libgdal1h.symbols.s390x similarity index 100% rename from debian/libgdal1.symbols.s390x rename to debian/libgdal1h.symbols.s390x diff --git a/debian/libgdal1.symbols.sparc b/debian/libgdal1h.symbols.sparc similarity index 100% rename from debian/libgdal1.symbols.sparc rename to debian/libgdal1h.symbols.sparc diff --git a/debian/rules b/debian/rules index 88cd3d4..769188b 100755 --- a/debian/rules +++ b/debian/rules @@ -216,7 +216,7 @@ binary-common: # Forces failure when symbols change #dh_makeshlibs dh_installdeb - dh_shlibdeps -L libgdal1 -l debian/libgdal1h/usr/lib + dh_shlibdeps -L libgdal1h -l debian/libgdal1h/usr/lib dh_gencontrol dh_md5sums dh_builddeb -- 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
[SCM] gdal tag, debian/1.10.0-1%7Eexp1, created. upstream/1.10.0-139-gcc5c9a0
The tag, debian/1.10.0-1%7Eexp1 has been created at cc5c9a0410a912a3a30144b7d84a5384c9a099d6 (commit) - Shortlog commit cc5c9a0410a912a3a30144b7d84a5384c9a099d6 Merge: 24c491f b3d529a Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Jun 21 22:39:46 2013 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal Conflicts: debian/changelog --- -- 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
[SCM] gdal branch, master, updated. upstream/1.9.2-130-g0fb346c
The following commit has been merged in the master branch:
commit 2f527b08c7de4af9369a0da6d7311180181840a1
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Apr 8 11:20:34 2013 +0200
Reintroduced hidden symbols.
diff --git a/debian/changelog b/debian/changelog
index 524db0a..3812596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdal (1.9.2-1~exp2) experimental; urgency=low
+
+ * Reintroduced internal symbols hiding for better compatibility
+against mixing external geotiff and gdal. See Orfeotoolbox case:
+See #558733 again.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Fri, 29 Mar 2013 14:07:43
+0100
+
gdal (1.9.2-1~exp1) experimental; urgency=low
[ Jerome Villeneuve Larouche ]
diff --git a/debian/rules b/debian/rules
index 704801f..c7c798f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ configure-stamp:
--includedir=\$$\{prefix\}/include/gdal \
--with-threads \
--with-grass=no \
+ --with-hide-internal-symbols=yes \
--with-libtiff=internal \
--with-geotiff=internal \
--with-jasper \
--
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
[SCM] gdal branch, master, updated. upstream/1.9.2-130-g0fb346c
The following commit has been merged in the master branch: commit 82da083c47bca4911a1a10bb4d5ed77e37fe8f25 Merge: 2f527b08c7de4af9369a0da6d7311180181840a1 e7ab310c425bcb5fe5e009eb5eb2afcd31e8a4db Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Apr 8 12:27:06 2013 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal Conflicts: debian/changelog diff --combined debian/changelog index 3812596,8440f84..112e0c0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,17 +1,23 @@@ -gdal (1.9.2-1~exp2) UNRELEASED; urgency=low ++gdal (1.9.2-1~exp3) experimental; urgency=low + + * 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: + Fix FTBFS when ruby1.9.1 installed: force building with ruby1.8: + set variables in debian/rules and new patch force-ruby1.8 to ruby1.8. + Thanks to Cédric Boutillier for reviewing and testing this patch. + (Closes: #684433) + * Added libarmadillo support. - * Restored hidden symbols to better manage conflicts in linking both -libgeotiff and gdal. Fix working for Orfeotoolbox. + - -- Francesco Paolo Lovergine fran...@debian.org Sun, 04 Mar 2012 11:39:57 +0100 ++ -- Francesco Paolo Lovergine fran...@debian.org Sun, 04 Apr 2013 11:39:57 +0100 ++ +gdal (1.9.2-1~exp2) experimental; urgency=low + + * Reintroduced internal symbols hiding for better compatibility +against mixing external geotiff and gdal. See Orfeotoolbox case: +See #558733 again. + + -- Francesco Paolo Lovergine fran...@debian.org Fri, 29 Mar 2013 14:07:43 +0100 gdal (1.9.2-1~exp1) experimental; urgency=low -- 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
[SCM] gdal branch, master, updated. upstream/1.9.2-130-g0fb346c
The following commit has been merged in the master branch:
commit 0fb346cb19b1a729e5cb1d27683ed195b0e9111f
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu Jun 20 09:50:20 2013 +0200
Introduced libgdal1h for transitioning.
The transitioning package is introduced to migrate rdepends to
a new version that hides all tiff/geotiff symbols in the gdal
library.
diff --git a/debian/changelog b/debian/changelog
index 112e0c0..82fea4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ gdal (1.9.2-1~exp3) experimental; urgency=low
Thanks to Cédric Boutillier for reviewing and testing this patch.
(Closes: #684433)
* Added libarmadillo support.
+ * Added TIFF/GEOTIFF symbols rename to definitively solve problem of
+symbol collisions for programs that both links geotiff/tiff libraries.
+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.
-- Francesco Paolo Lovergine fran...@debian.org Sun, 04 Apr 2013 11:39:57
+0100
diff --git a/debian/control b/debian/control
index 8975b90..5bc0c5a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,18 +13,20 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev
(= 1:4.0.0),
libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (= 1.0.0),
libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy
Build-Conflicts: python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
XS-Python-Version: all
X-Python3-Version: = 3.2
Homepage: http://www.gdal.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
-Package: libgdal1
+Package: libgdal1h
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: proj-bin
+Provides: libgdal1
+Conflicts: libgdal1 (= 1.10.0-0~)
Description: Geospatial Data Abstraction Library
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
@@ -72,7 +74,7 @@ Description: Geospatial Data Abstraction Library -
Development files
Package: libgdal-dev
Section: libdevel
Architecture: any
-Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
+Depends: libgdal1h (=${binary:Version}), libc6-dev, libnetcdf-dev,
libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev,
libpq-dev, libxerces-c-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev,
libcurl4-gnutls-dev|libcurl4-dev,
@@ -103,7 +105,7 @@ Description: Geospatial Data Abstraction Library -
Development files
Package: libgdal-doc
Section: doc
Architecture: all
-Suggests: libgdal1
+Suggests: libgdal1h
Depends: ${misc:Depends}
Homepage: http://www.gdal.org/#index_userdocs
Description: Documentation for the Geospatial Data Abstraction Library
diff --git a/debian/rules b/debian/rules
index c7c798f..bbdb273 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,8 @@ configure-stamp:
--with-threads \
--with-grass=no \
--with-hide-internal-symbols=yes \
+ --with-rename-internal-libtiff-symbols=yes \
+ --with-rename-internal-libgeotiff-symbols=yes \
--with-libtiff=internal \
--with-geotiff=internal \
--with-jasper \
--
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
[SCM] gdal branch, master, updated. upstream/1.9.2-133-g807553f
The following commit has been merged in the master branch: commit 807553f991aad1b829f57e5b6e0fc1abb7a70272 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jun 20 09:56:22 2013 +0200 Annotated changelog diff --git a/debian/changelog b/debian/changelog index 82fea4d..b8dc4e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gdal (1.9.2-1~exp3) experimental; urgency=low +gdal (1.10.0-0~exp1) experimental; urgency=low * Moved to new LIBKML driver instead of the old KML one. It has a much better support for complex KML files. @@ -13,6 +13,7 @@ gdal (1.9.2-1~exp3) 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. -- Francesco Paolo Lovergine fran...@debian.org Sun, 04 Apr 2013 11:39:57 +0100 -- 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
[SCM] gdal branch, master, updated. upstream/1.9.2-133-g807553f
The following commit has been merged in the master branch: commit 975985655923a9d199d5d18eddf9ee3ccb6111f2 Merge: 0fb346cb19b1a729e5cb1d27683ed195b0e9111f 204af8237147ae44c6b9da54fbcbadacabb62fcb Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jun 20 09:53:17 2013 +0200 Merge tag 'upstream/1.10.0' Upstream version 1.10.0 -- 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
[SCM] gdal tag, debian/1.9.2-1%7Eexp2, created. upstream/1.9.2-121-g2f527b0
The tag, debian/1.9.2-1%7Eexp2 has been created at 2f527b08c7de4af9369a0da6d7311180181840a1 (commit) - Shortlog commit 2f527b08c7de4af9369a0da6d7311180181840a1 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Apr 8 11:20:34 2013 +0200 Reintroduced hidden symbols. --- -- 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
[SCM] gdal annotated tag, upstream/1.10.0, created. upstream/1.10.0
The annotated tag, upstream/1.10.0 has been created at fb2e14d454a04534cd5a92052ac433780548252f (tag) tagging 204af8237147ae44c6b9da54fbcbadacabb62fcb (commit) replaces upstream/1.9.2 tagged by Francesco Paolo Lovergine on Thu Jun 20 09:53:14 2013 +0200 - Shortlog Upstream version 1.10.0 Francesco Paolo Lovergine (1): Imported Upstream version 1.10.0 --- -- 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
[SCM] gdal branch, upstream, updated. upstream/1.10.0-128-g6bebea5
The following commit has been merged in the upstream branch: commit 6bebea5ae965a0dbea96e25dee0ffcda26632877 Merge: 204af8237147ae44c6b9da54fbcbadacabb62fcb e7ab310c425bcb5fe5e009eb5eb2afcd31e8a4db Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Jun 20 09:57:40 2013 +0200 Merge branches 'master', 'master' and 'upstream' of ssh://git.debian.org/git/pkg-grass/gdal into upstream -- 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
[SCM] gdal branch, master, updated. upstream/1.9.2-120-g67463fe
The following commit has been merged in the master branch: commit 67463fe45c7636386fa8a217701ae8b0c0dd506d Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Mar 29 13:10:01 2013 +0100 Fixed version. diff --git a/debian/changelog b/debian/changelog index 25f5a43..524db0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gdal (1.9.2-1exp1) experimental; urgency=low +gdal (1.9.2-1~exp1) experimental; urgency=low [ Jerome Villeneuve Larouche ] * New upstream release -- 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
[SCM] gdal branch, wheezy, updated. upstream/1.8.1-111-g5190445
The following commit has been merged in the wheezy branch:
commit 5190445757d220690126b01b2d955588c5f3b8d1
Merge: c09e170ea975d6787e5ecb438134034833160675
d1ddee88eeedac0f87e3fc4ea117a138fbb43af6
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Tue Jun 19 17:45:32 2012 +0200
Merge branch 'wheezy' of ssh://git.debian.org/git/pkg-grass/gdal into wheezy
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 28a3b2f,e2603ab..dbb0513
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,12 @@@
-gdal (1.9.0-3) UNRELEASED; urgency=low
+gdal (1.9.0-3) unstable; urgency=low
+ * Now b-depending on Ruby 1.8 explicitly.
+(closes: #675972)
+ * Now b-depending on poppler-private package.
+(closes: #672405)
+ * New package for Python 3 bindings
- -- Antonio Valentino antonio.valent...@tiscali.it Wed, 30 May 2012
19:15:21 +0200
+ -- Francesco Paolo Lovergine fran...@debian.org Tue, 05 Jun 2012 14:27:39
+0200
gdal (1.9.0-2) unstable; urgency=low
diff --combined debian/control
index 57c2165,22b2a33..9cb878e
--- a/debian/control
+++ b/debian/control
@@@ -6,15 -6,17 +6,17 @@@ Uploaders: Francesco Paolo Lovergine f
Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c2-dev,
unixodbc-dev (= 2.2.11),
- python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (= 2.6.6-3~),
+ python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (= 2.6.6-3~),
libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
- ruby, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
+ ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev
(= 0.9.1),
- libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (= 1.0.0),
- libkml-dev, liburiparser-dev
+ libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (= 1.0.0),
+ libkml-dev, liburiparser-dev,
+ python3-all-dev, python3-numpy
Build-Conflicts: python-setuptools
Standards-Version: 3.9.3
XS-Python-Version: all
+ X-Python3-Version: = 3.2
Homepage: http://www.gdal.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
@@@ -103,7 -105,7 +105,7 @@@ Package: libgdal-do
Section: doc
Architecture: all
Suggests: libgdal1
- Depends: ${misc:Depends}
+ Depends: ${misc:Depends}
Homepage: http://www.gdal.org/#index_userdocs
Description: Documentation for the Geospatial Data Abstraction Library
GDAL is a translator library for raster geospatial data formats.
@@@ -178,6 -180,33 +180,33 @@@ Description: Python bindings to the Geo
This package contains Python bindings for GDAL/OGR library and
a set of additional command line tools.
+ Package: python3-gdal
+ Section: python
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${python3:Depends}, python3-numpy, ${misc:Depends}
+ Provides: ${python3:Provides}
+ Homepage: http://trac.osgeo.org/gdal/wiki/GdalOgrInPython
+ XB-Python-Version: ${python3:Versions}
+ Description: Python 3 bindings to the Geospatial Data Abstraction Library
+ GDAL is a translator library for raster geospatial data formats.
+ As a library, it presents a single abstract data model to the
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports 40+ popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more.
+ .
+ This package contains Python 3 bindings for GDAL/OGR library and
+ a set of additional command line tools.
+
Package: libgdal-perl
Section: perl
Architecture: any
--
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
[SCM] gdal branch, master, updated. upstream/1.9.2-120-g67463fe
The following commit has been merged in the master branch:
commit b7f080b0fa514cbc783311b491cc00451d9a54db
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Fri Mar 29 10:41:20 2013 +0100
Minor changes for releasing in experimental
diff --git a/debian/changelog b/debian/changelog
index 25ca943..25f5a43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,19 @@
-gdal (1.9.2-1) UNRELEASED; urgency=low
-
- * New Upstream release
- * Removed OGDI
-
- -- Jerome Villeneuve Larouche jlarou...@mapgears.com Thu, 01 Nov 2012
18:52:53 +
-
-gdal (1.9.1-2) unstable; urgency=low
+gdal (1.9.2-1exp1) experimental; urgency=low
[ Jerome Villeneuve Larouche ]
- * New upstream release.
+ * New upstream release
[ Francesco Paolo Lovergine ]
* Reintroducing libgdal1-dev as a transitional package to allow r-deps
to build in any environment.
- * Removed old depndency on libcurl3-dev for libgdal-dev and added a
+ * Removed old dependency on libcurl3-dev for libgdal-dev and added a
preferred dep on libcurl4-gnutls-dev to make lintian happy.
* Added build-{arch|indep} targets in debian/rules.
+ * Fixed a bit debian/changelog for latest changes.
+ * Now using libxerces-c-dev as dependency for current library version.
+ * Policy bumped to 3.9.4. No special changes required.
- -- Jerome Villeneuve Larouche jlarou...@mapgears.com Fri, 25 May 2012
13:04:34 +
+ -- Francesco Paolo Lovergine fran...@debian.org Fri, 29 Mar 2013 10:38:40
+0100
gdal (1.9.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2a96323..2b6815a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
- libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c2-dev,
unixodbc-dev (= 2.2.11),
+ libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c-dev,
unixodbc-dev (= 2.2.11),
python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (= 2.6.6-3~),
libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
@@ -75,7 +75,7 @@ Section: libdevel
Architecture: any
Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev,
- libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
+ libpq-dev, libxerces-c-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev,
libcurl4-gnutls-dev|libcurl4-dev,
libspatialite-dev, libdap-dev, ${misc:Depends}
Suggests: libgdal-doc
--
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
[SCM] gdal tag, debian/1.9.2-1%7Eexp1, created. upstream/1.9.2-120-g67463fe
The tag, debian/1.9.2-1%7Eexp1 has been created at 67463fe45c7636386fa8a217701ae8b0c0dd506d (commit) - Shortlog commit 67463fe45c7636386fa8a217701ae8b0c0dd506d Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Mar 29 13:10:01 2013 +0100 Fixed version. --- -- 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
[SCM] gdal branch, master, updated. upstream/1.9.0-115-g8c436af
The following commit has been merged in the master branch:
commit 8c436afd940b390494ac3b3bf923dd1b739f9976
Merge: 150d9b02cc521fc5844495880f61fde0ea6d57af
d1ddee88eeedac0f87e3fc4ea117a138fbb43af6
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Tue Jun 5 16:13:23 2012 +0200
Merging a.valentino changes for python3
Merge commit 'd1ddee88eeedac0f87e3fc4ea117a138fbb43af6'
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 518e1cb,e2603ab..da69ca4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,18 +1,35 @@@
++ HEAD
+gdal (1.9.1-2) unstable; urgency=low
++===
+ gdal (1.9.0-3) UNRELEASED; urgency=low
+
+ * New package for Python 3 bindings
+
+ -- Antonio Valentino antonio.valent...@tiscali.it Wed, 30 May 2012
19:15:21 +0200
+
+ gdal (1.9.0-2) unstable; urgency=low
++ d1ddee88eeedac0f87e3fc4ea117a138fbb43af6
+ * Fixed debian/control to b-depend on ruby 1.8.
+(closes: #675972)
+ * Now depending on poppler-private dev package.
+(closes: #672405)
+
+ -- Francesco Paolo Lovergine fran...@debian.org Tue, 05 Jun 2012 14:08:23
+0200
+
+gdal (1.9.1-1) unstable; urgency=low
+
+ [ Jerome Villeneuve Larouche ]
+ * New upstream release.
+
+ [ Francesco Paolo Lovergine ]
* Reintroducing libgdal1-dev as a transitional package to allow r-deps
to build in any environment.
* Removed old depndency on libcurl3-dev for libgdal-dev and added a
preferred dep on libcurl4-gnutls-dev to make lintian happy.
* Added build-{arch|indep} targets in debian/rules.
- -- Francesco Paolo Lovergine fran...@debian.org Wed, 09 May 2012 13:00:22
+0200
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com Fri, 25 May 2012
13:04:34 +
gdal (1.9.0-1) unstable; urgency=low
diff --combined debian/control
index 57c2165,22b2a33..2a96323
--- a/debian/control
+++ b/debian/control
@@@ -6,15 -6,17 +6,17 @@@ Uploaders: Francesco Paolo Lovergine f
Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c2-dev,
unixodbc-dev (= 2.2.11),
- python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (= 2.6.6-3~),
+ python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev,
python-all-dev (= 2.6.6-3~),
libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
- ruby, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
+ ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev
(= 0.9.1),
- libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (= 1.0.0),
+ libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev,
libfreexl-dev (= 1.0.0),
- libkml-dev, liburiparser-dev
+ libkml-dev, liburiparser-dev,
+ python3-all-dev, python3-numpy
Build-Conflicts: python-setuptools
Standards-Version: 3.9.3
XS-Python-Version: all
+ X-Python3-Version: = 3.2
Homepage: http://www.gdal.org/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
@@@ -103,7 -105,7 +105,7 @@@ Package: libgdal-do
Section: doc
Architecture: all
Suggests: libgdal1
- Depends: ${misc:Depends}
+ Depends: ${misc:Depends}
Homepage: http://www.gdal.org/#index_userdocs
Description: Documentation for the Geospatial Data Abstraction Library
GDAL is a translator library for raster geospatial data formats.
@@@ -178,6 -180,33 +180,33 @@@ Description: Python bindings to the Geo
This package contains Python bindings for GDAL/OGR library and
a set of additional command line tools.
+ Package: python3-gdal
+ Section: python
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${python3:Depends}, python3-numpy, ${misc:Depends}
+ Provides: ${python3:Provides}
+ Homepage: http://trac.osgeo.org/gdal/wiki/GdalOgrInPython
+ XB-Python-Version: ${python3:Versions}
+ Description: Python 3 bindings to the Geospatial Data Abstraction Library
+ GDAL is a translator library for raster geospatial data formats.
+ As a library, it presents a single abstract data model to the
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports 40+ popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more
[SCM] saga branch, master, updated. 864c173c2549f6935fbf86cfffee7279856671aa
The following commit has been merged in the master branch: commit 864c173c2549f6935fbf86cfffee7279856671aa Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jun 18 14:30:50 2012 +0200 Fixed #669468 diff --git a/debian/changelog b/debian/changelog index 14e340e..f9794fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +saga (2.0.8+dfsg-3) unstable; urgency=low + + * Removed libvigraimpex-dev b-d. +(closes: #669468) + + -- Francesco Paolo Lovergine fran...@debian.org Mon, 18 Jun 2012 14:28:12 +0200 + saga (2.0.8+dfsg-2) unstable; urgency=low [ Johan Van de Wauw ] diff --git a/debian/control b/debian/control index fd0ca51..5d4dd9e 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, Francesco Paolo Lovergine fran...@debian.org Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev, libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), swig, - libqhull-dev, libhpdf-dev, libvigraimpex-dev, python-dev, liblas-dev + libqhull-dev, libhpdf-dev, python-dev, liblas-dev Standards-Version: 3.9.3 Homepage: http://www.saga-gis.org/ Vcs-Git: git://git.debian.org/pkg-grass/saga.git diff --git a/debian/control.in b/debian/control.in index 775027c..f14e600 100644 --- a/debian/control.in +++ b/debian/control.in @@ -5,7 +5,7 @@ Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, Francesco Paolo Lovergine fran...@debian.org Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev, libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), swig, - libqhull-dev, libhpdf-dev, libvigraimpex-dev, python-dev, liblas-dev + libqhull-dev, libhpdf-dev, python-dev, liblas-dev Standards-Version: 3.9.3 Homepage: http://www.saga-gis.org/ Vcs-Git: git://git.debian.org/pkg-grass/saga.git -- Saga GIS ___ 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] gdal branch, master, updated. upstream/1.9.0-113-g150d9b0
The following commit has been merged in the master branch: commit 150d9b02cc521fc5844495880f61fde0ea6d57af Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jun 5 14:25:57 2012 +0200 Fixing ruby problem. diff --git a/debian/changelog b/debian/changelog index 2edcb60..518e1cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gdal (1.9.1-2) unstable; urgency=low + + * Fixed debian/control to b-depend on ruby 1.8. +(closes: #675972) + * Now depending on poppler-private dev package. +(closes: #672405) + + -- Francesco Paolo Lovergine fran...@debian.org Tue, 05 Jun 2012 14:08:23 +0200 + gdal (1.9.1-1) unstable; urgency=low [ Jerome Villeneuve Larouche ] diff --git a/debian/control b/debian/control index b813d7b..57c2165 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0), libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c2-dev, unixodbc-dev (= 2.2.11), python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, python-all-dev (= 2.6.6-3~), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev, - ruby, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev, + ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev, libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev (= 0.9.1), - libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (= 1.0.0), + libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (= 1.0.0), libkml-dev, liburiparser-dev Build-Conflicts: python-setuptools Standards-Version: 3.9.3 -- 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
[SCM] gdal branch, wheezy-true, created. upstream/1.8.1-109-gc09e170
The branch, wheezy-true has been created at c09e170ea975d6787e5ecb438134034833160675 (commit) - Shortlog commit c09e170ea975d6787e5ecb438134034833160675 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jun 5 14:29:19 2012 +0200 Backporting fix for #672405 --- -- 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
[SCM] gdal tag, debian/1.9.0-3, created. upstream/1.8.1-109-gc09e170
The tag, debian/1.9.0-3 has been created at c09e170ea975d6787e5ecb438134034833160675 (commit) - Shortlog commit c09e170ea975d6787e5ecb438134034833160675 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Jun 5 14:29:19 2012 +0200 Backporting fix for #672405 --- -- 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
[SCM] grass branch, master, updated. upstream/6.4.1-109-gc354d51
The following commit has been merged in the master branch: commit ac4148dc67be65fc73c651cbc6b5d9d39dcc6cea Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 30 12:09:02 2012 +0200 Removing redundant license files. diff --git a/debian/changelog b/debian/changelog index c5b1d64..7fa998e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ grass (6.4.2-1) unstable; urgency=low * Moved to use TIFF 4.0.1 instead of the legacy flavor. * Moved to use libgdal-dev (introduced in 1.9+) b-d. - -- M. Hamish Bowman hamis...@yahoo.com Mon, 28 May 2012 21:47:12 +1200 + -- Francesco Paolo Lovergine fran...@debian.org Tue, 29 May 2012 17:23:07 +0200 grass (6.4.1-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index c717d65..1634bd3 100755 --- a/debian/rules +++ b/debian/rules @@ -166,6 +166,7 @@ install: build # delete extra license files rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt + find debian/tmp/usr/lib -name COPYING -delete # delete python compiled bytecode files (maybe dh_python2 takes care of this for us?) for DIR in python/grass \ -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-109-gc354d51
The following commit has been merged in the master branch: commit 0ed4333a4d6c020a5823dc698fad9155cdb5e785 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 30 13:37:22 2012 +0200 Undoing change about license removing. diff --git a/debian/rules b/debian/rules index 1634bd3..c717d65 100755 --- a/debian/rules +++ b/debian/rules @@ -166,7 +166,6 @@ install: build # delete extra license files rm -f debian/tmp/usr/lib/$(BASE_NAME)/bwidget/LICENSE.txt - find debian/tmp/usr/lib -name COPYING -delete # delete python compiled bytecode files (maybe dh_python2 takes care of this for us?) for DIR in python/grass \ -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-109-gc354d51
The following commit has been merged in the master branch:
commit c354d51b954fde9ced0537d797e3a7b765827711
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Jun 4 18:16:25 2012 +0200
Fixating #675514
diff --git a/debian/changelog b/debian/changelog
index 7fa998e..786da04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grass (6.4.2-2) unstable; urgency=low
+
+ * Now grass-gui replacing/breaking old grass.
+(closes: #675514)
+
+ -- Francesco Paolo Lovergine fran...@debian.org Mon, 04 Jun 2012 18:14:50
+0200
+
grass (6.4.2-1) unstable; urgency=low
[ Hamish Bowman ]
diff --git a/debian/control b/debian/control
index 31e7cab..4eb 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,8 @@ Description: Geographic Resources Analysis Support System
(GRASS GIS)
Package: grass-core
Section: science
Architecture: any
+Replaces: grass ( 6.4.2-1~)
+Breaks: grass ( 6.4.2-1~)
Depends:
${shlibs:Depends},
${python:Depends},
@@ -98,6 +100,8 @@ Description: GRASS GIS core components
Package: grass-gui
Section: science
Architecture: any
+Replaces: grass ( 6.4.2-1~)
+Breaks: grass ( 6.4.2-1~)
Depends: ${shlibs:Depends},
grass-core,
${python:Depends},
@@ -158,7 +162,7 @@ Depends:
grass-core (= ${binary:Version}),
# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for
5.7.0+6.0.0beta2-2
fakeroot,
- libproj-dev, libgdal1-dev,
+ libproj-dev, libgdal-dev | libgdal1-dev (= 1.5.0),
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
diff --git a/debian/control.in b/debian/control.in
index c6a6e48..11c4b56 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -57,6 +57,8 @@ Description: Geographic Resources Analysis Support System
(GRASS GIS)
Package: grass-core
Section: science
Architecture: any
+Replaces: grass ( 6.4.2-1~)
+Breaks: grass ( 6.4.2-1~)
Depends:
${shlibs:Depends},
${python:Depends},
@@ -98,6 +100,8 @@ Description: GRASS GIS core components
Package: grass-gui
Section: science
Architecture: any
+Replaces: grass ( 6.4.2-1~)
+Breaks: grass ( 6.4.2-1~)
Depends: ${shlibs:Depends},
grass-core,
${python:Depends},
@@ -158,7 +162,7 @@ Depends:
grass-core (= ${binary:Version}),
# fakeroot used by patches/htmlgen-fakeroot; see changelog entry for
5.7.0+6.0.0beta2-2
fakeroot,
- libproj-dev, libgdal1-dev,
+ libproj-dev, libgdal-dev | libgdal1-dev (= 1.5.0),
${misc:Depends}
# Subversion is needed by g.extension, a primary motivator for installing the
grass-dev pkg
Recommends: subversion
--
Geographic Resources Analysis Support System
___
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] grass tag, debian/6.4.2-2, created. upstream/6.4.1-109-gc354d51
The tag, debian/6.4.2-2 has been created at c354d51b954fde9ced0537d797e3a7b765827711 (commit) - Shortlog commit c354d51b954fde9ced0537d797e3a7b765827711 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Jun 4 18:16:25 2012 +0200 Fixating #675514 --- -- Geographic Resources Analysis Support System ___ 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] gdal branch, master, updated. upstream/1.9.0-112-g67570ba
The following commit has been merged in the master branch:
commit cdd801602289846f8e493c203c7915adac8adf66
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu May 10 15:49:48 2012 +0200
Some fixes to make lintian happy
diff --git a/debian/changelog b/debian/changelog
index 0142460..6fec702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ gdal (1.9.0-2) unstable; urgency=low
* Reintroducing libgdal1-dev as a transitional package to allow r-deps
to build in any environment.
+ * Removed old depndency on libcurl3-dev for libgdal-dev and added a
+preferred dep on libcurl4-gnutls-dev to make lintian happy.
+ * Added build-{arch|indep} targets in debian/rules.
-- Francesco Paolo Lovergine fran...@debian.org Wed, 09 May 2012 13:00:22
+0200
diff --git a/debian/control b/debian/control
index 9b94bfd..e0eb631 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Architecture: any
Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev,
libhdf4-alt-dev,
libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
- libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev,
libcurl4-dev|libcurl3-dev,
+ libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev,
libcurl4-gnutls-dev|libcurl4-dev,
libspatialite-dev, libdap-dev, ${misc:Depends}
Suggests: libgdal-doc
Description: Geospatial Data Abstraction Library - Development files
diff --git a/debian/rules b/debian/rules
index 1e416cd..65dec3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,6 +99,9 @@ configure-stamp:
touch $@
+build-arch: build
+build-indep: build
+
build: configure-stamp build-stamp
build-stamp:
dh_testdir
--
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
[SCM] gdal branch, master, updated. upstream/1.9.0-112-g67570ba
The following commit has been merged in the master branch: commit 45d641cf74116a11d96c26b743acaa0299124889 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu May 10 15:50:27 2012 +0200 Added .PHONY targets in debian/rules diff --git a/debian/rules b/debian/rules index 65dec3e..295a4fa 100755 --- a/debian/rules +++ b/debian/rules @@ -225,4 +225,4 @@ binary-indep: build install binary: binary-arch binary-indep -.PHONY: build clean binary-arch binary-indep binary-common binary install gdal-grass-dist versions +.PHONY: build clean binary-arch binary-indep binary-common binary install gdal-grass-dist versions build-arch build-indep -- 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
[SCM] gdal branch, master, updated. upstream/1.9.0-112-g67570ba
The following commit has been merged in the master branch:
commit 91a964b82134eb68c208e082746abd61b80a1254
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Wed May 9 13:05:10 2012 +0200
Reintroducing a proper transitional pkg libgdal1-dev to satisfy
versioned dependencies.
diff --git a/debian/changelog b/debian/changelog
index 09125e8..0142460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (1.9.0-2) unstable; urgency=low
+
+ * Reintroducing libgdal1-dev as a transitional package to allow r-deps
+to build in any environment.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Wed, 09 May 2012 13:00:22
+0200
+
gdal (1.9.0-1) unstable; urgency=low
* Ready for sid, starting transition.
diff --git a/debian/control b/debian/control
index 94e861a..9b94bfd 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,31 @@ Description: Geospatial Data Abstraction Library
.
This package contains the shared library.
+Package: libgdal1-dev
+Section: libdevel
+Architecture: all
+Depends: libgdal-dev
+Description: Geospatial Data Abstraction Library - Development files
+ GDAL is a translator library for raster geospatial data formats.
+ As a library, it presents a single abstract data model to the
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports many popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more.
+ .
+ This is a transitional dummy package that depends on libgdal-dev
+ and is used to allow versioned build dependencies to work in
+ any build environment.
+
Package: libgdal-dev
Section: libdevel
Architecture: any
@@ -52,9 +77,6 @@ Depends: libgdal1 (=${binary:Version}), libc6-dev,
libnetcdf-dev,
libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev,
libcurl4-dev|libcurl3-dev,
libspatialite-dev, libdap-dev, ${misc:Depends}
Suggests: libgdal-doc
-Provides: libgdal1-dev
-Replaces: libgdal1-dev
-Conflicts: libgdal1-dev
Description: Geospatial Data Abstraction Library - Development files
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
--
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
[SCM] gdal branch, master, updated. upstream/1.9.0-112-g67570ba
The following commit has been merged in the master branch:
commit 67570ba82ea6c1bd3d9fb0aad82ca1789c2652db
Merge: c9aa7a8d708c145b858f4468f4e0de04abdb4d7b
e9024d92cae85a4630ff42ca0c873e3ecdfb57c3
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Wed May 30 11:07:59 2012 +0200
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal
Conflicts:
debian/changelog
diff --combined debian/changelog
index 6fec702,400256c..2edcb60
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,8 +1,16 @@@
- gdal (1.9.0-2) unstable; urgency=low
+ gdal (1.9.1-1) unstable; urgency=low
- * New upstream release
++ [ Jerome Villeneuve Larouche ]
++ * New upstream release.
++
++ [ Francesco Paolo Lovergine ]
+ * Reintroducing libgdal1-dev as a transitional package to allow r-deps
+to build in any environment.
+ * Removed old depndency on libcurl3-dev for libgdal-dev and added a
+preferred dep on libcurl4-gnutls-dev to make lintian happy.
+ * Added build-{arch|indep} targets in debian/rules.
- -- Francesco Paolo Lovergine fran...@debian.org Wed, 09 May 2012 13:00:22
+0200
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com Fri, 25 May 2012
13:04:34 +
gdal (1.9.0-1) unstable; urgency=low
--
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
[SCM] gdal branch, master, updated. upstream/1.9.0-112-g67570ba
The following commit has been merged in the master branch:
commit c9aa7a8d708c145b858f4468f4e0de04abdb4d7b
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu May 10 15:53:11 2012 +0200
Added conflicting against old libgdal1-dev for libgdal-dev
diff --git a/debian/control b/debian/control
index e0eb631..b813d7b 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Depends: libgdal1 (=${binary:Version}), libc6-dev,
libnetcdf-dev,
libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev,
libcurl4-gnutls-dev|libcurl4-dev,
libspatialite-dev, libdap-dev, ${misc:Depends}
Suggests: libgdal-doc
+Conflicts: libgdal1-dev ( 1.9.0-1~)
+Replaces: libgdal1-dev ( 1.9.0-1~)
Description: Geospatial Data Abstraction Library - Development files
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
--
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
[SCM] gdal tag, debian/1.9.0-2, created. upstream/1.8.1-108-gc9aa7a8
The tag, debian/1.9.0-2 has been created at c9aa7a8d708c145b858f4468f4e0de04abdb4d7b (commit) - Shortlog commit c9aa7a8d708c145b858f4468f4e0de04abdb4d7b Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu May 10 15:53:11 2012 +0200 Added conflicting against old libgdal1-dev for libgdal-dev --- -- 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
[SCM] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d
The following commit has been merged in the master branch: commit d9fdb4de12191d3b4ac537ea8b866fdc75299b2c Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 29 15:47:48 2012 +0200 Re-applying iostream patch. diff --git a/debian/patches/series b/debian/patches/series index 50ec210..2272ff9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ pager xterm instdir check4dev -#iostream_cpp470 +iostream_cpp470 -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d
The following commit has been merged in the master branch: commit 6b2ff6e7a8b25196ba20d38cbe68880e9e6094fa Merge: d1e41c2a00a7588b10b6c6b133fe101b198cb6df 7448d4a5cb65d223d6b2e104e990a64943f71ec3 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 29 14:26:31 2012 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/grass diff --combined debian/control index 31e7cab,a4b6c74..3f1e71d --- a/debian/control +++ b/debian/control @@@ -14,7 -14,7 +14,7 @@@ Build-depends libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal1-dev (= 1.5.0), + libgdal-dev| libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev, libmysqlclient-dev | libmysqlclient15-dev, @@@ -27,9 -27,8 +27,9 @@@ libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python (= 2.6.6-3~), + python (= 2.6.6-3~), python-dev, python-wxgtk2.8, libwxgtk2.8-dev, + python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), unixodbc-dev Standards-Version: 3.9.3 diff --combined debian/control.in index c6a6e48,aec5b85..9f43996 --- a/debian/control.in +++ b/debian/control.in @@@ -14,7 -14,7 +14,7 @@@ Build-depends libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal1-dev (= 1.5.0), + libgdal-dev| libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev, libmysqlclient-dev | libmysqlclient15-dev, @@@ -27,9 -27,8 +27,9 @@@ libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python (= 2.6.6-3~), + python (= 2.6.6-3~), python-dev, python-wxgtk2.8, libwxgtk2.8-dev, + python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), unixodbc-dev Standards-Version: 3.9.3 -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d
The following commit has been merged in the master branch: commit b992f072197df5a9d13a92e427778b4afd12c4b6 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue May 29 14:27:20 2012 +0200 Removed duplicated b-d. diff --git a/debian/control b/debian/control index 3f1e71d..31e7cab 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-depends: libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python (= 2.6.6-3~), python-dev, + python (= 2.6.6-3~), python-wxgtk2.8, libwxgtk2.8-dev, python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), diff --git a/debian/control.in b/debian/control.in index 9f43996..c6a6e48 100644 --- a/debian/control.in +++ b/debian/control.in @@ -27,7 +27,7 @@ Build-depends: libxmu-dev, #install optipng if compressing the PNG images in the programmers' manual # optipng, - python (= 2.6.6-3~), python-dev, + python (= 2.6.6-3~), python-wxgtk2.8, libwxgtk2.8-dev, python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d
The following commit has been merged in the master branch: commit f7e8dd012e210bea6004f8e2c21a2ca246f3d134 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon May 28 15:57:44 2012 +0200 Unapplies last patch. diff --git a/debian/patches/series b/debian/patches/series index 2272ff9..50ec210 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ pager xterm instdir check4dev -iostream_cpp470 +#iostream_cpp470 -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d
The following commit has been merged in the master branch: commit 8f62218e4306ada734b9b33930c8368a63388362 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon May 28 15:40:34 2012 +0200 Minor change for b-d. diff --git a/debian/changelog b/debian/changelog index d078b1a..c5b1d64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ grass (6.4.2-1) unstable; urgency=low [ Francesco Paolo Lovergine ] * Moved to use TIFF 4.0.1 instead of the legacy flavor. + * Moved to use libgdal-dev (introduced in 1.9+) b-d. -- M. Hamish Bowman hamis...@yahoo.com Mon, 28 May 2012 21:47:12 +1200 diff --git a/debian/control b/debian/control index 2a00888..3335e78 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal1-dev (= 1.5.0), + libgdal-dev| libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev, libmysqlclient-dev | libmysqlclient15-dev, diff --git a/debian/control.in b/debian/control.in index 9c7d880..e5d5841 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal1-dev (= 1.5.0), + libgdal-dev| libgdal1-dev (= 1.5.0), libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev, libmysqlclient-dev | libmysqlclient15-dev, -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d
The following commit has been merged in the master branch: commit d1e41c2a00a7588b10b6c6b133fe101b198cb6df Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon May 28 16:16:53 2012 +0200 Added b-d on python-dev. diff --git a/debian/control b/debian/control index 3335e78..31e7cab 100644 --- a/debian/control +++ b/debian/control @@ -29,6 +29,7 @@ Build-depends: # optipng, python (= 2.6.6-3~), python-wxgtk2.8, libwxgtk2.8-dev, + python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), unixodbc-dev Standards-Version: 3.9.3 diff --git a/debian/control.in b/debian/control.in index e5d5841..c6a6e48 100644 --- a/debian/control.in +++ b/debian/control.in @@ -29,6 +29,7 @@ Build-depends: # optipng, python (= 2.6.6-3~), python-wxgtk2.8, libwxgtk2.8-dev, + python-dev, tcl-dev (= 8.5), tk-dev (= 8.5), unixodbc-dev Standards-Version: 3.9.3 -- Geographic Resources Analysis Support System ___ 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] proj branch, svn-import/trunk@664, created. e3339ce9dc1cc7e2935cd58596c0c011b57474d1
The branch, svn-import/trunk@664 has been created at e3339ce9dc1cc7e2935cd58596c0c011b57474d1 (commit) - Shortlog --- -- Proj.4 ___ 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] proj branch, master, created. 1bdd55773033dcaa59217afb4d79df192e541fba
The branch, master has been created at 1bdd55773033dcaa59217afb4d79df192e541fba (commit) - Shortlog commit 1bdd55773033dcaa59217afb4d79df192e541fba Merge: 8a4e833 959c70f Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 23 13:52:54 2012 +0200 Merge tag 'upstream/4.7.0' Upstream version 4.7.0 Conflicts: config.guess config.sub commit 8a4e83311186efe3f9090d06c482551b7ddfd848 Merge: 48d8d5f c5239ed Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 23 13:52:03 2012 +0200 Merge branch 'upstream' commit 48d8d5f1936878350bc5197a43988f13ef12673c Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Oct 5 21:48:54 2009 + New upstream release. commit 1c4b38d0bb32b9cfd9b410f126cbb202dc5ced32 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri May 29 11:15:41 2009 + Added NEWS commit a34a7a5ae0cece5d72ad5732318a5a47f833abe3 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri May 29 10:54:19 2009 + Fixed a bit man page. commit 9ba741705b212baacb9622e5a3b2b8d7f424ab5e Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri May 29 10:48:54 2009 + commit e1d56533d95b8e0e5672cc80f847c4585e19532c Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri May 29 10:48:11 2009 + Fixed datum shifts support. commit 6f74ef7f06601fa2702d99b1e2fef9a946035750 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu May 28 19:19:31 2009 + commit bc734eb228098d48e0b86bd46036561b759b99cb Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu May 28 19:17:47 2009 + Fixed endianess issue. commit cc52ebcaa6f93cdf30f8b66fc29d294291a3539d Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Mar 27 12:02:51 2009 + Fixing #521402 commit 506a456df8ee905f8a422f14e94c656152d6d555 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Mar 24 23:10:17 2009 + Fixes for indep packages commit 0fa96514a6b1ed8490afbdf6d9fc45418df42b05 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Mar 15 22:44:46 2009 + Splitted proj-data as asked by ftpmaster commit 782ebc6c7292c37760d4d13b315cea8cc7495729 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Mar 10 23:11:19 2009 + commit 2ccedb61d7ab01cf3cbbc813554face523cada52 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Mar 10 22:19:46 2009 + Updated conflicts and replaces commit a4d61832873170dc70acd98215287a860124eece Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Mar 10 22:02:42 2009 + Fixing man page section. commit 3793ffaa713190831ae7d09738c41234a3c704b2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Feb 18 14:19:43 2009 + Added a note about swiss datum grids. commit 9595ef5189a41bdb9bcd9d4478877a967df9d3f5 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Feb 18 14:15:59 2009 + Adding Swiss datum grids sharfile. commit 099821d4a3ec5e0ece4b41a17862d0b0a766f8b8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Feb 17 22:43:20 2009 + commit e18ee7f8f054bf243c410c7309d8ee09b4e8c3d8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Feb 17 22:42:28 2009 + commit 405e3951c526ebd3522396a0ea04fe557a12e125 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Feb 15 10:49:41 2009 + commit e993dfaa4760d3d90517c0e44c52fce3dafeb7b2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Feb 15 10:48:25 2009 + Added missing file commit 42cb16d56ea8305797ad6d55d1d5d68c4b865816 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat Feb 14 22:09:21 2009 + Minor changes. commit d237c43b67207f35bab5bd6173f4c158fd397660 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Nov 26 16:54:38 2008 + Some minor fixes commit 7d6e01151c29bec620d824d89c8f8b61e33dd422 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Nov 25 16:38:14 2008 + Added add-on datum grids. commit 9356d6c35230f2b80945d512fb38ca278122538f Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Nov 25 15:33:03 2008 + new upstream release commit a6191ab7bb20833d75b52013cb658da9b6851abf Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Aug 28 17:51:29 2008 + Tagged 4.6.0-2 commit d1b2634bf928f0c0288cdc488379854435a32cae Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Aug 28 17:32:01 2008 + Fixing documentation issues. commit a9fccc6299c1ea03522c5283e244f979c331 Author: Peter S Galbraith p...@debian.org Date: Sun Dec 30 17:09:18 2007 + 4.6.0-1 commit a880a4a86dcd760b0da1cf8210990bc64066fca1 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Apr 8 09:25
[SCM] proj branch, upstream, created. 959c70fdbcb11376bed18b840b76455c14a2f3e5
The branch, upstream has been created at 959c70fdbcb11376bed18b840b76455c14a2f3e5 (commit) - Shortlog --- -- Proj.4 ___ 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] proj annotated tag, debian/4.5.0-1, created. debian/4.5.0-1
The annotated tag, debian/4.5.0-1 has been created at 7d37b3c092a5940043216f24d8785f10732568cf (tag) tagging 9ac2bb2f36a7b9ddd23f1d9cbcd39f9ffada2db7 (commit) tagged by Francesco Paolo Lovergine on Wed Apr 4 18:24:30 2007 + - Shortlog [svn-buildpackage] Tagging proj (4.5.0-1) Francesco Paolo Lovergine (10): [svn-inject] Installing original source of proj [svn-inject] Forking proj source to Trunk [svn-inject] Applying Debian modifications to trunk Moving to team maintainership Added a watch file Starting 4.5.0 trunk First changes Added Uploaders and compat Some secondary fixes Final changes for releasing in experimental --- -- Proj.4 ___ 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] proj annotated tag, debian/4.5.0-2, created. debian/4.5.0-2
The annotated tag, debian/4.5.0-2 has been created at a09da75f3e2fa09cbd3e61d7cadc6db8b4d4d921 (tag) tagging a880a4a86dcd760b0da1cf8210990bc64066fca1 (commit) replaces debian/4.5.0-1 tagged by Francesco Paolo Lovergine on Sun Apr 8 09:27:55 2007 + - Shortlog [svn-buildpackage] Tagging proj (4.5.0-2) Francesco Paolo Lovergine (2): (null) Preparing for unstable --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.0-2, created. debian/4.6.0-2
The annotated tag, debian/4.6.0-2 has been created at ec87d389cb86f144fac17718a96ea6782b2d9379 (tag) tagging d1b2634bf928f0c0288cdc488379854435a32cae (commit) replaces debian/4.5.0-2 tagged by Francesco Paolo Lovergine on Thu Aug 28 17:51:01 2008 + - Shortlog [svn-buildpackage] Tagging proj (4.6.0-2) Francesco Paolo Lovergine (1): Fixing documentation issues. Peter S Galbraith (1): 4.6.0-1 --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-1, created. debian/4.6.1-1
The annotated tag, debian/4.6.1-1 has been created at 6f575418f5b10706688772643afd693dc47dd3f5 (tag) tagging 405e3951c526ebd3522396a0ea04fe557a12e125 (commit) replaces debian/4.6.0-2 tagged by Francesco Paolo Lovergine on Tue Feb 17 15:37:24 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-1) Francesco Paolo Lovergine (7): Tagged 4.6.0-2 new upstream release Added add-on datum grids. Some minor fixes Minor changes. Added missing file commit e993dfaa4760d3d90517c0e44c52fce3dafeb7b2 --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-2, created. debian/4.6.1-2
The annotated tag, debian/4.6.1-2 has been created at 72699ff0276fcd7791f586ab4e3a59f2bcc7fc51 (tag) tagging 855fe41f8f2f0f44537a288d65bfb5591c899557 (commit) replaces debian/4.6.1-1 tagged by Francesco Paolo Lovergine on Sun Mar 15 22:54:05 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-2) Francesco Paolo Lovergine (8): (null) commit e18ee7f8f054bf243c410c7309d8ee09b4e8c3d8 Adding Swiss datum grids sharfile. Added a note about swiss datum grids. Fixing man page section. [svn-buildpackage] Tagging proj (4.6.1-2) Updated conflicts and replaces [svn-buildpackage] Tagging proj (4.6.1-2) --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-3, created. debian/4.6.1-3
The annotated tag, debian/4.6.1-3 has been created at 7a53187521bcb2492efa44ba35148d50fd8184c2 (tag) tagging 506a456df8ee905f8a422f14e94c656152d6d555 (commit) replaces debian/4.6.1-1 tagged by Francesco Paolo Lovergine on Wed Mar 25 14:19:28 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-3) Francesco Paolo Lovergine (9): (null) commit e18ee7f8f054bf243c410c7309d8ee09b4e8c3d8 Adding Swiss datum grids sharfile. Added a note about swiss datum grids. Fixing man page section. Updated conflicts and replaces commit 2ccedb61d7ab01cf3cbbc813554face523cada52 Splitted proj-data as asked by ftpmaster Fixes for indep packages --- -- Proj.4 ___ 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] proj annotated tag, upstream/4.7.0, created. upstream/4.7.0
The annotated tag, upstream/4.7.0 has been created at 4db76f5e2a543f210c3dfc718aef3095224f8a01 (tag) tagging 959c70fdbcb11376bed18b840b76455c14a2f3e5 (commit) tagged by Francesco Paolo Lovergine on Wed May 23 13:52:13 2012 +0200 - Shortlog Upstream version 4.7.0 Francesco Paolo Lovergine (2): initial upstream branch Imported Upstream version 4.7.0 --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-4, created. debian/4.6.1-4
The annotated tag, debian/4.6.1-4 has been created at c6acd7005b8acb48f0a9df381a15213cdda4f1ff (tag) tagging cc52ebcaa6f93cdf30f8b66fc29d294291a3539d (commit) replaces debian/4.6.1-3 tagged by Francesco Paolo Lovergine on Fri Mar 27 12:35:56 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-4) Francesco Paolo Lovergine (1): Fixing #521402 --- -- Proj.4 ___ 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] geos branch, master, updated. upstream/3.3.2-61-g75719df
The following commit has been merged in the master branch: commit 32c874523cb1ab6fefae89e390952525bfeb0cc3 Merge: e6d5a322b03c82337786890c2724ad077a540693 76c80cc426a8ba9ec726941ca2b8a801526c4ab2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 23 15:30:16 2012 +0200 Merge tag 'upstream/3.3.3' Upstream version 3.3.3 -- Geometry engine for Geographic Information Systems ___ 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] geos branch, master, updated. upstream/3.3.2-61-g75719df
The following commit has been merged in the master branch:
commit 586afbdbcc43eae0b7e77b1bdfa958b7c3b0bf0c
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Wed May 23 15:34:25 2012 +0200
New upstream 3.3.3 release.
diff --git a/debian/changelog b/debian/changelog
index cb85ff8..47b9b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+geos (3.3.3-1) unstable; urgency=low
+
+ * New upstream bugfixing version. This is useful because correctly
+support new topology-enabled for Postgis 2.0.
+ * Policy bumped to 3.9.3, no changes required.
+ * Debhelper level set to 9.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Wed, 23 May 2012 15:30:33
+0200
+
geos (3.3.1-1) unstable; urgency=low
* New upstream major release.
diff --git a/debian/control b/debian/control
index fa96776..1eba67a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 8), doxygen, swig, ruby, ruby-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (= 9), doxygen, swig, ruby, ruby-dev
+Standards-Version: 3.9.3
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git
Vcs-Git: git://git.debian.org/git/pkg-grass/geos
@@ -25,7 +25,7 @@ Description: Geometry engine for GIS - Development files
Package: libgeos++-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
+Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
Suggests: libgdal-doc
Breaks: libgeos-dev ( 3.3.1-1~)
Description: Geometry engine for GIS - C++ development files
@@ -59,7 +59,7 @@ Description: Geometry engine for Geographic Information
Systems - C Library
This package contains the C library. A C++ library is provided
by the libgeos-* package.
-Package: libgeos-3.3.1
+Package: libgeos-3.3.3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -109,7 +109,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
Description: Debugging symbols for the GEOS library
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
diff --git a/debian/control.in b/debian/control.in
index e3a2c24..34daf78 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,8 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 8), doxygen, swig, ruby, ruby-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (= 9), doxygen, swig, ruby, ruby-dev
+Standards-Version: 3.9.3
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git
Vcs-Git: git://git.debian.org/git/pkg-grass/geos
--
Geometry engine for Geographic Information Systems
___
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] geos branch, master, updated. upstream/3.3.2-61-g75719df
The following commit has been merged in the master branch:
commit 70c720e18f002d5cd2cc8e8acfd2c8c813df9998
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Wed May 23 15:39:19 2012 +0200
Updated patchset
diff --git a/debian/changelog b/debian/changelog
index 47b9b64..4ac3fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ geos (3.3.3-1) unstable; urgency=low
support new topology-enabled for Postgis 2.0.
* Policy bumped to 3.9.3, no changes required.
* Debhelper level set to 9.
+ * Patch geos-config revised, partially merged upstream.
-- Francesco Paolo Lovergine fran...@debian.org Wed, 23 May 2012 15:30:33
+0200
diff --git a/debian/patches/geos-config b/debian/patches/geos-config
index ca1adee..5fb9af5 100644
--- a/debian/patches/geos-config
+++ b/debian/patches/geos-config
@@ -1,24 +1,13 @@
Index: geos/tools/geos-config.in
===
geos.orig/tools/geos-config.in 2012-02-21 23:31:52.0 +0100
-+++ geos/tools/geos-config.in 2012-02-21 23:33:29.0 +0100
-@@ -11,6 +11,7 @@
- [--prefix]
- [--version]
- [--libs]
-+ [--clibs]
- [--cflags]
- [--ldflags]
- [--includes]
-@@ -37,7 +38,10 @@
+--- geos.orig/tools/geos-config.in 2012-05-23 15:30:18.0 +0200
geos/tools/geos-config.in 2012-05-23 15:37:54.0 +0200
+@@ -38,7 +38,7 @@
echo -I${prefix}/include
;;
--libs)
- echo -L${libdir} -lgeos
+ echo -L${libdir} -lgeos-@VERSION@
-+ ;;
-+--clibs)
-+ echo -L${libdir} -lgeos_c
;;
- --ldflags)
- echo -L${libdir}
+ --clibs)
+ echo -L${libdir} -lgeos_c
--
Geometry engine for Geographic Information Systems
___
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] geos branch, master, updated. upstream/3.3.2-61-g75719df
The following commit has been merged in the master branch: commit 75719df948a066ebdebb37155fea19f645c5c177 Merge: 70c720e18f002d5cd2cc8e8acfd2c8c813df9998 722309c27556c36862610937210aeca5516de9de Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 23 17:40:27 2012 +0200 Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/geos Conflicts: debian/changelog debian/patches/geos-config diff --combined debian/changelog index 4ac3fbe,f38f0a4..ed73c87 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,16 +1,20 @@@ geos (3.3.3-1) unstable; urgency=low - * New upstream release + * New upstream bugfixing version. This is useful because correctly +support new topology-enabled for Postgis 2.0. + * Policy bumped to 3.9.3, no changes required. + * Debhelper level set to 9. + * Patch geos-config revised, partially merged upstream. - -- Jerome Villeneuve Larouche jlarou...@mapgears.com Thu, 17 May 2012 17:36:39 + + -- Francesco Paolo Lovergine fran...@debian.org Wed, 23 May 2012 15:30:33 +0200 + geos (3.3.2-1) unstable; urgency=low + + * New upstream release. + * Dropped geos-config patch, merged upstream. + + -- Francesco Paolo Lovergine fran...@debian.org Sun, 26 Feb 2012 23:29:37 +0100 + geos (3.3.1-1) unstable; urgency=low * New upstream major release. -- Geometry engine for Geographic Information Systems ___ 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] geos branch, upstream, updated. upstream/3.3.2-59-g446d4ff
The following commit has been merged in the upstream branch: commit 446d4ffb0409ca466d6de46c71b97d237fb44731 Merge: 76c80cc426a8ba9ec726941ca2b8a801526c4ab2 77023550ec26b38e27369647dd1f281e133e65f2 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed May 23 17:41:18 2012 +0200 Merge branch 'upstream' of ssh://git.debian.org/git/pkg-grass/geos into upstream -- Geometry engine for Geographic Information Systems ___ 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] geos tag, debian/3.3.1-1, created. upstream/3.3.1-49-ge6d5a32
The tag, debian/3.3.1-1 has been created at e6d5a322b03c82337786890c2724ad077a540693 (commit) - Shortlog commit e6d5a322b03c82337786890c2724ad077a540693 Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Feb 22 17:53:00 2012 +0100 Fixed version in NEWS file. --- -- Geometry engine for Geographic Information Systems ___ 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] geos annotated tag, upstream/3.3.3, created. upstream/3.3.3
The annotated tag, upstream/3.3.3 has been created at e1a3b6b277391fe9dd328514bbf49efada01d2b1 (tag) tagging 76c80cc426a8ba9ec726941ca2b8a801526c4ab2 (commit) replaces upstream/3.3.1 tagged by Francesco Paolo Lovergine on Wed May 23 15:30:16 2012 +0200 - Shortlog Upstream version 3.3.3 Francesco Paolo Lovergine (1): Imported Upstream version 3.3.3 --- -- Geometry engine for Geographic Information Systems ___ 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] mapserver tag, debian/6.0.1-4, created. upstream/6.0.1-29-g379df24
The tag, debian/6.0.1-4 has been created at 379df247b85194039cd45d3c11da4981eb3bc3ec (commit) - Shortlog commit 379df247b85194039cd45d3c11da4981eb3bc3ec Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Mar 14 21:48:31 2012 +0100 Minor changes for policies. --- -- Mapserver ___ 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] liblas tag, debian/1.2.1-5, created. debian/1.2.1-1-13-g71af4f5
The tag, debian/1.2.1-5 has been created at 71af4f54133c98aacc80091f7d68b51ba4fdae50 (commit) - Shortlog commit 71af4f54133c98aacc80091f7d68b51ba4fdae50 Author: Francesco Paolo Lovergine fran...@debian.org Date: Thu Mar 22 12:45:05 2012 +0100 Fixed FTBS due to new TIFF use. --- -- ASPRS LiDAR data translation library ___ 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] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 5cfefd06fb51f90ed870f5af0f4b07ae7e70c77f Author: Francesco Paolo Lovergine fran...@debian.org Date: Wed Feb 17 16:54:53 2010 + Minor change. diff --git a/debian/changelog b/debian/changelog index 8328cd4..deb55b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +geos (3.2.0-2) unstable; urgency=low + + * Policy set to 3.8.4, without changes. + + -- Francesco Paolo Lovergine fran...@debian.org Thu, 21 Jan 2010 17:55:27 +0100 + geos (3.2.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 2a8f3b3..c7614e1 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk diff --git a/debian/control.in b/debian/control.in index 5504410..0158e61 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk -- Geometry engine for Geographic Information Systems ___ 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] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit ba5ae59015a3798ef26c46acb4b2fcd5ba96dc20
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Thu Apr 1 22:53:40 2010 +
Inital python binding support and new version.
diff --git a/debian/changelog b/debian/changelog
index deb55b1..a145edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+geos (3.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added python bindings for all versions.
+
+ -- Francesco Paolo Lovergine fran...@debian.org Fri, 02 Apr 2010 00:02:16
+0200
+
geos (3.2.0-2) unstable; urgency=low
* Policy set to 3.8.4, without changes.
diff --git a/debian/control b/debian/control
index c7614e1..44c63ae 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev,
+ python-dev, python-all-dev (= 2.3.5-11~), python-central (= 0.5)
Standards-Version: 3.8.4
+XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -12,7 +14,7 @@ Vcs-Svn:
svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.2.0 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+Depends: libgeos-3.2.1 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
Suggests: libgdal-doc
Description: Geometry engine for GIS - Development files
GEOS provides a spatial object model and fundamental geometric
@@ -43,7 +45,7 @@ Description: Geometry engine for Geographic Information
Systems - C Library
This package contains the C library. A C++ library is provided
by the libgeos* package.
-Package: libgeos-3.2.0
+Package: libgeos-3.2.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -79,10 +81,23 @@ Description: Documentation for the GEOS GIS geometry engine
library
Package: libgeos-ruby1.8
Section: ruby
Architecture: any
-Depends: libgeos-3.2.0 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Description: GEOS bindings for Ruby
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
OpenGIS Consortium Simple Features Specification for SQL.
.
This package contains the Ruby bindings for GEOS.
+
+Package: python-geos
+Section: python
+Architecture: any
+Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: GEOS bindings for Python
+ GEOS provides a spatial object model and fundamental geometric
+ functions. It implements the geometry model defined in the
+ OpenGIS Consortium Simple Features Specification for SQL.
+ .
+ This package contains the Python bindings for GEOS.
diff --git a/debian/control.in b/debian/control.in
index 0158e61..3a394c5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,8 +3,10 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev,
+ python-dev, python-all-dev (= 2.3.5-11~), python-central (= 0.5)
Standards-Version: 3.8.4
+XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -86,3 +88,16 @@ Description: GEOS bindings for Ruby
OpenGIS Consortium Simple Features Specification for SQL.
.
This package contains the Ruby bindings for GEOS.
+
+Package: python-geos
+Section: python
+Architecture: any
+Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: GEOS bindings for Python
+ GEOS provides a spatial object model and fundamental geometric
+ functions. It implements the geometry model defined in the
+ OpenGIS Consortium Simple Features Specification for SQL.
+ .
+ This package contains the Python bindings for GEOS.
diff --git a/debian/rules b/debian/rules
index 38604d4..4157b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@
include /usr/share/dpatch/dpatch.make
+PYVERS=$(shell pyversions -v -r debian/control.in)
+PYDEF=$(shell pyversions -dv
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 578391970e6ea8a59917dc10c5993dad02d95968
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Sat Apr 3 21:24:02 2010 +
Reverted change about python binding.
diff --git a/debian/changelog b/debian/changelog
index a145edd..f14db36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
geos (3.2.1-1) unstable; urgency=low
* New upstream release.
- * Added python bindings for all versions.
- -- Francesco Paolo Lovergine fran...@debian.org Fri, 02 Apr 2010 00:02:16
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org Sat, 03 Apr 2010 23:23:35
+0200
geos (3.2.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 44c63ae..cd4ad76 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev,
- python-dev, python-all-dev (= 2.3.5-11~), python-central (= 0.5)
+Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev
Standards-Version: 3.8.4
-XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -89,15 +87,3 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
-Package: python-geos
-Section: python
-Architecture: any
-Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: GEOS bindings for Python
- GEOS provides a spatial object model and fundamental geometric
- functions. It implements the geometry model defined in the
- OpenGIS Consortium Simple Features Specification for SQL.
- .
- This package contains the Python bindings for GEOS.
diff --git a/debian/control.in b/debian/control.in
index 3a394c5..2de51db 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,10 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev,
- python-dev, python-all-dev (= 2.3.5-11~), python-central (= 0.5)
+Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev
Standards-Version: 3.8.4
-XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -89,15 +87,3 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
-Package: python-geos
-Section: python
-Architecture: any
-Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: GEOS bindings for Python
- GEOS provides a spatial object model and fundamental geometric
- functions. It implements the geometry model defined in the
- OpenGIS Consortium Simple Features Specification for SQL.
- .
- This package contains the Python bindings for GEOS.
--
Geometry engine for Geographic Information Systems
___
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] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 17536c0cf97dde0283936db8bc8738aa99fe515f Merge: 47199fe5b8fd1bf0004c268eb278423bf46c59a7 dff4d8b0b688280e32572ff0f689efda1115accb Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Mar 1 20:31:46 2011 +0100 Merge branch 'upstream' -- Geometry engine for Geographic Information Systems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
