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

Iain Lane laney at ubuntu.com
Tue Jan 26 15:40:23 UTC 2010 

The following commit has been merged in the master branch:
commit 8fdfdf8942617da0366dd550dafaf32096cdf2f9
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Dec 13 12:41:41 2009 +0000

    debian/patches/*: Refresh to apply cleanly

diff --git a/debian/changelog b/debian/changelog
index b5250ef..bfdc702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,8 +66,9 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     - doc/tutorial/Db4oTutorial.exe
     - doc/api/db4o.chm
   * debian/control: Update deps to point at -cil-dev packages 
+  * debian/patches/*: Refresh to apply cleanly
 
- -- Iain Lane <laney at ubuntu.com>  Sat, 12 Dec 2009 17:50:14 +0000
+ -- Iain Lane <laney at ubuntu.com>  Sun, 13 Dec 2009 12:41:17 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/patches/00-configurable_compiler.patch b/debian/patches/00-configurable_compiler.patch
index ab88003..9e05b43 100644
--- a/debian/patches/00-configurable_compiler.patch
+++ b/debian/patches/00-configurable_compiler.patch
@@ -5,13 +5,15 @@ Author: Iain Lane <laney at ubuntu.com>
  src/include.mk |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- db4o.git.orig/src/include.mk
-+++ db4o.git/src/include.mk
+Index: db4o.git/src/include.mk
+===================================================================
+--- db4o.git.orig/src/include.mk	2009-12-13 11:52:18.203435804 +0000
++++ db4o.git/src/include.mk	2009-12-13 12:12:18.052175802 +0000
 @@ -1,6 +1,6 @@
  
  MONO = mono
 -MCS = gmcs
 +MCS ?= gmcs
  KEY_FILE = ../db4objects.snk
- MCS_FLAGS = -keyfile:$(KEY_FILE) -define:NET_2_0,MONO,EMBEDDED
+ MCS_FLAGS = -debug+ -keyfile:$(KEY_FILE) -define:NET_2_0,MONO,EMBEDDED
  OUTDIR = ../bin
diff --git a/debian/patches/01-dos2unix.patch b/debian/patches/01-dos2unix.patch
index 5478970..cd39456 100644
--- a/debian/patches/01-dos2unix.patch
+++ b/debian/patches/01-dos2unix.patch
@@ -12,22 +12,10 @@ Forwarded: not-needed
  src/Makefile                       |    8 ++++----
  7 files changed, 19 insertions(+), 19 deletions(-)
 
---- db4o.git.orig/src/Db4oAdmin/Makefile
-+++ db4o.git/src/Db4oAdmin/Makefile
-@@ -1,7 +1,7 @@
--
--include ../include.mk
--
--WORKDIR = Db4oAdmin
-+
-+include ../include.mk
-+
-+WORKDIR = Db4oAdmin
- 
- TARGET = exe
- ASSEMBLY = $(ADMIN)
---- db4o.git.orig/src/Db4oUnit/Makefile
-+++ db4o.git/src/Db4oUnit/Makefile
+Index: db4o.git/src/Db4oUnit/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4oUnit/Makefile	2010-01-19 21:48:51.244724587 +0000
++++ db4o.git/src/Db4oUnit/Makefile	2010-01-19 21:49:37.014725735 +0000
 @@ -1,5 +1,5 @@
 -
 -include ../include.mk
@@ -36,8 +24,10 @@ Forwarded: not-needed
  
  TARGET = library
  ASSEMBLY = $(UNIT)
---- db4o.git.orig/src/Db4oUnit.Extensions/Makefile
-+++ db4o.git/src/Db4oUnit.Extensions/Makefile
+Index: db4o.git/src/Db4oUnit.Extensions/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4oUnit.Extensions/Makefile	2010-01-19 21:48:51.304724777 +0000
++++ db4o.git/src/Db4oUnit.Extensions/Makefile	2010-01-19 21:49:37.014725735 +0000
 @@ -1,5 +1,5 @@
 -
 -include ../include.mk
@@ -46,8 +36,10 @@ Forwarded: not-needed
  
  TARGET = library
  ASSEMBLY = $(UNIT_EXT)
---- db4o.git.orig/src/Db4objects.Db4o/Makefile
-+++ db4o.git/src/Db4objects.Db4o/Makefile
+Index: db4o.git/src/Db4objects.Db4o/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o/Makefile	2010-01-19 21:48:51.224724672 +0000
++++ db4o.git/src/Db4objects.Db4o/Makefile	2010-01-19 21:49:37.024724730 +0000
 @@ -1,5 +1,5 @@
 -
 -include ../include.mk
@@ -56,8 +48,35 @@ Forwarded: not-needed
  
  TARGET = library
  ASSEMBLY = $(CORE)
---- db4o.git.orig/src/Db4objects.Db4o.Tests/Makefile
-+++ db4o.git/src/Db4objects.Db4o.Tests/Makefile
+Index: db4o.git/src/Makefile
+===================================================================
+--- db4o.git.orig/src/Makefile	2010-01-19 21:48:51.144724687 +0000
++++ db4o.git/src/Makefile	2010-01-19 21:49:37.024724730 +0000
+@@ -10,16 +10,16 @@
+ TOOL_TESTS = Db4oTool/Db4oTool.Tests
+ LINQ = Db4objects.Db4o.Linq
+ LINQ_TESTS = Db4objects.Db4o.Linq.Tests
+-LINQ_INSTR_TESTS = Db4objects.Db4o.Linq.Instrumentation.Tests
+-
++LINQ_INSTR_TESTS = Db4objects.Db4o.Linq.Instrumentation.Tests
++
+ LIBS = Libs/net-2.0
+ 
+ OUTDIR = ./bin
+ 
+ all: prebuild build postbuild
+ 
+-prebuild:
+-	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
++prebuild:
++	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
+ 	cp $(LIBS)/*.dll $(OUTDIR)
+ 
+ build: core nq linq tool tests
+Index: db4o.git/src/Db4objects.Db4o.Linq.Instrumentation.Tests/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.Linq.Instrumentation.Tests/Makefile	2010-01-19 21:48:51.284724632 +0000
++++ db4o.git/src/Db4objects.Db4o.Linq.Instrumentation.Tests/Makefile	2010-01-19 21:49:37.024724730 +0000
 @@ -1,5 +1,5 @@
 -
 -include ../include.mk
@@ -65,39 +84,60 @@ Forwarded: not-needed
 +include ../include.mk
  
  TARGET = exe
- ASSEMBLY = $(TESTS)
---- db4o.git.orig/src/Db4objects.Db4o.Tools/Makefile
-+++ db4o.git/src/Db4objects.Db4o.Tools/Makefile
-@@ -1,6 +1,6 @@
+ ASSEMBLY = $(LINQ_INSTR_TESTS)
+Index: db4o.git/src/Db4objects.Db4o.Linq.Tests/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.Linq.Tests/Makefile	2010-01-19 21:50:00.834724482 +0000
++++ db4o.git/src/Db4objects.Db4o.Linq.Tests/Makefile	2010-01-19 21:49:44.333475031 +0000
+@@ -1,5 +1,5 @@
 -
 -include ../include.mk
--
 +
 +include ../include.mk
+ 
+ TARGET = exe
+ ASSEMBLY = $(LINQ_TESTS)
+Index: db4o.git/src/Db4objects.Db4o.Tests/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.Tests/Makefile	2010-01-19 21:49:56.244725872 +0000
++++ db4o.git/src/Db4objects.Db4o.Tests/Makefile	2010-01-19 21:49:44.323484473 +0000
+@@ -1,5 +1,5 @@
+-
+-include ../include.mk
 +
- TARGET = library
- ASSEMBLY = $(TOOLS)
- REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
---- db4o.git.orig/src/Makefile
-+++ db4o.git/src/Makefile
-@@ -5,16 +5,16 @@
- TOOLS = Db4objects.Db4o.Tools
- UNIT = Db4oUnit
- UNIT_EXT = Db4oUnit.Extensions
--ADMIN = Db4oAdmin
++include ../include.mk
+ 
+ TARGET = exe
+ ASSEMBLY = $(TESTS)
+Index: db4o.git/src/Db4oTool/Db4oTool/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4oTool/Db4oTool/Makefile	2010-01-19 21:49:56.074724678 +0000
++++ db4o.git/src/Db4oTool/Db4oTool/Makefile	2010-01-19 21:49:44.323484473 +0000
+@@ -1,7 +1,7 @@
 -
-+ADMIN = Db4oAdmin
 +
- LIBS = Libs/net-2.0
+ include ../../include.mk
  
- OUTDIR = ./bin
+-OUTDIR = ../../bin
++OUTDIR = ../../bin
  
- all: prebuild build postbuild
+ TARGET = exe
+ ASSEMBLY = $(TOOL)
+Index: db4o.git/src/Db4oTool/Db4oTool.Tests/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4oTool/Db4oTool.Tests/Makefile	2010-01-19 21:49:55.894725917 +0000
++++ db4o.git/src/Db4oTool/Db4oTool.Tests/Makefile	2010-01-19 21:49:44.323484473 +0000
+@@ -1,11 +1,11 @@
+-
++
+ include ../../include.mk
  
--prebuild:
--	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
-+prebuild:
-+	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
- 	cp $(LIBS)/*.dll $(OUTDIR)
+ OUTDIR = ../../bin
+ 
+ precompile:
+ 	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
+-	find $(WORKDIR) -name "*.cs" | egrep -v 'Resources'> $(RESPONSE_FILE)
++	find $(WORKDIR) -name "*.cs" | egrep -v 'Resources'> $(RESPONSE_FILE)
  
- build: tests admin
+ TARGET = exe
+ ASSEMBLY = $(TOOL_TESTS)
diff --git a/debian/patches/02-link_system_libs.patch b/debian/patches/02-link_system_libs.patch
index 69e9601..dbb60a8 100644
--- a/debian/patches/02-link_system_libs.patch
+++ b/debian/patches/02-link_system_libs.patch
@@ -8,30 +8,94 @@ Forwarded: not-needed
  src/Makefile                       |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
---- db4o.orig/src/Db4oAdmin/Makefile
-+++ db4o/src/Db4oAdmin/Makefile
-@@ -5,4 +5,4 @@ WORKDIR = Db4oAdmin
- 
- TARGET = exe
- ASSEMBLY = $(ADMIN)
--REFERENCES = -r:$(OUTDIR)/$(TOOLS) -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:$(OUTDIR)/$(GETOPTIONS)
-+REFERENCES = -r:$(OUTDIR)/$(TOOLS) -r:$(OUTDIR)/$(CORE) $(shell pkg-config --libs mono-cecil) $(shell pkg-config --libs cecil-flowanalysis) -r Mono.GetOptions
---- db4o.orig/src/Db4objects.Db4o.Tools/Makefile
-+++ db4o/src/Db4objects.Db4o.Tools/Makefile
-@@ -3,4 +3,4 @@ include ../include.mk
- 
- TARGET = library
- ASSEMBLY = $(TOOLS)
--REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
-+REFERENCES = -r:$(OUTDIR)/$(CORE) $(shell pkg-config --libs mono-cecil) $(shell pkg-config --libs cecil-flowanalysis)
---- db4o.orig/src/Makefile
-+++ db4o/src/Makefile
-@@ -15,7 +15,7 @@ all: prebuild build postbuild
+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
+@@ -20,7 +20,7 @@
  
  prebuild:
  	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
 -	cp $(LIBS)/*.dll $(OUTDIR)
 +	#cp $(LIBS)/*.dll $(OUTDIR)
  
- build: tests admin
+ build: core nq linq tool tests
+ 
+Index: db4o.git/src/Db4objects.Db4o.Instrumentation/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.Instrumentation/Makefile	2010-01-26 11:26:37.455568847 +0000
++++ db4o.git/src/Db4objects.Db4o.Instrumentation/Makefile	2010-01-26 11:41:56.235567968 +0000
+@@ -1,8 +1,8 @@
  
+-include ../../db4o.net/include.mk
++include ../include.mk
+ 
+-OUTDIR = ../../db4o.net/bin
++OUTDIR = ../bin
+ 
+ TARGET = library
+ ASSEMBLY = $(INSTR)
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
++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
+@@ -5,4 +5,4 @@
+ 
+ TARGET = library
+ ASSEMBLY = Db4objects.Db4o.Linq.dll
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
++REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis
+Index: db4o.git/src/Db4objects.Db4o.NativeQueries/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.NativeQueries/Makefile	2010-01-26 11:26:37.555567472 +0000
++++ db4o.git/src/Db4objects.Db4o.NativeQueries/Makefile	2010-01-26 11:41:56.235567968 +0000
+@@ -5,4 +5,4 @@
+ 
+ TARGET = library
+ ASSEMBLY = $(NQ)
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
++REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis
+Index: db4o.git/src/Db4objects.Db4o.Linq.Tests/Makefile
+===================================================================
+--- db4o.git.orig/src/Db4objects.Db4o.Linq.Tests/Makefile	2010-01-26 11:41:54.616818793 +0000
++++ db4o.git/src/Db4objects.Db4o.Linq.Tests/Makefile	2010-01-26 11:41:56.235567968 +0000
+@@ -3,5 +3,5 @@
+ 
+ TARGET = exe
+ ASSEMBLY = $(LINQ_TESTS)
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(LINQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
++REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(LINQ) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis
+ 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
+@@ -3,5 +3,5 @@
+ 
+ TARGET = exe
+ ASSEMBLY = $(TESTS)
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:System.Drawing 
++REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis -r:System.Drawing
+ 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
+@@ -5,4 +5,4 @@
+ 
+ TARGET = exe
+ ASSEMBLY = $(TOOL)
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:$(OUTDIR)/$(GETOPTIONS)
++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
+@@ -9,4 +9,4 @@
+ 
+ TARGET = exe
+ ASSEMBLY = $(TOOL_TESTS)
+-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:$(OUTDIR)/$(TOOL) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT)
++REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(INSTR) -r:$(OUTDIR)/$(NQ) -r:$(OUTDIR)/$(CECIL) -pkg:cecil-flowanalysis -r:$(OUTDIR)/$(TOOL) -r:$(OUTDIR)/$(UNIT) -r:$(OUTDIR)/$(UNIT_EXT)
diff --git a/debian/patches/03-generate_xml_doc.patch b/debian/patches/03-generate_xml_doc.patch
index b7205a2..b101ce2 100644
--- a/debian/patches/03-generate_xml_doc.patch
+++ b/debian/patches/03-generate_xml_doc.patch
@@ -6,9 +6,11 @@ Forwarded: no
  src/include.mk |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- db4o.orig/src/include.mk
-+++ db4o/src/include.mk
-@@ -25,7 +25,7 @@ precompile:
+Index: db4o.git/src/include.mk
+===================================================================
+--- db4o.git.orig/src/include.mk	2009-12-13 12:19:45.453425742 +0000
++++ db4o.git/src/include.mk	2009-12-13 12:40:03.673425232 +0000
+@@ -30,7 +30,7 @@
  	find $(WORKDIR) -name "*.cs" > $(RESPONSE_FILE)
  
  compile:

-- 
db4o

More information about the Pkg-cli-libs-commits mailing list