This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository postgis.
commit b3af114e6540bd152d3090829d1553fa5b10d4e1 Author: Bas Couwenberg <[email protected]> Date: Tue Sep 6 12:15:57 2016 +0200 Update patches. Changes: - Drop hicolor-icons.patch, applied upstream - Drop disable-tests.patch, only added to not block proj 4.9.3 transition - Refresh remainging patches --- debian/changelog | 4 +++ debian/patches/disable-tests.patch | 33 ----------------- debian/patches/hicolor-icons.patch | 72 -------------------------------------- debian/patches/link-liblwgeom | 5 +-- debian/patches/series | 2 -- 5 files changed, 7 insertions(+), 109 deletions(-) diff --git a/debian/changelog b/debian/changelog index 24e7820..def65eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ postgis (2.3.0~beta1+dfsg-1) UNRELEASED; urgency=medium - Update copright years for various copyright holders - Drop config.rpath from Files section, removed upstream * Rename packages from 2.2 to 2.3. + * Update patches, changes: + - Drop hicolor-icons.patch, applied upstream + - Drop disable-tests.patch, only added to not block proj 4.9.3 transition + - Refresh remainging patches -- Bas Couwenberg <[email protected]> Tue, 06 Sep 2016 11:18:14 +0200 diff --git a/debian/patches/disable-tests.patch b/debian/patches/disable-tests.patch deleted file mode 100644 index e6aab89..0000000 --- a/debian/patches/disable-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Disable tests failing on several architectures. -Author: Bas Couwenberg <[email protected]> - ---- a/raster/test/regress/Makefile.in -+++ b/raster/test/regress/Makefile.in -@@ -42,8 +42,7 @@ PATH := $(PGSQL_BINDIR):$(PATH) - export PATH - - TEST_FIRST = \ -- check_gdal \ -- load_outdb -+ check_gdal - - TEST_LAST = \ - clean -@@ -56,9 +55,7 @@ TEST_IO = \ - rt_io - - TEST_BASIC_FUNC = \ -- rt_bytea \ - box3d \ -- rt_addband \ - rt_band \ - rt_tile - -@@ -99,7 +96,6 @@ TEST_BANDPROPS = \ - rt_polygon - - TEST_UTILITY = \ -- rt_utility \ - rt_fromgdalraster \ - rt_asgdalraster \ - rt_astiff \ diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch deleted file mode 100644 index 4bdfda1..0000000 --- a/debian/patches/hicolor-icons.patch +++ /dev/null @@ -1,72 +0,0 @@ -Description: Install desktop file and applications icons for shp2pgsql-gui. - Related FreeDesktop.org standards: - * Desktop Entry Specification - https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html - * Icon Theme Specification - https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#install_icons - . - The 48x48 icon is required byt the Icon Theme Specification, - and the 22x22 up to 64x64 icons are required by the Debian Policy: - https://www.debian.org/doc/debian-policy/ch-opersys.html#s-menus -Author: Bas Couwenberg <[email protected]> -Forwarded: https://trac.osgeo.org/postgis/ticket/3571 -Applied-Upstream: https://trac.osgeo.org/postgis/changeset/14932 - ---- /dev/null -+++ b/loader/shp2pgsql-gui.desktop -@@ -0,0 +1,10 @@ -+[Desktop Entry] -+Type=Application -+Name=shp2pgsql-gui -+GenericName=GUI for Shapefile to PostGIS import tool -+Comment=Import shapefiles into PostGIS databases -+Categories=Geography;Science;Geoscience; -+Exec=shp2pgsql-gui -+Icon=shp2pgsql-gui -+Terminal=false -+Keywords=spatial;postgis;postgresql;gis; ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -114,14 +114,40 @@ $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgs - installdir: - @mkdir -p $(DESTDIR)$(bindir) - --install: installdir -+install-desktop: -+ifdef gtk_build -+ mkdir -p $(DESTDIR)$(datadir)/applications -+ $(INSTALL_DATA) shp2pgsql-gui.desktop $(DESTDIR)$(datadir)/applications/shp2pgsql-gui.desktop -+endif -+ -+ICON_SIZES = 8x8 16x16 22x22 24x24 32x32 36x36 40x40 42x42 48x48 64x64 -+ -+install-icons: -+ifdef gtk_build -+ for size in $(ICON_SIZES); do \ -+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps; \ -+ $(INSTALL_DATA) icons/hicolor/$${size}/apps/shp2pgsql-gui.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}/apps/shp2pgsql-gui.png; \ -+ done -+endif -+ -+install: installdir install-desktop install-icons - ifdef gtk_build - $(LIBTOOL) --mode=install $(INSTALL) $(SHP2PGSQL-GUI) "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)" - endif - $(LIBTOOL) --mode=install $(INSTALL) $(PGSQL2SHP-CLI) "$(DESTDIR)$(bindir)/$(PGSQL2SHP-CLI)" - $(LIBTOOL) --mode=install $(INSTALL) $(SHP2PGSQL-CLI) "$(DESTDIR)$(bindir)/$(SHP2PGSQL-CLI)" - --uninstall: -+uninstall-desktop: -+ifdef gtk_build -+ rm -f $(DESTDIR)$(datadir)/applications/shp2pgsql-gui.desktop -+endif -+ -+uninstall-icons: -+ifdef gtk_build -+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/*/apps/shp2pgsql-gui.png -+endif -+ -+uninstall: uninstall-desktop uninstall-icons - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(PGSQL2SHP-CLI)" - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-CLI)" - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)" diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom index 5838f03..de3013e 100644 --- a/debian/patches/link-liblwgeom +++ b/debian/patches/link-liblwgeom @@ -6,7 +6,7 @@ Forwarded: https://trac.osgeo.org/postgis/ticket/3290 --- a/postgis/Makefile.in +++ b/postgis/Makefile.in -@@ -84,14 +84,8 @@ PG_OBJS= \ +@@ -102,15 +102,9 @@ PG_OBJS= \ OBJS=$(PG_OBJS) # Libraries to link into the module (proj, geos) @@ -16,7 +16,8 @@ Forwarded: https://trac.osgeo.org/postgis/ticket/3290 -# to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an -# older version of PostGIS, rather than with the static liblwgeom.a -# supplied with newer versions of PostGIS - PG_CPPFLAGS += -I../liblwgeom -I../libpgcommon @CPPFLAGS@ -fPIC + override CFLAGS := -I../liblwgeom $(CFLAGS) + PG_CPPFLAGS += -I../libpgcommon @CPPFLAGS@ -fPIC -SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@ +SHLIB_LINK_F = -L../liblwgeom/.libs -llwgeom ../libpgcommon/libpgcommon.a @SHLIB_LINK@ diff --git a/debian/patches/series b/debian/patches/series index f8bb868..32f6ef4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ link-liblwgeom relax-test-timing-constraints.patch -hicolor-icons.patch -disable-tests.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
