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

[Francesco Lovergine]

Author: frankie
Date: 2007-03-27 21:22:21 +0000 (Tue, 27 Mar 2007)
New Revision: 661

Modified:
   packages/ogdi-dfsg/trunk/debian/control
   packages/ogdi-dfsg/trunk/debian/libogdi3.2.install
   packages/ogdi-dfsg/trunk/debian/patches/makefile.dpatch
   packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
Log:
Added TCL interface


Modified: packages/ogdi-dfsg/trunk/debian/control
===================================================================
--- packages/ogdi-dfsg/trunk/debian/control	2007-03-27 18:53:48 UTC (rev 660)
+++ packages/ogdi-dfsg/trunk/debian/control	2007-03-27 21:22:21 UTC (rev 661)
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, zlib1g-dev, libexpat1-dev, proj, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, zlib1g-dev, libexpat1-dev, proj, dpatch, tcl8.4-dev
 Standards-Version: 3.7.2
 Section: libs
 

Modified: packages/ogdi-dfsg/trunk/debian/libogdi3.2.install
===================================================================
--- packages/ogdi-dfsg/trunk/debian/libogdi3.2.install	2007-03-27 18:53:48 UTC (rev 660)
+++ packages/ogdi-dfsg/trunk/debian/libogdi3.2.install	2007-03-27 21:22:21 UTC (rev 661)
@@ -1,2 +1,3 @@
+usr/lib/libogdi.so
 usr/lib/libogdi.so*
-usr/lib/*.so	usr/lib/ogdi
+usr/lib/ogdi/*.so	usr/lib/ogdi

Modified: packages/ogdi-dfsg/trunk/debian/patches/makefile.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/makefile.dpatch	2007-03-27 18:53:48 UTC (rev 660)
+++ packages/ogdi-dfsg/trunk/debian/patches/makefile.dpatch	2007-03-27 21:22:21 UTC (rev 661)
@@ -7,9 +7,21 @@
 ## DP:
 
 @DPATCH@
-diff -urNad ogdi-dfsg-3.2.0~beta1~/makefile ogdi-dfsg-3.2.0~beta1/makefile
---- ogdi-dfsg-3.2.0~beta1~/makefile	2001-04-16 21:50:20.000000000 +0200
-+++ ogdi-dfsg-3.2.0~beta1/makefile	2007-03-26 10:47:03.000000000 +0200
+diff -urNad ogdi-dfsg~/config/generic.mak.in ogdi-dfsg/config/generic.mak.in
+--- ogdi-dfsg~/config/generic.mak.in	2007-03-27 17:35:33.000000000 +0200
++++ ogdi-dfsg/config/generic.mak.in	2007-03-27 23:17:20.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ UCB_STATICLIB = 
+ 
+-TCL_INCLUDE = -I/usr/include/tcl8.3
++TCL_INCLUDE = -I/usr/include/tcl8.4
+ TCL_LINKLIB =
+ 
+ #
+diff -urNad ogdi-dfsg~/makefile ogdi-dfsg/makefile
+--- ogdi-dfsg~/makefile	2007-03-27 18:08:43.000000000 +0200
++++ ogdi-dfsg/makefile	2007-03-27 23:16:05.000000000 +0200
 @@ -17,7 +17,7 @@
  #
  # Sub-directories that need to be built
@@ -19,3 +31,15 @@
  
  ifneq ($(PROJ_SETTING),external)
  subdirs := proj $(subdirs) 
+diff -urNad ogdi-dfsg~/ogdi/makefile ogdi-dfsg/ogdi/makefile
+--- ogdi-dfsg~/ogdi/makefile	2007-03-27 17:35:19.000000000 +0200
++++ ogdi-dfsg/ogdi/makefile	2007-03-27 23:16:26.000000000 +0200
+@@ -15,7 +15,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs	= include c-api glutil attr_driver datum_driver driver gltpd examples
++subdirs	= include c-api glutil attr_driver datum_driver driver gltpd tcl_interface
+ 
+ #
+ # Default target to build everything in all sub-directories

Modified: packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch	2007-03-27 18:53:48 UTC (rev 660)
+++ packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch	2007-03-27 21:22:21 UTC (rev 661)
@@ -12,8 +12,8 @@
 
 @DPATCH@
 diff -urNad ogdi-dfsg~/config/unix.mak ogdi-dfsg/config/unix.mak
---- 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
+--- 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
 @@ -93,9 +93,9 @@
  
  $(SHRDGEN): $(OBJECTS)
@@ -28,8 +28,8 @@
  
  $(DYNAGEN): $(OBJECTS)
 diff -urNad ogdi-dfsg~/contrib/makefile ogdi-dfsg/contrib/makefile
---- ogdi-dfsg~/contrib/makefile	2007-03-27 17:51:59.000000000 +0200
-+++ ogdi-dfsg/contrib/makefile	2007-03-27 17:52:19.000000000 +0200
+--- ogdi-dfsg~/contrib/makefile	2007-03-27 18:08:43.000000000 +0200
++++ ogdi-dfsg/contrib/makefile	2007-03-27 23:15:41.000000000 +0200
 @@ -16,7 +16,7 @@
  #
  # Sub-directories that need to be built
@@ -40,8 +40,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 17:51:59.000000000 +0200
-+++ ogdi-dfsg/ogdi/c-api/makefile	2007-03-27 17:52:19.000000000 +0200
+--- 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
 @@ -13,11 +13,7 @@
  
  TOBEGEN	= ogdi
@@ -55,8 +55,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 17:51:59.000000000 +0200
-+++ ogdi-dfsg/vpflib/makefile	2007-03-27 17:52:19.000000000 +0200
+--- ogdi-dfsg~/vpflib/makefile	2007-03-27 18:08:43.000000000 +0200
++++ ogdi-dfsg/vpflib/makefile	2007-03-27 23:15:41.000000000 +0200
 @@ -7,7 +7,7 @@
  #