[DebianGIS-dev] r793 - in packages/ogdi-dfsg/trunk: . config debian
debian/patches
Francesco Lovergine
frankie at alioth.debian.org
Mon Apr 30 13:11:41 UTC 2007
Author: frankie
Date: 2007-04-30 13:11:41 +0000 (Mon, 30 Apr 2007)
New Revision: 793
Modified:
packages/ogdi-dfsg/trunk/config.guess
packages/ogdi-dfsg/trunk/config.sub
packages/ogdi-dfsg/trunk/config/Linux.mak
packages/ogdi-dfsg/trunk/debian/changelog
packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
Log:
Preparing 3.2.0~beta1-3
Modified: packages/ogdi-dfsg/trunk/config/Linux.mak
===================================================================
--- packages/ogdi-dfsg/trunk/config/Linux.mak 2007-04-30 10:37:47 UTC (rev 792)
+++ packages/ogdi-dfsg/trunk/config/Linux.mak 2007-04-30 13:11:41 UTC (rev 793)
@@ -44,7 +44,7 @@
UCB_STATICLIB =
-TCL_INCLUDE = -I/usr/include/tcl8.3
+TCL_INCLUDE = -I/usr/include/tcl8.4
TCL_LINKLIB =
#
Modified: packages/ogdi-dfsg/trunk/config.guess
===================================================================
--- packages/ogdi-dfsg/trunk/config.guess 2007-04-30 10:37:47 UTC (rev 792)
+++ packages/ogdi-dfsg/trunk/config.guess 2007-04-30 13:11:41 UTC (rev 793)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# 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
@@ -161,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-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 ;;
@@ -950,6 +954,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
Modified: packages/ogdi-dfsg/trunk/config.sub
===================================================================
--- packages/ogdi-dfsg/trunk/config.sub 2007-04-30 10:37:47 UTC (rev 792)
+++ packages/ogdi-dfsg/trunk/config.sub 2007-04-30 13:11:41 UTC (rev 793)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,7 +1222,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1417,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
Modified: packages/ogdi-dfsg/trunk/debian/changelog
===================================================================
--- packages/ogdi-dfsg/trunk/debian/changelog 2007-04-30 10:37:47 UTC (rev 792)
+++ packages/ogdi-dfsg/trunk/debian/changelog 2007-04-30 13:11:41 UTC (rev 793)
@@ -1,3 +1,11 @@
+ogdi-dfsg (3.2.0~beta1-3) unstable; urgency=low
+
+ * Changed shared.dpatch to add -fPIC flag whenever required. This is due to
+ some internal misbehave of the building scripts.
+ (closes: #420527)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 30 Apr 2007 15:09:05 +0200
+
ogdi-dfsg (3.2.0~beta1-2) unstable; urgency=low
* Changed shared.dpatch to add soname to libvpf.so
Modified: packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch 2007-04-30 10:37:47 UTC (rev 792)
+++ packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch 2007-04-30 13:11:41 UTC (rev 793)
@@ -12,8 +12,21 @@
@DPATCH@
diff -urNad ogdi-dfsg~/config/unix.mak ogdi-dfsg/config/unix.mak
---- ogdi-dfsg~/config/unix.mak 2007-03-27 18:08:43.000000000 +0200
-+++ ogdi-dfsg/config/unix.mak 2007-04-09 00:32:37.000000000 +0200
+--- ogdi-dfsg~/config/unix.mak 2007-04-30 15:00:24.000000000 +0200
++++ ogdi-dfsg/config/unix.mak 2007-04-30 15:05:56.000000000 +0200
+@@ -22,9 +22,9 @@
+ #
+ # Standard tools
+ #
+-CC = gcc
+-LD = gcc
+-SHLIB_LD = gcc
++CC = gcc -shared -fPIC
++LD = gcc
++SHLIB_LD = gcc -shared -fPIC
+ AR = ar cr
+ RM = rm
+ RMALL = rm -rf
@@ -93,9 +93,9 @@
$(SHRDGEN): $(OBJECTS)
@@ -28,8 +41,8 @@
$(DYNAGEN): $(OBJECTS)
diff -urNad ogdi-dfsg~/contrib/makefile ogdi-dfsg/contrib/makefile
---- ogdi-dfsg~/contrib/makefile 2007-03-27 18:08:43.000000000 +0200
-+++ ogdi-dfsg/contrib/makefile 2007-04-09 00:32:37.000000000 +0200
+--- ogdi-dfsg~/contrib/makefile 2007-04-30 15:00:24.000000000 +0200
++++ ogdi-dfsg/contrib/makefile 2007-04-30 15:01:02.000000000 +0200
@@ -16,7 +16,7 @@
#
# Sub-directories that need to be built
@@ -40,8 +53,8 @@
#
# Default target to build everything in all sub-directories
diff -urNad ogdi-dfsg~/ogdi/c-api/makefile ogdi-dfsg/ogdi/c-api/makefile
---- ogdi-dfsg~/ogdi/c-api/makefile 2007-03-27 18:08:43.000000000 +0200
-+++ ogdi-dfsg/ogdi/c-api/makefile 2007-04-09 00:32:37.000000000 +0200
+--- ogdi-dfsg~/ogdi/c-api/makefile 2007-04-30 15:00:24.000000000 +0200
++++ ogdi-dfsg/ogdi/c-api/makefile 2007-04-30 15:01:02.000000000 +0200
@@ -13,11 +13,7 @@
TOBEGEN = ogdi
@@ -55,8 +68,8 @@
SOURCES = ecs_dyna.c ecsregex.c ecssplit.c \
ecsassoc.c ecshash.c ecstile.c server.c ecsdist.c \
diff -urNad ogdi-dfsg~/vpflib/makefile ogdi-dfsg/vpflib/makefile
---- ogdi-dfsg~/vpflib/makefile 2007-03-27 18:08:43.000000000 +0200
-+++ ogdi-dfsg/vpflib/makefile 2007-04-09 00:33:22.000000000 +0200
+--- ogdi-dfsg~/vpflib/makefile 2007-04-30 15:00:24.000000000 +0200
++++ ogdi-dfsg/vpflib/makefile 2007-04-30 15:01:02.000000000 +0200
@@ -7,7 +7,7 @@
#
More information about the Pkg-grass-devel
mailing list