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

[dapal at alioth.debian.org]

Author: dapal
Date: 2010-02-27 13:46:31 +0000 (Sat, 27 Feb 2010)
New Revision: 2743

Modified:
   packages/ogdi-dfsg/trunk/debian/changelog
   packages/ogdi-dfsg/trunk/debian/patches/hurd.dpatch
Log:
debian/patches/hurd.dpatch updated, set the target to "Linux" also on Hurd systems (Closes: #568740)

Modified: packages/ogdi-dfsg/trunk/debian/changelog
===================================================================
--- packages/ogdi-dfsg/trunk/debian/changelog	2010-02-26 01:27:17 UTC (rev 2742)
+++ packages/ogdi-dfsg/trunk/debian/changelog	2010-02-27 13:46:31 UTC (rev 2743)
@@ -1,3 +1,10 @@
+ogdi-dfsg (3.2.0~beta2-6) UNRELEASED; urgency=low
+
+  * debian/patches/hurd.dpatch updated, set the target to "Linux"
+    also on Hurd systems (Closes: #568740)
+
+ -- David Paleino <dapal at debian.org>  Sat, 27 Feb 2010 14:43:43 +0100
+
 ogdi-dfsg (3.2.0~beta2-5) unstable; urgency=low
 
   * [PATCH] Added hurd.dpatch to support GNU/Hurd. Thanks Barry deFreese. 

Modified: packages/ogdi-dfsg/trunk/debian/patches/hurd.dpatch
===================================================================
--- packages/ogdi-dfsg/trunk/debian/patches/hurd.dpatch	2010-02-26 01:27:17 UTC (rev 2742)
+++ packages/ogdi-dfsg/trunk/debian/patches/hurd.dpatch	2010-02-27 13:46:31 UTC (rev 2743)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad trunk~/config/GNU.mak trunk/config/GNU.mak
---- trunk~/config/GNU.mak	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/config/GNU.mak	2009-09-16 12:09:00.000000000 +0200
+diff -urNad ogdi-dfsg~/config/GNU.mak ogdi-dfsg/config/GNU.mak
+--- ogdi-dfsg~/config/GNU.mak
++++ ogdi-dfsg/config/GNU.mak
 @@ -0,0 +1,109 @@
 +# Copyright (C) 2001 Her Majesty the Queen in Right of Canada.
 +# Permission to use, copy, modify and distribute this software and
@@ -118,3 +118,38 @@
 +endif
 +
 +
+diff -urNad ogdi-dfsg~/config/common.mak.in ogdi-dfsg/config/common.mak.in
+--- ogdi-dfsg~/config/common.mak.in
++++ ogdi-dfsg/config/common.mak.in
+@@ -55,6 +55,9 @@
+ ifeq ($(TARGET), GNU/kFreeBSD)
+ TARGET = Linux
+ endif
++ifeq ($(TARGET), GNU)
++TARGET = Linux
++endif
+ endif
+ 
+ #
+diff -urNad ogdi-dfsg~/configure ogdi-dfsg/configure
+--- ogdi-dfsg~/configure
++++ ogdi-dfsg/configure
+@@ -5879,4 +5879,7 @@
+ if test "$target" = "GNU/kFreeBSD" ; then
+   target=Linux
+ fi
++if test "$target" = "GNU" ; then
++  target=Linux
++fi
+ mv config/generic.mak config/$target.mak
+diff -urNad ogdi-dfsg~/configure.in ogdi-dfsg/configure.in
+--- ogdi-dfsg~/configure.in
++++ ogdi-dfsg/configure.in
+@@ -352,4 +352,7 @@
+ if test "$target" = "GNU/kFreeBSD" ; then
+   target=Linux
+ fi
++if test "$target" = "GNU" ; then
++  target=Linux
++fi
+ mv config/generic.mak config/$target.mak