[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/7.4.120.14002+dfsg-29-g366f9aa

[Iain Lane]

The following commit has been merged in the master branch:
commit 03add56f07b5e11a1184a1989ed86e940d52d005
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Jan 26 11:29:25 2010 +0000

    Use relative paths in buildsys
    
    debian/patches/04-update-relative-paths: Update buildsys to use correct
    relative paths so that lib can be built

diff --git a/debian/changelog b/debian/changelog
index 279c95c..06176b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,8 +69,10 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
   * debian/patches/*: Refresh to apply cleanly
   * debian/rules: Can no longer extract information from CHM documentation as
     it has been dfsged out.
+  * debian/patches/04-update-relative-paths: Update buildsys to use correct
+    relative paths so that lib can be built 
 
- -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 11:09:48 +0000
+ -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 11:28:20 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/patches/02-link_system_libs.patch b/debian/patches/02-link_system_libs.patch
index dbb60a8..d79b80c 100644
--- a/debian/patches/02-link_system_libs.patch
+++ b/debian/patches/02-link_system_libs.patch
@@ -10,8 +10,8 @@ Forwarded: not-needed
 
 Index: db4o.git/src/Makefile
 ===================================================================
---- db4o.git.orig/src/Makefile	2010-01-19 21:49:37.024724730 +0000
-+++ db4o.git/src/Makefile	2010-01-19 21:50:27.713475925 +0000
+--- db4o.git.orig/src/Makefile	2010-01-26 11:23:21.396817091 +0000
++++ db4o.git/src/Makefile	2010-01-26 11:23:21.456817956 +0000
 @@ -20,7 +20,7 @@
  
  prebuild:
@@ -39,8 +39,8 @@ Index: db4o.git/src/Db4objects.Db4o.Instrumentation/Makefile
 +REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis
 Index: db4o.git/src/Db4objects.Db4o.Linq/Makefile
 ===================================================================
---- db4o.git.orig/src/Db4objects.Db4o.Linq/Makefile	2010-01-19 21:48:38.443475901 +0000
-+++ db4o.git/src/Db4objects.Db4o.Linq/Makefile	2010-01-19 22:18:23.614726439 +0000
+--- db4o.git.orig/src/Db4objects.Db4o.Linq/Makefile	2010-01-19 22:19:36.403474623 +0000
++++ db4o.git/src/Db4objects.Db4o.Linq/Makefile	2010-01-26 11:26:28.665568362 +0000
 @@ -5,4 +5,4 @@
  
  TARGET = library
@@ -70,8 +70,8 @@ Index: db4o.git/src/Db4objects.Db4o.Linq.Tests/Makefile
  OPT_MCS_FLAGS = -main:Db4objects.Db4o.Linq.Tests.AllTests
 Index: db4o.git/src/Db4objects.Db4o.Tests/Makefile
 ===================================================================
---- db4o.git.orig/src/Db4objects.Db4o.Tests/Makefile	2010-01-19 21:53:19.763474966 +0000
-+++ db4o.git/src/Db4objects.Db4o.Tests/Makefile	2010-01-19 22:19:31.394726042 +0000
+--- db4o.git.orig/src/Db4objects.Db4o.Tests/Makefile	2010-01-26 11:23:21.416817458 +0000
++++ db4o.git/src/Db4objects.Db4o.Tests/Makefile	2010-01-26 11:23:21.476817150 +0000
 @@ -3,5 +3,5 @@
  
  TARGET = exe
@@ -81,8 +81,8 @@ Index: db4o.git/src/Db4objects.Db4o.Tests/Makefile
  OPT_MCS_FLAGS = -main:Db4objects.Db4o.Tests.AllTests
 Index: db4o.git/src/Db4oTool/Db4oTool/Makefile
 ===================================================================
---- db4o.git.orig/src/Db4oTool/Db4oTool/Makefile	2010-01-19 21:51:49.143474685 +0000
-+++ db4o.git/src/Db4oTool/Db4oTool/Makefile	2010-01-19 22:17:04.703474355 +0000
+--- db4o.git.orig/src/Db4oTool/Db4oTool/Makefile	2010-01-26 11:23:21.426816929 +0000
++++ db4o.git/src/Db4oTool/Db4oTool/Makefile	2010-01-26 11:26:28.595568109 +0000
 @@ -5,4 +5,4 @@
  
  TARGET = exe
@@ -91,8 +91,8 @@ Index: db4o.git/src/Db4oTool/Db4oTool/Makefile
 +REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis -r:Mono.GetOptions
 Index: db4o.git/src/Db4oTool/Db4oTool.Tests/Makefile
 ===================================================================
---- db4o.git.orig/src/Db4oTool/Db4oTool.Tests/Makefile	2010-01-19 21:52:33.503475518 +0000
-+++ db4o.git/src/Db4oTool/Db4oTool.Tests/Makefile	2010-01-19 22:17:39.094724746 +0000
+--- db4o.git.orig/src/Db4oTool/Db4oTool.Tests/Makefile	2010-01-26 11:23:21.426816929 +0000
++++ db4o.git/src/Db4oTool/Db4oTool.Tests/Makefile	2010-01-26 11:23:21.476817150 +0000
 @@ -9,4 +9,4 @@
  
  TARGET = exe
diff --git a/debian/patches/04-update-relative-paths b/debian/patches/04-update-relative-paths
new file mode 100644
index 0000000..e532e0c
--- /dev/null
+++ b/debian/patches/04-update-relative-paths
@@ -0,0 +1,28 @@
+Index: db4o.git/src/Db4objects.Db4o.Linq/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.Linq/Makefile	2010-01-26 11:25:40.645567253 +0000
++++ db4o.git/src/Db4objects.Db4o.Linq/Makefile	2010-01-26 11:25:48.996235318 +0000
+@@ -1,7 +1,7 @@
+ 
+-include ../../db4o.net/include.mk
++include ../include.mk
+ 
+-OUTDIR = ../../db4o.net/bin
++OUTDIR = ../bin
+ 
+ TARGET = library
+ ASSEMBLY = Db4objects.Db4o.Linq.dll
+Index: db4o.git/src/Db4objects.Db4o.NativeQueries/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.NativeQueries/Makefile	2010-01-26 11:25:18.115568433 +0000
++++ db4o.git/src/Db4objects.Db4o.NativeQueries/Makefile	2010-01-26 11:25:28.685568121 +0000
+@@ -1,7 +1,7 @@
+ 
+-include ../../db4o.net/include.mk
++include ../include.mk
+ 
+-OUTDIR = ../../db4o.net/bin
++OUTDIR = ../bin
+ 
+ TARGET = library
+ ASSEMBLY = $(NQ)
diff --git a/debian/patches/series b/debian/patches/series
index 289961d..3a8a7d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01-dos2unix.patch
 02-link_system_libs.patch
 03-generate_xml_doc.patch
+04-update-relative-paths

-- 
db4o