Author: frankie
Date: 2009-02-03 00:09:39 +0000 (Tue, 03 Feb 2009)
New Revision: 1853
Modified:
packages/geotiff/libgeotiff-dfsg/trunk/Makefile.in
packages/geotiff/libgeotiff-dfsg/trunk/config.guess
packages/geotiff/libgeotiff-dfsg/trunk/config.sub
packages/geotiff/libgeotiff-dfsg/trunk/debian/changelog
packages/geotiff/libgeotiff-dfsg/trunk/debian/control
packages/geotiff/libgeotiff-dfsg/trunk/debian/patches/soname.dpatch
packages/geotiff/libgeotiff-dfsg/trunk/debian/rules
Log:
Fixing #495349 and removing other previous changes.
Modified: packages/geotiff/libgeotiff-dfsg/trunk/Makefile.in
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/Makefile.in 2009-02-02 21:25:23 UTC
(rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/Makefile.in 2009-02-03 00:09:39 UTC
(rev 1853)
@@ -38,7 +38,7 @@
geotiff_...@geotiff_so@
geotiff_d...@geotiff_dll@
geotiff_i...@geotiff_imp@
-ld_shar...@ld_shared@
+ld_shar...@cc@ -shared
-Wl,-soname,libgeoti...@so_ext@....@version_major@....@version_minor@
so_e...@so_ext@
GT_INCLUDE_FILES = xtiffio.h geotiff.h geotiffio.h geovalues.h \
@@ -191,8 +191,8 @@
$(INSTALL) libgeotiff.a $(GEOTIFF_IMP) $(DESTDIR)${libdir}
$(INSTALL) -d $(DESTDIR)$(includedir)
$(INSTALL) $(GT_INCLUDE_FILES) $(DESTDIR)$(includedir)
- $(INSTALL) -d $(DESTDIR)$(datadir)
- $(INSTALL) csv/*.csv $(DESTDIR)$(datadir)
+# $(INSTALL) -d $(DESTDIR)$(datadir)
+# $(INSTALL) csv/*.csv $(DESTDIR)$(datadir)
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) bin/listgeo$(EXEEXT) bin/geotifcp$(EXEEXT)
$(DESTDIR)$(bindir)
if test ! -z "$(GEOTIFF_SO)" ; then \
Modified: packages/geotiff/libgeotiff-dfsg/trunk/config.guess
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/config.guess 2009-02-02 21:25:23 UTC
(rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/config.guess 2009-02-03 00:09:39 UTC
(rev 1853)
@@ -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
+# Free Software Foundation, Inc.
-timestamp='2007-07-22'
+timestamp='2008-01-23'
# 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 @@
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."
@@ -532,7 +532,7 @@
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 2>&1;
then
IBM_ARCH=rs6000
@@ -799,6 +799,9 @@
EM64T | authenticamd)
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
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
Modified: packages/geotiff/libgeotiff-dfsg/trunk/config.sub
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/config.sub 2009-02-02 21:25:23 UTC
(rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/config.sub 2009-02-03 00:09:39 UTC
(rev 1853)
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# 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
+# Free Software Foundation, Inc.
-timestamp='2007-06-28'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-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."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -813,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1021,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
Modified: packages/geotiff/libgeotiff-dfsg/trunk/debian/changelog
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/debian/changelog 2009-02-02
21:25:23 UTC (rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/debian/changelog 2009-02-03
00:09:39 UTC (rev 1853)
@@ -1,9 +1,9 @@
-libgeotiff-dfsg (1.2.4-4) UNRELEASED; urgency=low
+libgeotiff-dfsg (1.2.4-4) unstable; urgency=high
- * NOT RELEASED YET
- * Added Vcs-* fields to debian/control.
+ * Fixed soname patch and removed overriding of LD_SHARED in debian/rules
+ (closes: #495349)
- -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 03 Jan 2008 13:45:19
+0100
+ -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 03 Feb 2009 01:08:27
+0100
libgeotiff-dfsg (1.2.4-3) unstable; urgency=low
Modified: packages/geotiff/libgeotiff-dfsg/trunk/debian/control
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/debian/control 2009-02-02
21:25:23 UTC (rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/debian/control 2009-02-03
00:09:39 UTC (rev 1853)
@@ -6,8 +6,6 @@
Standards-Version: 3.7.3
Section: science
Homepage: http://geotiff.maptools.org/
-Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/geotiff/libgeotiff-dfsg/trunk
-Vcs-Svn:
svn://svn.debian.org/svn/pkg-grass/packages/geotiff/libgeotiff-dfsg/trunk
Package: libgeotiff-dev
Section: libdevel
Modified: packages/geotiff/libgeotiff-dfsg/trunk/debian/patches/soname.dpatch
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/debian/patches/soname.dpatch
2009-02-02 21:25:23 UTC (rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/debian/patches/soname.dpatch
2009-02-03 00:09:39 UTC (rev 1853)
@@ -5,15 +5,15 @@
## DP: Add soname for this version of the library
@DPATCH@
-diff -urNad libgeotiff-1.2.3~/Makefile.in libgeotiff-1.2.3/Makefile.in
---- libgeotiff-1.2.3~/Makefile.in 2005-08-16 17:21:20.000000000 +0200
-+++ libgeotiff-1.2.3/Makefile.in 2007-04-05 13:47:19.000000000 +0200
+diff -urNad libgeotiff-dfsg~/Makefile.in libgeotiff-dfsg/Makefile.in
+--- libgeotiff-dfsg~/Makefile.in 2009-02-03 00:53:08.000000000 +0100
++++ libgeotiff-dfsg/Makefile.in 2009-02-03 00:53:58.000000000 +0100
@@ -38,7 +38,7 @@
geotiff_...@geotiff_so@
geotiff_d...@geotiff_dll@
geotiff_i...@geotiff_imp@
-ld_shar...@ld_shared@
-+ld_shar...@ld_shared@
-soname=libgeoti...@so_ext@....@version_major@....@version_minor@
++ld_shar...@cc@ -shared
-Wl,-soname,libgeoti...@so_ext@....@version_major@....@version_minor@
so_e...@so_ext@
GT_INCLUDE_FILES = xtiffio.h geotiff.h geotiffio.h geovalues.h \
Modified: packages/geotiff/libgeotiff-dfsg/trunk/debian/rules
===================================================================
--- packages/geotiff/libgeotiff-dfsg/trunk/debian/rules 2009-02-02 21:25:23 UTC
(rev 1852)
+++ packages/geotiff/libgeotiff-dfsg/trunk/debian/rules 2009-02-03 00:09:39 UTC
(rev 1853)
@@ -36,7 +36,7 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) LD_SHARED="gcc -shared"
+ $(MAKE)
touch $@
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
