[DebianGIS-dev] r736 - in packages/ogdi-dfsg/trunk/debian: . patches

[Francesco Lovergine]

Author: frankie
Date: 2007-04-08 22:38:34 +0000 (Sun, 08 Apr 2007)
New Revision: 736

Modified:
   packages/ogdi-dfsg/trunk/debian/changelog
   packages/ogdi-dfsg/trunk/debian/libogdi3.2.install
   packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
   packages/ogdi-dfsg/trunk/debian/rules
Log:
Fixing plugin recursive linking


Modified: packages/ogdi-dfsg/trunk/debian/changelog
===================================================================
--- packages/ogdi-dfsg/trunk/debian/changelog	2007-04-08 09:32:34 UTC (rev 735)
+++ packages/ogdi-dfsg/trunk/debian/changelog	2007-04-08 22:38:34 UTC (rev 736)
@@ -1,3 +1,11 @@
+ogdi-dfsg (3.2.0~beta1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Changed shared.dpatch to add soname to libvpf.so
+  * Now libvpf is installed under /usr/lib to allow recursive linking for plugin solibs
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon,  9 Apr 2007 00:33:31 +0200
+
 ogdi-dfsg (3.2.0~beta1-1) unstable; urgency=low
 
   * Initial release (closes: #413842).

Modified: packages/ogdi-dfsg/trunk/debian/libogdi3.2.install
===================================================================
--- packages/ogdi-dfsg/trunk/debian/libogdi3.2.install	2007-04-08 09:32:34 UTC (rev 735)
+++ packages/ogdi-dfsg/trunk/debian/libogdi3.2.install	2007-04-08 22:38:34 UTC (rev 736)
@@ -1,3 +1,5 @@
 usr/lib/libogdi.so
 usr/lib/libogdi.so*
+usr/lib/libvpf.so
+usr/lib/libvpf.so*
 usr/lib/ogdi/*.so	usr/lib/ogdi

Modified: packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch	2007-04-08 09:32:34 UTC (rev 735)
+++ packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch	2007-04-08 22:38:34 UTC (rev 736)
@@ -13,7 +13,7 @@
 @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-03-27 23:15:41.000000000 +0200
++++ ogdi-dfsg/config/unix.mak	2007-04-09 00:32:37.000000000 +0200
 @@ -93,9 +93,9 @@
  
  $(SHRDGEN): $(OBJECTS)
@@ -29,7 +29,7 @@
  $(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-03-27 23:15:41.000000000 +0200
++++ ogdi-dfsg/contrib/makefile	2007-04-09 00:32:37.000000000 +0200
 @@ -16,7 +16,7 @@
  #
  # Sub-directories that need to be built
@@ -41,7 +41,7 @@
  # 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-03-27 23:15:41.000000000 +0200
++++ ogdi-dfsg/ogdi/c-api/makefile	2007-04-09 00:32:37.000000000 +0200
 @@ -13,11 +13,7 @@
  
  TOBEGEN	= ogdi
@@ -56,13 +56,13 @@
            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-03-27 23:15:41.000000000 +0200
++++ ogdi-dfsg/vpflib/makefile	2007-04-09 00:33:22.000000000 +0200
 @@ -7,7 +7,7 @@
  #
  
  TOBEGEN	= vpf
 -TARGETGEN=$(ARCHGEN)
-+TARGETGEN=$(DYNAGEN)
++TARGETGEN=$(SHRDGEN)
  
  SOURCES = vpfselec.c \
  	vpftidx.c \

Modified: packages/ogdi-dfsg/trunk/debian/rules
===================================================================
--- packages/ogdi-dfsg/trunk/debian/rules	2007-04-08 09:32:34 UTC (rev 735)
+++ packages/ogdi-dfsg/trunk/debian/rules	2007-04-08 22:38:34 UTC (rev 736)
@@ -23,8 +23,12 @@
 
 # shared library versions, option 1
 version=3.2.0
-major=3
+major=3.2
 
+#
+# Note that TOPDIR pre-definition is an ogdi specificity. 
+# It could be possibly removed in a future version.
+#
 config.status: patch-stamp
 	dh_testdir