Author: frankie Date: 2009-03-12 20:18:30 +0000 (Thu, 12 Mar 2009) New Revision: 2006
Removed: packages/ogdi-dfsg/trunk/debian/patches/bashisms.dpatch packages/ogdi-dfsg/trunk/debian/patches/kfreebsd.dpatch Modified: packages/ogdi-dfsg/trunk/debian/changelog packages/ogdi-dfsg/trunk/debian/patches/00list packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch packages/ogdi-dfsg/trunk/debian/rules Log: New upstream release Modified: packages/ogdi-dfsg/trunk/debian/changelog =================================================================== --- packages/ogdi-dfsg/trunk/debian/changelog 2009-03-12 20:16:29 UTC (rev 2005) +++ packages/ogdi-dfsg/trunk/debian/changelog 2009-03-12 20:18:30 UTC (rev 2006) @@ -1,3 +1,9 @@ +ogdi-dfsg (3.2.0~beta2-1) unstable; urgency=low + + * New upstream release. + + -- Francesco Paolo Lovergine <[email protected]> Thu, 12 Mar 2009 20:56:26 +0100 + ogdi-dfsg (3.2.0~beta1-4) unstable; urgency=low * Added Homepage field in debian/control. Modified: packages/ogdi-dfsg/trunk/debian/patches/00list =================================================================== --- packages/ogdi-dfsg/trunk/debian/patches/00list 2009-03-12 20:16:29 UTC (rev 2005) +++ packages/ogdi-dfsg/trunk/debian/patches/00list 2009-03-12 20:18:30 UTC (rev 2006) @@ -1,5 +1,3 @@ makefile shared endianess -bashisms -kfreebsd Deleted: packages/ogdi-dfsg/trunk/debian/patches/bashisms.dpatch =================================================================== --- packages/ogdi-dfsg/trunk/debian/patches/bashisms.dpatch 2009-03-12 20:16:29 UTC (rev 2005) +++ packages/ogdi-dfsg/trunk/debian/patches/bashisms.dpatch 2009-03-12 20:18:30 UTC (rev 2006) @@ -1,89 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## bashisms.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove bashisms in build system. - -...@dpatch@ -diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak ogdi-dfsg-3.2.0~beta1/config/common.mak ---- ogdi-dfsg-3.2.0~beta1~/config/common.mak 2007-03-26 09:49:06.000000000 -0400 -+++ ogdi-dfsg-3.2.0~beta1/config/common.mak 2008-03-07 17:40:49.000000000 -0500 -@@ -229,12 +229,11 @@ - ifeq ($(TARGETGEN),$(SHRDGEN)) - default-install: - cp $(TARGETGEN) $(INST_LIB) -- pushd $(INST_LIB); \ -+ (cd $(INST_LIB); \ - ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ - $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT).$(OGDI_MAJOR); \ - ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ -- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT); \ -- popd -+ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT)) - endif - - ifeq ($(TARGETGEN),$(ARCHGEN)) -@@ -253,9 +252,8 @@ - install-so-link: - mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(INST_LIB) - mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(INST_LIB) -- pushd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ -- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT) ; \ -- popd -+ (cd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ -+ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT)) - - install: default-install $(EXTRA_INSTALL_TARGETS) - -@@ -271,7 +269,3 @@ - # - # End of the common configuration - # -- -- -- -- -diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak.in ogdi-dfsg-3.2.0~beta1/config/common.mak.in ---- ogdi-dfsg-3.2.0~beta1~/config/common.mak.in 2007-02-24 12:37:34.000000000 -0500 -+++ ogdi-dfsg-3.2.0~beta1/config/common.mak.in 2008-03-07 17:44:59.000000000 -0500 -@@ -229,12 +229,11 @@ - ifeq ($(TARGETGEN),$(SHRDGEN)) - default-install: - cp $(TARGETGEN) $(INST_LIB) -- pushd $(INST_LIB); \ -+ (cd $(INST_LIB); \ - ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ - $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT).$(OGDI_MAJOR); \ - ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ -- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT); \ -- popd -+ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT)) - endif - - ifeq ($(TARGETGEN),$(ARCHGEN)) -@@ -253,9 +252,8 @@ - install-so-link: - mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) $(INST_LIB) - mv -f $(INST_LIB)/$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) $(INST_LIB) -- pushd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ -- $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT) ; \ -- popd -+ (cd $(INST_LIB); ln -s $(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR).$(OGDI_MINOR) \ -+ $(LIB_PREFIX)$(TOBEGEN_STRIPPED).$(SHLIB_EXT)) - - install: default-install $(EXTRA_INSTALL_TARGETS) - -diff -urNad ogdi-dfsg-3.2.0~beta1~/config/unix.mak ogdi-dfsg-3.2.0~beta1/config/unix.mak ---- ogdi-dfsg-3.2.0~beta1~/config/unix.mak 2008-03-07 17:40:49.000000000 -0500 -+++ ogdi-dfsg-3.2.0~beta1/config/unix.mak 2008-03-07 17:46:06.000000000 -0500 -@@ -94,8 +94,8 @@ - $(SHRDGEN): $(OBJECTS) - @echo Making shared library: $@ - $(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 -+ (cd $(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)) - @echo $@ made successfully ... - - $(DYNAGEN): $(OBJECTS) Deleted: packages/ogdi-dfsg/trunk/debian/patches/kfreebsd.dpatch =================================================================== --- packages/ogdi-dfsg/trunk/debian/patches/kfreebsd.dpatch 2009-03-12 20:16:29 UTC (rev 2005) +++ packages/ogdi-dfsg/trunk/debian/patches/kfreebsd.dpatch 2009-03-12 20:18:30 UTC (rev 2006) @@ -1,61 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kfreebsd.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Build on GNU/kFreeBSD. - -...@dpatch@ -diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak ogdi-dfsg-3.2.0~beta1/config/common.mak ---- ogdi-dfsg-3.2.0~beta1~/config/common.mak 2008-03-07 18:17:06.000000000 -0500 -+++ ogdi-dfsg-3.2.0~beta1/config/common.mak 2008-03-07 18:20:36.000000000 -0500 -@@ -52,6 +52,9 @@ - - ifndef TARGET - TARGET = $(shell uname) -+ifeq ($(TARGET), GNU/kFreeBSD) -+TARGET = Linux -+endif - endif - - # -diff -urNad ogdi-dfsg-3.2.0~beta1~/config/common.mak.in ogdi-dfsg-3.2.0~beta1/config/common.mak.in ---- ogdi-dfsg-3.2.0~beta1~/config/common.mak.in 2008-03-07 18:17:06.000000000 -0500 -+++ ogdi-dfsg-3.2.0~beta1/config/common.mak.in 2008-03-07 18:20:00.000000000 -0500 -@@ -52,6 +52,9 @@ - - ifndef TARGET - TARGET = $(shell uname) -+ifeq ($(TARGET), GNU/kFreeBSD) -+TARGET = Linux -+endif - endif - - # -diff -urNad ogdi-dfsg-3.2.0~beta1~/configure ogdi-dfsg-3.2.0~beta1/configure ---- ogdi-dfsg-3.2.0~beta1~/configure 2007-02-24 12:37:33.000000000 -0500 -+++ ogdi-dfsg-3.2.0~beta1/configure 2008-03-07 18:18:54.000000000 -0500 -@@ -5278,5 +5278,8 @@ - $ac_cs_success || { (exit 1); exit 1; } - fi - --mv config/generic.mak config/`uname`.mak -- -+target=`uname` -+if test "$target" = "GNU/kFreeBSD" ; then -+ target=Linux -+fi -+mv config/generic.mak config/$target.mak -diff -urNad ogdi-dfsg-3.2.0~beta1~/configure.in ogdi-dfsg-3.2.0~beta1/configure.in ---- ogdi-dfsg-3.2.0~beta1~/configure.in 2007-02-24 12:37:33.000000000 -0500 -+++ ogdi-dfsg-3.2.0~beta1/configure.in 2008-03-07 18:18:11.000000000 -0500 -@@ -349,5 +349,9 @@ - [chmod +x ogdi-config]) - - AC_OUTPUT(config/generic.mak) --mv config/generic.mak config/`uname`.mak - -+target=`uname` -+if test "$target" = "GNU/kFreeBSD" ; then -+ target=Linux -+fi -+mv config/generic.mak config/$target.mak Modified: packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch =================================================================== --- packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch 2009-03-12 20:16:29 UTC (rev 2005) +++ packages/ogdi-dfsg/trunk/debian/patches/shared.dpatch 2009-03-12 20:18:30 UTC (rev 2006) @@ -11,9 +11,9 @@ ## DP: @DPATCH@ -diff -urNad ogdi-dfsg~/config/unix.mak ogdi-dfsg/config/unix.mak ---- 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 +diff -urNad ogdi-dfsg-3.2.0~beta2~/config/unix.mak ogdi-dfsg-3.2.0~beta2/config/unix.mak +--- ogdi-dfsg-3.2.0~beta2~/config/unix.mak 2009-03-12 20:56:55.000000000 +0100 ++++ ogdi-dfsg-3.2.0~beta2/config/unix.mak 2009-03-12 21:06:29.000000000 +0100 @@ -22,9 +22,9 @@ # # Standard tools @@ -32,17 +32,17 @@ $(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) -- 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 +- cd $(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); cd $(CURDIR) + $(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 ++ cd $(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); cd $(CURDIR) @echo $@ made successfully ... $(DYNAGEN): $(OBJECTS) -diff -urNad ogdi-dfsg~/contrib/makefile ogdi-dfsg/contrib/makefile ---- ogdi-dfsg~/contrib/makefile 2007-04-30 15:00:24.000000000 +0200 -+++ ogdi-dfsg/contrib/makefile 2007-04-30 15:01:02.000000000 +0200 +diff -urNad ogdi-dfsg-3.2.0~beta2~/contrib/makefile ogdi-dfsg-3.2.0~beta2/contrib/makefile +--- ogdi-dfsg-3.2.0~beta2~/contrib/makefile 2009-03-12 20:56:55.000000000 +0100 ++++ ogdi-dfsg-3.2.0~beta2/contrib/makefile 2009-03-12 21:00:58.000000000 +0100 @@ -16,7 +16,7 @@ # # Sub-directories that need to be built @@ -52,9 +52,9 @@ # # 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-04-30 15:00:24.000000000 +0200 -+++ ogdi-dfsg/ogdi/c-api/makefile 2007-04-30 15:01:02.000000000 +0200 +diff -urNad ogdi-dfsg-3.2.0~beta2~/ogdi/c-api/makefile ogdi-dfsg-3.2.0~beta2/ogdi/c-api/makefile +--- ogdi-dfsg-3.2.0~beta2~/ogdi/c-api/makefile 2009-03-12 20:56:55.000000000 +0100 ++++ ogdi-dfsg-3.2.0~beta2/ogdi/c-api/makefile 2009-03-12 21:00:58.000000000 +0100 @@ -13,11 +13,7 @@ TOBEGEN = ogdi @@ -67,9 +67,9 @@ 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-04-30 15:00:24.000000000 +0200 -+++ ogdi-dfsg/vpflib/makefile 2007-04-30 15:01:02.000000000 +0200 +diff -urNad ogdi-dfsg-3.2.0~beta2~/vpflib/makefile ogdi-dfsg-3.2.0~beta2/vpflib/makefile +--- ogdi-dfsg-3.2.0~beta2~/vpflib/makefile 2009-03-12 20:56:55.000000000 +0100 ++++ ogdi-dfsg-3.2.0~beta2/vpflib/makefile 2009-03-12 21:00:58.000000000 +0100 @@ -7,7 +7,7 @@ # Modified: packages/ogdi-dfsg/trunk/debian/rules =================================================================== --- packages/ogdi-dfsg/trunk/debian/rules 2009-03-12 20:16:29 UTC (rev 2005) +++ packages/ogdi-dfsg/trunk/debian/rules 2009-03-12 20:18:30 UTC (rev 2006) @@ -60,7 +60,7 @@ dh_testroot # Add here commands to clean up after the build process. - TOPDIR=$(CURDIR) $(MAKE) clean + [ ! -f config/common.mak ] || TOPDIR=$(CURDIR) $(MAKE) clean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
