[SCM] grass branch, master, updated. upstream/6.4.1-131-g0b1ec4c
The following commit has been merged in the master branch: commit 71a1d51d349d38959a93552e53481c75cc15b710 Author: Francesco Paolo Lovergine Date: Mon Dec 16 12:42:48 2013 +0100 Some minor cleanup and new b-d. diff --git a/debian/changelog b/debian/changelog index cf5ffdc..90e4561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grass (6.4.3-3) unstable; urgency=medium + + * Now b-d on current libgdal-dev. + * Policy bumped to 3.9.5. + * Now use dh_autotools-dev_{restore,update}config instead of manual +update/restore in debian/rules + + -- Francesco Paolo Lovergine Mon, 16 Dec 2013 12:37:57 +0100 + grass (6.4.3-2) unstable; urgency=low [ M. Hamish Bowman ] diff --git a/debian/control b/debian/control index 883b16d..b0a527b 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev | libgdal1-dev (>= 1.5.0), + libgdal-dev (>= 1.10.0-0~), libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, @@ -36,7 +36,7 @@ Build-depends: tcl-dev (>= 8.5), tk-dev (>= 8.5), unixodbc-dev, hardening-includes -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git diff --git a/debian/control.in b/debian/control.in index 295c2e3..e758452 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,7 +14,7 @@ Build-depends: libcairo2-dev, libfftw3-dev, libfreetype6-dev, - libgdal-dev | libgdal1-dev (>= 1.5.0), + libgdal-dev (>= 1.10.0-0~), libgeos-dev, libglu1-mesa-dev | libglu1-xorg-dev, libjpeg-dev, @@ -36,7 +36,7 @@ Build-depends: tcl-dev (>= 8.5), tk-dev (>= 8.5), unixodbc-dev, hardening-includes -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Build-Conflicts: wx2.6-headers Homepage: http://grass.osgeo.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git diff --git a/debian/rules b/debian/rules index 46486c3..685da7e 100755 --- a/debian/rules +++ b/debian/rules @@ -54,16 +54,8 @@ debian/% :: debian/%.in configure: config.status config.status: dh_testdir - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f config.sub config.sub.original - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f config.guess config.guess.original - cp -f /usr/share/misc/config.guess config.guess -endif - + + dh_autotools-dev_updateconfig # Add here commands to configure the package. CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ @@ -122,13 +114,7 @@ clean: templates true-clean true-clean: dh_testdir dh_testroot - -ifneq "$(wildcard /usr/share/misc/config.sub.original)" "" - mv -f config.sub.original config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess.original)" "" - mv -f config.guess.original config.guess -endif + dh_autotools-dev_restoreconfig # Add here commands to clean up after the build process. [ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean -- 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-131-g0b1ec4c
The following commit has been merged in the master branch: commit 0b1ec4c075392ab64adb96943faffdba44f304a6 Author: Francesco Paolo Lovergine Date: Mon Dec 16 12:51:16 2013 +0100 Incorporating changes to fix ia64 and s390x/ppc64 ports. diff --git a/debian/changelog b/debian/changelog index 90e4561..cc80223 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ grass (6.4.3-3) unstable; urgency=medium * Now use dh_autotools-dev_{restore,update}config instead of manual update/restore in debian/rules +[ Paul Gevers ] + * On ia64 build with $(HARDENING_DISABLE_PIE_CFLAGS_FILTER) filtered for +now (closes: #728150) + * Add patch fix_big-endian_issues which allows grass to build on s390x +and ppc64 (closes: #672719) + -- Francesco Paolo Lovergine Mon, 16 Dec 2013 12:37:57 +0100 grass (6.4.3-2) unstable; urgency=low diff --git a/debian/patches/fix_big-endian_issues b/debian/patches/fix_big-endian_issues new file mode 100644 index 000..873418c --- /dev/null +++ b/debian/patches/fix_big-endian_issues @@ -0,0 +1,151 @@ +Description: Fix big endian behavior +Origin: https://trac.osgeo.org/grass/changeset/57855 +Bug: https://trac.osgeo.org/grass/ticket/1430 +Bug-Debian: http://bugs.debian.org/672719 + +--- a/lib/vector/diglib/portable.c b/lib/vector/diglib/portable.c +@@ -155,21 +155,19 @@ + memset(buf, 0, cnt * sizeof(long)); + /* read from buffer in changed order */ + c1 = (unsigned char *)buffer; +- if (lng_order == ENDIAN_LITTLE) +- c2 = (unsigned char *)buf; +- else +- c2 = (unsigned char *)buf + nat_lng - PORT_LONG; ++ c2 = (unsigned char *)buf; + for (i = 0; i < cnt; i++) { + /* set to FF if the value is negative */ + if (lng_order == ENDIAN_LITTLE) { + if (c1[PORT_LONG - 1] & 0x80) + memset(c2, 0xff, sizeof(long)); ++ memcpy(c2, c1, PORT_LONG); + } + else { + if (c1[0] & 0x80) + memset(c2, 0xff, sizeof(long)); ++ memcpy(c2 + nat_lng - PORT_LONG, c1, PORT_LONG); + } +- memcpy(c2, c1, PORT_LONG); + c1 += PORT_LONG; + c2 += sizeof(long); + } +@@ -227,21 +225,19 @@ + memset(buf, 0, cnt * sizeof(int)); + /* read from buffer in changed order */ + c1 = (unsigned char *)buffer; +- if (int_order == ENDIAN_LITTLE) +- c2 = (unsigned char *)buf; +- else +- c2 = (unsigned char *)buf + nat_int - PORT_INT; ++ c2 = (unsigned char *)buf; + for (i = 0; i < cnt; i++) { + /* set to FF if the value is negative */ + if (int_order == ENDIAN_LITTLE) { + if (c1[PORT_INT - 1] & 0x80) + memset(c2, 0xff, sizeof(int)); ++ memcpy(c2, c1, PORT_INT); + } + else { + if (c1[0] & 0x80) + memset(c2, 0xff, sizeof(int)); ++ memcpy(c2 + nat_int - PORT_INT, c1, PORT_INT); + } +- memcpy(c2, c1, PORT_INT); + c1 += PORT_INT; + c2 += sizeof(int); + } +@@ -299,21 +295,19 @@ + memset(buf, 0, cnt * sizeof(short)); + /* read from buffer in changed order */ + c1 = (unsigned char *)buffer; +- if (shrt_order == ENDIAN_LITTLE) +- c2 = (unsigned char *)buf; +- else +- c2 = (unsigned char *)buf + nat_shrt - PORT_SHORT; ++ c2 = (unsigned char *)buf; + for (i = 0; i < cnt; i++) { + /* set to FF if the value is negative */ + if (shrt_order == ENDIAN_LITTLE) { + if (c1[PORT_SHORT - 1] & 0x80) + memset(c2, 0xff, sizeof(short)); ++ memcpy(c2, c1, PORT_SHORT); + } + else { + if (c1[0] & 0x80) + memset(c2, 0xff, sizeof(short)); ++ memcpy(c2 + nat_shrt - PORT_SHORT, c1, PORT_SHORT); + } +- memcpy(c2, c1, PORT_SHORT); + c1 += PORT_SHORT; + c2 += sizeof(short); + } +@@ -438,15 +432,15 @@ + } + else { + buf_alloc(cnt * PORT_LONG); +- if (lng_order == ENDIAN_LITTLE) +- c1 = (unsigned char *)buf; +- else +- c1 = (unsigned char *)buf + nat_lng - PORT_LONG; ++ c1 = (unsigned char *)buf; + c2 = (unsigned char *)buffer; + for (i = 0; i < cnt; i++) { +- memcpy(c2, c1, PORT_LONG); +- c1 += PORT_LONG; +- c2 += sizeof(long); ++ if (lng_order == ENDIAN_LITTLE) ++ memcpy(c2, c1, PORT_LONG); ++
[SCM] grass branch, master, updated. upstream/6.4.1-131-g0b1ec4c
The following commit has been merged in the master branch: commit 4d216f221d17564538e39a46cb42ee50f82856cc Author: Francesco Paolo Lovergine Date: Thu Sep 26 10:40:18 2013 +0200 Changed libtiff-dev b-d (again) diff --git a/debian/changelog b/debian/changelog index 15b638f..78e9fe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ grass (6.4.3-2) unstable; urgency=low + [ M. Hamish Bowman ] * Sort out watch file. + [ Francesco Paolo Lovergine ] + * Removed versioned dep for libtiff-dev b-d and pre-b-d on libtiff5-dev + -- M. Hamish Bowman Sat, 21 Sep 2013 15:46:48 +1200 grass (6.4.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9f11910..883b16d 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, - libtiff-dev (>> 4.0.3-1~) | libtiff5-dev, + libtiff5-dev | libtiff-dev, libmysqlclient-dev | libmysqlclient15-dev, libncurses5-dev, libpq-dev, diff --git a/debian/control.in b/debian/control.in index 1b254ce..295c2e3 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, - libtiff-dev (>> 4.0.3-1~) | libtiff5-dev, + libtiff5-dev | libtiff-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] grass branch, master, updated. upstream/6.4.1-131-g0b1ec4c
The following commit has been merged in the master branch: commit c3b76b3319ad10a521c78d4688a477d98dc0e349 Author: Francesco Paolo Lovergine Date: Thu Sep 26 11:21:23 2013 +0200 Annotated changelog for bug closing. diff --git a/debian/changelog b/debian/changelog index 78e9fe3..cf5ffdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ grass (6.4.3-2) unstable; urgency=low [ Francesco Paolo Lovergine ] * Removed versioned dep for libtiff-dev b-d and pre-b-d on libtiff5-dev + (closes: #723974) -- M. Hamish Bowman Sat, 21 Sep 2013 15:46:48 +1200 -- 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