Author: frankie
Date: 2007-03-27 16:02:58 +0000 (Tue, 27 Mar 2007)
New Revision: 658
Added:
packages/ogdi-dfsg/trunk/debian/patches/endianess.dpatch
Modified:
packages/ogdi-dfsg/trunk/debian/libogdi3.install
packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
packages/ogdi-dfsg/trunk/debian/rules
Log:
Modified to usr /usr/lib/ogdi for plugins and a single soname
for the only exported library. Thanks C. Balint for his hints.
Modified: packages/ogdi-dfsg/trunk/debian/libogdi3.install
===================================================================
--- packages/ogdi-dfsg/trunk/debian/libogdi3.install 2007-03-27 13:16:49 UTC
(rev 657)
+++ packages/ogdi-dfsg/trunk/debian/libogdi3.install 2007-03-27 16:02:58 UTC
(rev 658)
@@ -1 +1,2 @@
-usr/lib/lib*.so*
+usr/lib/libogdi.so*
+usr/lib/*.so usr/lib/ogdi
Added: packages/ogdi-dfsg/trunk/debian/patches/endianess.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/endianess.dpatch 2007-03-27
13:16:49 UTC (rev 657)
+++ packages/ogdi-dfsg/trunk/debian/patches/endianess.dpatch 2007-03-27
16:02:58 UTC (rev 658)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## endianess.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix endianess definition
+## DP: This is a Linux specific patch
+## DP: A better fix would check endianess at configuration time
+##
+
[EMAIL PROTECTED]@
+diff -urNad ogdi-dfsg~/vpflib/include/machine.h
ogdi-dfsg/vpflib/include/machine.h
+--- ogdi-dfsg~/vpflib/include/machine.h 2007-03-27 17:35:24.000000000
+0200
++++ ogdi-dfsg/vpflib/include/machine.h 2007-03-27 17:41:16.000000000 +0200
+@@ -15,10 +15,11 @@
+ long output;
+ } xBYTE_ORDER;
+
+-#if SYS_BIG_ENDIAN == 1
+-#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
+-#else
++#include <endian.h>
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define MACHINE_BYTE_ORDER LEAST_SIGNIFICANT
++#elif __BYTE_ORDER == __BIG_ENDIAN
++#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
+ #endif
+
+ #ifdef _WINDOWS
Property changes on: packages/ogdi-dfsg/trunk/debian/patches/endianess.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch 2007-03-27
13:16:49 UTC (rev 657)
+++ packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch 2007-03-27
16:02:58 UTC (rev 658)
@@ -11,31 +11,24 @@
@DPATCH@
diff -urNad ogdi-dfsg~/config/unix.mak ogdi-dfsg/config/unix.mak
---- ogdi-dfsg~/config/unix.mak 2007-03-27 15:09:59.000000000 +0200
-+++ ogdi-dfsg/config/unix.mak 2007-03-27 15:10:12.000000000 +0200
-@@ -93,7 +93,7 @@
+--- ogdi-dfsg~/config/unix.mak 2007-03-27 17:51:59.000000000 +0200
++++ ogdi-dfsg/config/unix.mak 2007-03-27 17:54:09.000000000 +0200
+@@ -93,9 +93,9 @@
$(SHRDGEN): $(OBJECTS)
@echo Making shared library: $@
- $(SHLIB_LD) $(SHLIB_LDFLAGS) $(COMMON_LDFLAGS) $(COMMON_CFLAGS)
-Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) -o $@ $^
$(LINK_LIBS)
-+ $(SHLIB_LD) $(SHLIB_LDFLAGS) $(COMMON_LDFLAGS) $(COMMON_CFLAGS)
-Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) -o
$(TOPDIR)/bin/$(TARGET)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$^ $(LINK_LIBS)
- pushd $(TOPDIR)/bin/$(TARGET); ln -s
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT); \
- ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR); popd
+- pushd $(TOPDIR)/bin/$(TARGET); ln -s
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT); \
+- ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR); popd
++ $(SHLIB_LD) $(SHLIB_LDFLAGS) $(COMMON_LDFLAGS) $(COMMON_CFLAGS)
-Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) -o
$(TOPDIR)/bin/$(TARGET)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$^ $(LINK_LIBS)
++ pushd $(TOPDIR)/bin/$(TARGET); ln -s
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR)
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR); \
++ ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR)
$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT); popd
@echo $@ made successfully ...
-diff -urNad ogdi-dfsg~/contrib/gdal/makefile ogdi-dfsg/contrib/gdal/makefile
---- ogdi-dfsg~/contrib/gdal/makefile 2007-03-27 15:09:59.000000000 +0200
-+++ ogdi-dfsg/contrib/gdal/makefile 2007-03-27 15:10:12.000000000 +0200
-@@ -1,6 +1,6 @@
- TOBEGEN = gdal
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = \
- gdal_serv.c \
+ $(DYNAGEN): $(OBJECTS)
diff -urNad ogdi-dfsg~/contrib/makefile ogdi-dfsg/contrib/makefile
---- ogdi-dfsg~/contrib/makefile 2001-02-18 20:36:48.000000000 +0100
-+++ ogdi-dfsg/contrib/makefile 2007-03-27 15:10:45.000000000 +0200
+--- ogdi-dfsg~/contrib/makefile 2007-03-27 17:51:59.000000000 +0200
++++ ogdi-dfsg/contrib/makefile 2007-03-27 17:52:19.000000000 +0200
@@ -16,7 +16,7 @@
#
# Sub-directories that need to be built
@@ -45,21 +38,9 @@
#
# Default target to build everything in all sub-directories
-diff -urNad ogdi-dfsg~/ogdi/attr_driver/odbc/makefile
ogdi-dfsg/ogdi/attr_driver/odbc/makefile
---- ogdi-dfsg~/ogdi/attr_driver/odbc/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/attr_driver/odbc/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = lodbc
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = odbc.c
-
diff -urNad ogdi-dfsg~/ogdi/c-api/makefile ogdi-dfsg/ogdi/c-api/makefile
---- ogdi-dfsg~/ogdi/c-api/makefile 2007-03-27 15:09:59.000000000 +0200
-+++ ogdi-dfsg/ogdi/c-api/makefile 2007-03-27 15:10:12.000000000 +0200
+--- ogdi-dfsg~/ogdi/c-api/makefile 2007-03-27 17:51:59.000000000 +0200
++++ ogdi-dfsg/ogdi/c-api/makefile 2007-03-27 17:52:19.000000000 +0200
@@ -13,11 +13,7 @@
TOBEGEN = ogdi
@@ -72,135 +53,15 @@
SOURCES = ecs_dyna.c ecsregex.c ecssplit.c \
ecsassoc.c ecshash.c ecstile.c server.c ecsdist.c \
-diff -urNad ogdi-dfsg~/ogdi/datum_driver/canada/makefile
ogdi-dfsg/ogdi/datum_driver/canada/makefile
---- ogdi-dfsg~/ogdi/datum_driver/canada/makefile 2007-03-27
15:09:59.000000000 +0200
-+++ ogdi-dfsg/ogdi/datum_driver/canada/makefile 2007-03-27
15:10:12.000000000 +0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = dtcanada
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = nadconv.c dtcanada.c
-
-diff -urNad ogdi-dfsg~/ogdi/datum_driver/usa/makefile
ogdi-dfsg/ogdi/datum_driver/usa/makefile
---- ogdi-dfsg~/ogdi/datum_driver/usa/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/datum_driver/usa/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = dtusa
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = dtusa.c
-
-diff -urNad ogdi-dfsg~/ogdi/driver/adrg/makefile
ogdi-dfsg/ogdi/driver/adrg/makefile
---- ogdi-dfsg~/ogdi/driver/adrg/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/driver/adrg/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = adrg
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = adrg.c utils.c object.c
-
-diff -urNad ogdi-dfsg~/ogdi/driver/dted/makefile
ogdi-dfsg/ogdi/driver/dted/makefile
---- ogdi-dfsg~/ogdi/driver/dted/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/driver/dted/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = dted
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = dted.c utils.c object.c
-
-diff -urNad ogdi-dfsg~/ogdi/driver/network/makefile
ogdi-dfsg/ogdi/driver/network/makefile
---- ogdi-dfsg~/ogdi/driver/network/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/driver/network/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = remote
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = remote.c ecs_clnt.c
-
-diff -urNad ogdi-dfsg~/ogdi/driver/rpf/makefile
ogdi-dfsg/ogdi/driver/rpf/makefile
---- ogdi-dfsg~/ogdi/driver/rpf/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/driver/rpf/makefile 2007-03-27 15:10:12.000000000 +0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = rpf
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = rpf.c utils.c object.c
-
-diff -urNad ogdi-dfsg~/ogdi/driver/skeleton/makefile
ogdi-dfsg/ogdi/driver/skeleton/makefile
---- ogdi-dfsg~/ogdi/driver/skeleton/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/driver/skeleton/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = skeleton
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = skeleton.c open.c object.c utils.c
-
-diff -urNad ogdi-dfsg~/ogdi/driver/vrf/makefile
ogdi-dfsg/ogdi/driver/vrf/makefile
---- ogdi-dfsg~/ogdi/driver/vrf/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/driver/vrf/makefile 2007-03-27 15:10:12.000000000 +0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = vrf
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c
-
-diff -urNad ogdi-dfsg~/ogdi/glutil/makefile ogdi-dfsg/ogdi/glutil/makefile
---- ogdi-dfsg~/ogdi/glutil/makefile 2001-02-19 05:12:21.000000000 +0100
-+++ ogdi-dfsg/ogdi/glutil/makefile 2007-03-27 15:12:15.000000000 +0200
-@@ -14,7 +14,7 @@
- #
-
- TOBEGEN = glutil
--TARGETGEN=$(ARCHGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = getglenv.c iofile.c dirent.c
-
-diff -urNad ogdi-dfsg~/ogdi/tcl_interface/makefile
ogdi-dfsg/ogdi/tcl_interface/makefile
---- ogdi-dfsg~/ogdi/tcl_interface/makefile 2007-03-27 15:09:59.000000000
+0200
-+++ ogdi-dfsg/ogdi/tcl_interface/makefile 2007-03-27 15:10:12.000000000
+0200
-@@ -12,7 +12,7 @@
- #
-
- TOBEGEN = ecs_tcl
--TARGETGEN=$(DYNAGEN)
-+TARGETGEN=$(SHRDGEN)
-
- SOURCES = ecs_tcl.c
-
diff -urNad ogdi-dfsg~/vpflib/makefile ogdi-dfsg/vpflib/makefile
---- ogdi-dfsg~/vpflib/makefile 2007-03-27 15:09:59.000000000 +0200
-+++ ogdi-dfsg/vpflib/makefile 2007-03-27 15:10:12.000000000 +0200
+--- ogdi-dfsg~/vpflib/makefile 2007-03-27 17:51:59.000000000 +0200
++++ ogdi-dfsg/vpflib/makefile 2007-03-27 17:52:19.000000000 +0200
@@ -7,7 +7,7 @@
#
TOBEGEN = vpf
-TARGETGEN=$(ARCHGEN)
-+TARGETGEN=$(SHRDGEN)
++TARGETGEN=$(DYNAGEN)
SOURCES = vpfselec.c \
vpftidx.c \
Modified: packages/ogdi-dfsg/trunk/debian/rules
===================================================================
--- packages/ogdi-dfsg/trunk/debian/rules 2007-03-27 13:16:49 UTC (rev
657)
+++ packages/ogdi-dfsg/trunk/debian/rules 2007-03-27 16:02:58 UTC (rev
658)
@@ -81,6 +81,7 @@
install -o root -g root $(CURDIR)/ogdi-config
$(CURDIR)/debian/tmp/usr/bin/ogdi-config
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pkgconfig
install -o root -g root $(CURDIR)/ogdi.pc
$(CURDIR)/debian/tmp/usr/share/pkgconfig
+ rm -f $(CURDIR)/debian/tmp/usr/lib/ogdi/libskeleton.so
# Build architecture-independent files here.
binary-indep:
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
