[SCM] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302
The following commit has been merged in the master branch: commit b8dbf23783b2bc326aa2a9bdcaa3ab77386f8863 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Dec 16 16:28:06 2013 +0100 Fixed debian/watch and other minor glitches. diff --git a/debian/changelog b/debian/changelog index 4cb3a14..bce70f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -libgeotiff-dfsg (1.4.0+dfsg-1) unstable; urgency=low +libgeotiff-dfsg (1.4.0-1) unstable; urgency=low * New upstream release. * Policy bumped to 3.9.5. * Debhelper level set to 9. + * Updated watch file to reflect current repo. + * Set canonical Vcs-* fiedls. -- Francesco Paolo Lovergine fran...@debian.org Mon, 16 Dec 2013 16:20:15 +0100 diff --git a/debian/control b/debian/control index 5a4837c..61a82e9 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault abou Build-Depends: debhelper, autotools-dev, libproj-dev, zlib1g-dev, libjpeg-dev, libtiff4-dev Standards-Version: 3.9.5 Homepage: http://geotiff.osgeo.org/ -Vcs-Browser: http://git.debian.org/?p=pkg-grass/libgeotiff-dfsg.git -Vcs-Git: git://git.debian.org/git/pkg-grass/libgeotiff-dfsg.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libgeotiff-dfsg.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/libgeotiff-dfsg.git Package: libgeotiff-dev diff --git a/debian/watch b/debian/watch index 4105a16..ad05d50 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ # Compulsory line, this is a version 3 file version=3 -ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-([\d\.]+)\.tar\.gz debian uupdate +http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-([\d\.]+)\.tar\.gz debian uupdate -- The GeoTIFF 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] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302
The following commit has been merged in the master branch: commit 4c9a8a3a1ddc5bc6a9f3e221b87487d1e759cd09 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Dec 16 16:21:38 2013 +0100 New upstream release and minor changes to package diff --git a/debian/changelog b/debian/changelog index 79d9184..4cb3a14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libgeotiff-dfsg (1.4.0+dfsg-1) unstable; urgency=low + + * New upstream release. + * Policy bumped to 3.9.5. + * Debhelper level set to 9. + + -- Francesco Paolo Lovergine fran...@debian.org Mon, 16 Dec 2013 16:20:15 +0100 + libgeotiff-dfsg (1.3.0+dfsg-1) unstable; urgency=low * Moved to git repository on alioth. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 7cb3380..5a4837c 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Priority: extra Section: science Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault aboudrea...@mapgears.com -Build-Depends: debhelper (= 8), autotools-dev, libproj-dev, zlib1g-dev, libjpeg-dev, libtiff4-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper, autotools-dev, libproj-dev, zlib1g-dev, libjpeg-dev, libtiff4-dev +Standards-Version: 3.9.5 Homepage: http://geotiff.osgeo.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/libgeotiff-dfsg.git Vcs-Git: git://git.debian.org/git/pkg-grass/libgeotiff-dfsg.git -- The GeoTIFF 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] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302
The following commit has been merged in the master branch:
commit 0051567afd12addf5ca54fcad6bdf8f3a89ae8b1
Merge: f2bd3ad19e81cfb77d3309df7c4f33140b55b16d
5d8800f95b37cafe931e74169901292817fe3b50
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Dec 16 16:19:20 2013 +0100
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
diff --combined config.guess
index 0f0fe71,e3a2116..e3a2116
mode 100644,100755..100644
--- a/config.guess
+++ b/config.guess
@@@ -1,10 -1,10 +1,10 @@@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
- # Inc.
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ # Free Software Foundation, Inc.
- timestamp='2007-03-06'
+ timestamp='2009-06-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@@ -56,8 -56,8 +56,8 @@@ version=
GNU config.guess ($timestamp)
Originally written by Per Bothner.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@@ -170,7 -170,7 +170,7 @@@ case ${UNAME_MACHINE}:${UNAME_SYSTEM}:
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2/dev/null \
- | grep __ELF__ /dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out
(netbsdaout).
# Return netbsd for either. FIX?
@@@ -324,14 -324,30 +324,30 @@@
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e
's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH=i386
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
+ grep IS_64BIT_ARCH /dev/null
+ then
+ SUN_ARCH=x86_64
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@@ -532,7 -548,7 +548,7 @@@ EO
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk
'{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' /dev/null 21;
then
IBM_ARCH=rs6000
@@@ -640,7 -656,7 +656,7 @@@ EO
# = hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) |
- grep __LP64__ /dev/null
+ grep -q __LP64__
then
HP_ARCH=hppa2.0w
else
@@@ -793,16 -809,22 +809,22 @@@ EO
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd)
+ EM64T | authenticamd | genuineintel)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of ATT UWIN. Should we
@@@
[SCM] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302
The following commit has been merged in the master branch: commit 7ef73027971b75d12b166ea7951bf244730c2fe9 Author: Francesco Paolo Lovergine fran...@debian.org Date: Tue Dec 17 09:59:27 2013 +0100 Added back docs installation. diff --git a/debian/geotiff-bin.docs b/debian/geotiff-bin.docs index e845566..31b6baa 100644 --- a/debian/geotiff-bin.docs +++ b/debian/geotiff-bin.docs @@ -1 +1,3 @@ README +docs/geotifcp.html +docs/listgeo.html diff --git a/debian/libgeotiff-dev.docs b/debian/libgeotiff-dev.docs index e845566..38128a1 100644 --- a/debian/libgeotiff-dev.docs +++ b/debian/libgeotiff-dev.docs @@ -1 +1,3 @@ README +docs/index.dox +docs/manual.txt -- The GeoTIFF 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] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302
The following commit has been merged in the master branch: commit eb0b4e17818941350b543cda8ea34fa113c4ee64 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Dec 16 16:39:13 2013 +0100 Updated patch for removing data install diff --git a/debian/patches/Makefile.in b/debian/patches/Makefile.in index e19dca5..1f87dcf 100644 --- a/debian/patches/Makefile.in +++ b/debian/patches/Makefile.in @@ -1,8 +1,8 @@ Index: libgeotiff-dfsg/Makefile.in === libgeotiff-dfsg.orig/Makefile.in 2011-11-08 14:40:02.0 +0100 -+++ libgeotiff-dfsg/Makefile.in2011-11-08 14:50:42.0 +0100 -@@ -901,7 +901,7 @@ +--- libgeotiff-dfsg.orig/Makefile.in 2013-12-16 16:38:52.0 +0100 libgeotiff-dfsg/Makefile.in2013-12-16 16:38:52.0 +0100 +@@ -1015,7 +1015,7 @@ exit 1; } 2 check-am: all-am check: check-recursive @@ -11,7 +11,7 @@ Index: libgeotiff-dfsg/Makefile.in installdirs: installdirs-recursive installdirs-am: for dir in $(DESTDIR)$(libdir) $(DESTDIR)$(csvdir) $(DESTDIR)$(includedir); do \ -@@ -954,7 +954,7 @@ +@@ -1071,7 +1071,7 @@ info-am: @@ -20,7 +20,7 @@ Index: libgeotiff-dfsg/Makefile.in install-dvi: install-dvi-recursive -@@ -992,7 +992,7 @@ +@@ -1119,7 +1119,7 @@ ps-am: @@ -28,4 +28,4 @@ Index: libgeotiff-dfsg/Makefile.in +uninstall-am: uninstall-includeHEADERS \ uninstall-libLTLIBRARIES - .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ -- The GeoTIFF 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] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302
The following commit has been merged in the master branch:
commit 8fb55289b90df49afdd25c2243444b831fdfc026
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Dec 16 16:37:34 2013 +0100
Minor update and policy fixes.
diff --git a/debian/changelog b/debian/changelog
index bce70f8..7943bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ libgeotiff-dfsg (1.4.0-1) unstable; urgency=low
* Debhelper level set to 9.
* Updated watch file to reflect current repo.
* Set canonical Vcs-* fiedls.
+ * Added misc-depends to -dev package.
+ * Now using dh_ methods to update/restore autotools config.* stuff.
+ * Introduced missing recommended build-* targets in debian/rules.
-- Francesco Paolo Lovergine fran...@debian.org Mon, 16 Dec 2013 16:20:15
+0100
diff --git a/debian/control b/debian/control
index 61a82e9..d0fd103 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git:
git://anonscm.debian.org/pkg-grass/libgeotiff-dfsg.git
Package: libgeotiff-dev
Section: libdevel
Architecture: any
-Depends: libgeotiff2 (= ${binary:Version}), libtiff4-dev
+Depends: libgeotiff2 (= ${binary:Version}), libtiff4-dev, ${misc:Depends}
Suggests: libgeotiff-epsg
Description: the GeoTIFF library -- development files
This C library supports TIFF 6.0 based interchange format for georeferenced
diff --git a/debian/rules b/debian/rules
index 1e9dce0..4745e70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,20 +20,16 @@ endif
config.status: configure
dh_testdir
-ifneq $(wildcard /usr/share/misc/config.sub)
- mv config.sub config.sub.original
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess)
- mv 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)
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info \
--includedir=\$${prefix}/include/geotiff
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
build-stamp: config.status
dh_testdir
@@ -46,13 +42,7 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
-
-ifneq $(wildcard /usr/share/misc/config.sub.original)
- mv config.sub.original config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess.original)
- mv config.guess.original config.guess
-endif
+ dh_autotools-dev_restoreconfig
# Add here commands to clean up after the build process.
[ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean
@@ -73,11 +63,11 @@ install: build
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
--
The GeoTIFF 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
