[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/6.1.604+dfsg-10-g79251b9
David Paleino
d.paleino at gmail.com
Sat Sep 26 17:38:05 UTC 2009
The following commit has been merged in the master branch:
commit 893b11036cb536827872254269f663f0ae8189b0
Author: David Paleino <d.paleino at gmail.com>
Date: Sat Sep 26 19:08:14 2009 +0200
debian/patches/* converted to quilt
diff --git a/debian/changelog b/debian/changelog
index 84a9a0c..a2b0a8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ db4o (6.1.604+dfsg-4) UNRELEASED; urgency=low
- moved from Section libs to cli-mono
* debian/rules:
- fixed monodoc calls to use mdoc (Closes: #534009)
+ * debian/patches/* converted to quilt
- -- David Paleino <d.paleino at gmail.com> Sat, 26 Sep 2009 16:42:13 +0200
+ -- David Paleino <d.paleino at gmail.com> Sat, 26 Sep 2009 19:07:50 +0200
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
new file mode 100644
index 0000000..5c2411b
--- /dev/null
+++ b/debian/patches/00-configurable_compiler.patch
@@ -0,0 +1,17 @@
+Description: make the MCS environment variable configurable
+Author: Iain Lane <laney at ubuntu.com>
+
+---
+ src/include.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- db4o.orig/src/include.mk
++++ db4o/src/include.mk
+@@ -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
+ OUTDIR = ../bin
diff --git a/debian/patches/00_configurable_compiler.dpatch b/debian/patches/00_configurable_compiler.dpatch
deleted file mode 100755
index 09082e2..0000000
--- a/debian/patches/00_configurable_compiler.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 00_configurable_compiler.dpatch by Iain Lane <laney at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad db4o-6.1.604+dfsg~/src/include.mk db4o-6.1.604+dfsg/src/include.mk
---- db4o-6.1.604+dfsg~/src/include.mk 2007-07-31 15:29:02.000000000 +0100
-+++ db4o-6.1.604+dfsg/src/include.mk 2009-02-28 18:22:10.000000000 +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
- OUTDIR = ../bin
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index be28eb0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-00_configurable_compiler
-01_dos2unix
-02_link_system_libs
-03_generate_xml_doc
diff --git a/debian/patches/01-dos2unix.patch b/debian/patches/01-dos2unix.patch
new file mode 100644
index 0000000..099fcaf
--- /dev/null
+++ b/debian/patches/01-dos2unix.patch
@@ -0,0 +1,103 @@
+Description: files changed by dos2unix
+Author: Mirco Bauer <meebey at debian.org>
+Forwarded: not-needed
+
+---
+ src/Db4oAdmin/Makefile | 8 ++++----
+ src/Db4oUnit.Extensions/Makefile | 4 ++--
+ src/Db4oUnit/Makefile | 4 ++--
+ src/Db4objects.Db4o.Tests/Makefile | 4 ++--
+ src/Db4objects.Db4o.Tools/Makefile | 6 +++---
+ src/Db4objects.Db4o/Makefile | 4 ++--
+ src/Makefile | 8 ++++----
+ 7 files changed, 19 insertions(+), 19 deletions(-)
+
+--- db4o.orig/src/Db4oAdmin/Makefile
++++ db4o/src/Db4oAdmin/Makefile
+@@ -1,7 +1,7 @@
+-
+-include ../include.mk
+-
+-WORKDIR = Db4oAdmin
++
++include ../include.mk
++
++WORKDIR = Db4oAdmin
+
+ TARGET = exe
+ ASSEMBLY = $(ADMIN)
+--- db4o.orig/src/Db4oUnit/Makefile
++++ db4o/src/Db4oUnit/Makefile
+@@ -1,5 +1,5 @@
+-
+-include ../include.mk
++
++include ../include.mk
+
+ TARGET = library
+ ASSEMBLY = $(UNIT)
+--- db4o.orig/src/Db4oUnit.Extensions/Makefile
++++ db4o/src/Db4oUnit.Extensions/Makefile
+@@ -1,5 +1,5 @@
+-
+-include ../include.mk
++
++include ../include.mk
+
+ TARGET = library
+ ASSEMBLY = $(UNIT_EXT)
+--- db4o.orig/src/Db4objects.Db4o/Makefile
++++ db4o/src/Db4objects.Db4o/Makefile
+@@ -1,5 +1,5 @@
+-
+-include ../include.mk
++
++include ../include.mk
+
+ TARGET = library
+ ASSEMBLY = $(CORE)
+--- db4o.orig/src/Db4objects.Db4o.Tests/Makefile
++++ db4o/src/Db4objects.Db4o.Tests/Makefile
+@@ -1,5 +1,5 @@
+-
+-include ../include.mk
++
++include ../include.mk
+
+ TARGET = exe
+ ASSEMBLY = $(TESTS)
+--- db4o.orig/src/Db4objects.Db4o.Tools/Makefile
++++ db4o/src/Db4objects.Db4o.Tools/Makefile
+@@ -1,6 +1,6 @@
+-
+-include ../include.mk
+-
++
++include ../include.mk
++
+ TARGET = library
+ ASSEMBLY = $(TOOLS)
+ REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
+--- db4o.orig/src/Makefile
++++ db4o/src/Makefile
+@@ -5,16 +5,16 @@ TESTS = Db4objects.Db4o.Tests
+ TOOLS = Db4objects.Db4o.Tools
+ UNIT = Db4oUnit
+ UNIT_EXT = Db4oUnit.Extensions
+-ADMIN = Db4oAdmin
+-
++ADMIN = Db4oAdmin
++
+ 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: tests admin
diff --git a/debian/patches/01_dos2unix.dpatch b/debian/patches/01_dos2unix.dpatch
deleted file mode 100755
index b336052..0000000
--- a/debian/patches/01_dos2unix.dpatch
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_dos2unix.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad db4o-6.1.604~/src/Db4oAdmin/Makefile db4o-6.1.604/src/Db4oAdmin/Makefile
---- db4o-6.1.604~/src/Db4oAdmin/Makefile 2007-07-31 16:29:02.000000000 +0200
-+++ db4o-6.1.604/src/Db4oAdmin/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -1,7 +1,7 @@
--
--include ../include.mk
--
--WORKDIR = Db4oAdmin
-+
-+include ../include.mk
-+
-+WORKDIR = Db4oAdmin
-
- TARGET = exe
- ASSEMBLY = $(ADMIN)
-diff -urNad db4o-6.1.604~/src/Db4oUnit/Makefile db4o-6.1.604/src/Db4oUnit/Makefile
---- db4o-6.1.604~/src/Db4oUnit/Makefile 2007-07-31 16:29:00.000000000 +0200
-+++ db4o-6.1.604/src/Db4oUnit/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -1,5 +1,5 @@
--
--include ../include.mk
-+
-+include ../include.mk
-
- TARGET = library
- ASSEMBLY = $(UNIT)
-diff -urNad db4o-6.1.604~/src/Db4oUnit.Extensions/Makefile db4o-6.1.604/src/Db4oUnit.Extensions/Makefile
---- db4o-6.1.604~/src/Db4oUnit.Extensions/Makefile 2007-07-31 16:29:02.000000000 +0200
-+++ db4o-6.1.604/src/Db4oUnit.Extensions/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -1,5 +1,5 @@
--
--include ../include.mk
-+
-+include ../include.mk
-
- TARGET = library
- ASSEMBLY = $(UNIT_EXT)
-diff -urNad db4o-6.1.604~/src/Db4objects.Db4o/Makefile db4o-6.1.604/src/Db4objects.Db4o/Makefile
---- db4o-6.1.604~/src/Db4objects.Db4o/Makefile 2007-07-31 16:29:02.000000000 +0200
-+++ db4o-6.1.604/src/Db4objects.Db4o/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -1,5 +1,5 @@
--
--include ../include.mk
-+
-+include ../include.mk
-
- TARGET = library
- ASSEMBLY = $(CORE)
-diff -urNad db4o-6.1.604~/src/Db4objects.Db4o.Tests/Makefile db4o-6.1.604/src/Db4objects.Db4o.Tests/Makefile
---- db4o-6.1.604~/src/Db4objects.Db4o.Tests/Makefile 2007-07-31 16:29:04.000000000 +0200
-+++ db4o-6.1.604/src/Db4objects.Db4o.Tests/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -1,5 +1,5 @@
--
--include ../include.mk
-+
-+include ../include.mk
-
- TARGET = exe
- ASSEMBLY = $(TESTS)
-diff -urNad db4o-6.1.604~/src/Db4objects.Db4o.Tools/Makefile db4o-6.1.604/src/Db4objects.Db4o.Tools/Makefile
---- db4o-6.1.604~/src/Db4objects.Db4o.Tools/Makefile 2007-07-31 16:29:02.000000000 +0200
-+++ db4o-6.1.604/src/Db4objects.Db4o.Tools/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -1,6 +1,6 @@
--
--include ../include.mk
--
-+
-+include ../include.mk
-+
- TARGET = library
- ASSEMBLY = $(TOOLS)
- REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
-diff -urNad db4o-6.1.604~/src/Makefile db4o-6.1.604/src/Makefile
---- db4o-6.1.604~/src/Makefile 2008-02-17 14:28:54.000000000 +0100
-+++ db4o-6.1.604/src/Makefile 2008-02-17 14:53:59.000000000 +0100
-@@ -5,16 +5,16 @@
- TOOLS = Db4objects.Db4o.Tools
- UNIT = Db4oUnit
- UNIT_EXT = Db4oUnit.Extensions
--ADMIN = Db4oAdmin
--
-+ADMIN = Db4oAdmin
-+
- 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: tests admin
diff --git a/debian/patches/02-link_system_libs.patch b/debian/patches/02-link_system_libs.patch
new file mode 100644
index 0000000..69e9601
--- /dev/null
+++ b/debian/patches/02-link_system_libs.patch
@@ -0,0 +1,37 @@
+Description: link system libraries
+Author: Mirco Bauer <meebey at debian.org>
+Forwarded: not-needed
+
+---
+ src/Db4oAdmin/Makefile | 2 +-
+ src/Db4objects.Db4o.Tools/Makefile | 2 +-
+ 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
+
+ prebuild:
+ [ -d $(OUTDIR) ] || mkdir $(OUTDIR)
+- cp $(LIBS)/*.dll $(OUTDIR)
++ #cp $(LIBS)/*.dll $(OUTDIR)
+
+ build: tests admin
+
diff --git a/debian/patches/02_link_system_libs.dpatch b/debian/patches/02_link_system_libs.dpatch
deleted file mode 100755
index c104766..0000000
--- a/debian/patches/02_link_system_libs.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_link_system_libs.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad db4o-6.1.604~/src/Db4oAdmin/Makefile db4o-6.1.604/src/Db4oAdmin/Makefile
---- db4o-6.1.604~/src/Db4oAdmin/Makefile 2008-02-17 14:57:49.000000000 +0100
-+++ db4o-6.1.604/src/Db4oAdmin/Makefile 2008-02-17 14:57:59.000000000 +0100
-@@ -5,4 +5,4 @@
-
- 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
-diff -urNad db4o-6.1.604~/src/Db4objects.Db4o.Tools/Makefile db4o-6.1.604/src/Db4objects.Db4o.Tools/Makefile
---- db4o-6.1.604~/src/Db4objects.Db4o.Tools/Makefile 2008-02-17 14:57:49.000000000 +0100
-+++ db4o-6.1.604/src/Db4objects.Db4o.Tools/Makefile 2008-02-17 14:57:59.000000000 +0100
-@@ -3,4 +3,4 @@
-
- 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)
-diff -urNad db4o-6.1.604~/src/Makefile db4o-6.1.604/src/Makefile
---- db4o-6.1.604~/src/Makefile 2008-02-17 14:57:49.000000000 +0100
-+++ db4o-6.1.604/src/Makefile 2008-02-17 14:57:59.000000000 +0100
-@@ -15,7 +15,7 @@
-
- prebuild:
- [ -d $(OUTDIR) ] || mkdir $(OUTDIR)
-- cp $(LIBS)/*.dll $(OUTDIR)
-+ #cp $(LIBS)/*.dll $(OUTDIR)
-
- build: tests admin
-
diff --git a/debian/patches/03-generate_xml_doc.patch b/debian/patches/03-generate_xml_doc.patch
new file mode 100644
index 0000000..b7205a2
--- /dev/null
+++ b/debian/patches/03-generate_xml_doc.patch
@@ -0,0 +1,19 @@
+Description: add a flag to generate XML documentation
+Author: Mirco Bauer <meebey at debian.org>
+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:
+ find $(WORKDIR) -name "*.cs" > $(RESPONSE_FILE)
+
+ compile:
+- $(MCS) -t:$(TARGET) $(REFERENCES) -warn:0 -out:$(OUTDIR)/$(ASSEMBLY) $(MCS_FLAGS) $(OPT_MCS_FLAGS) @$(RESPONSE_FILE)
++ $(MCS) -t:$(TARGET) $(REFERENCES) -warn:0 -out:$(OUTDIR)/$(ASSEMBLY) -doc:$(OUTDIR)/$(ASSEMBLY).xml $(MCS_FLAGS) $(OPT_MCS_FLAGS) @$(RESPONSE_FILE)
+
+ postcompile:
+ rm -f $(RESPONSE_FILE)
diff --git a/debian/patches/03_generate_xml_doc.dpatch b/debian/patches/03_generate_xml_doc.dpatch
deleted file mode 100755
index cbc6014..0000000
--- a/debian/patches/03_generate_xml_doc.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_generate_xml_doc.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad db4o-6.1.604~/src/include.mk db4o-6.1.604/src/include.mk
---- db4o-6.1.604~/src/include.mk 2007-07-31 16:29:02.000000000 +0200
-+++ db4o-6.1.604/src/include.mk 2008-02-17 17:48:36.000000000 +0100
-@@ -25,7 +25,7 @@
- find $(WORKDIR) -name "*.cs" > $(RESPONSE_FILE)
-
- compile:
-- $(MCS) -t:$(TARGET) $(REFERENCES) -warn:0 -out:$(OUTDIR)/$(ASSEMBLY) $(MCS_FLAGS) $(OPT_MCS_FLAGS) @$(RESPONSE_FILE)
-+ $(MCS) -t:$(TARGET) $(REFERENCES) -warn:0 -out:$(OUTDIR)/$(ASSEMBLY) -doc:$(OUTDIR)/$(ASSEMBLY).xml $(MCS_FLAGS) $(OPT_MCS_FLAGS) @$(RESPONSE_FILE)
-
- postcompile:
- rm -f $(RESPONSE_FILE)
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
index 2d6ced9..52fd611 100755
--- a/debian/patches/makefile.dpatch
+++ b/debian/patches/makefile.dpatch
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
diff -urNad db4o-6.1.401~dfsg~/Makefile db4o-6.1.401~dfsg/Makefile
--- db4o-6.1.401~dfsg~/Makefile 2007-04-25 23:52:26.000000000 +0200
+++ db4o-6.1.401~dfsg/Makefile 2007-04-25 23:52:57.000000000 +0200
@@ -45,7 +38,7 @@ diff -urNad db4o-6.1.401~dfsg~/src/Db4objects.Db4o.Tools/Makefile db4o-6.1.401~d
--- db4o-6.1.401~dfsg~/src/Db4objects.Db4o.Tools/Makefile 2007-04-25 23:52:26.000000000 +0200
+++ db4o-6.1.401~dfsg/src/Db4objects.Db4o.Tools/Makefile 2007-04-25 23:52:57.000000000 +0200
@@ -3,4 +3,4 @@
-
+
TARGET = library
ASSEMBLY = $(TOOLS)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
@@ -55,8 +48,8 @@ diff -urNad db4o-6.1.401~dfsg~/src/Makefile db4o-6.1.401~dfsg/src/Makefile
+++ db4o-6.1.401~dfsg/src/Makefile 2007-04-25 23:52:57.000000000 +0200
@@ -15,7 +15,7 @@
- prebuild:
- [ -d $(OUTDIR) ] || mkdir $(OUTDIR)
+ prebuild:
+ [ -d $(OUTDIR) ] || mkdir $(OUTDIR)
- cp $(LIBS)/*.dll $(OUTDIR)
+# cp $(LIBS)/*.dll $(OUTDIR)
@@ -66,9 +59,9 @@ diff -urNad db4o-6.1.401~dfsg~/src/include.mk db4o-6.1.401~dfsg/src/include.mk
--- db4o-6.1.401~dfsg~/src/include.mk 2007-03-27 01:45:48.000000000 +0200
+++ db4o-6.1.401~dfsg/src/include.mk 2007-04-25 23:54:56.000000000 +0200
@@ -16,7 +16,7 @@
-
- CECIL = Mono.Cecil.dll
- FLOWANALYSIS = Cecil.FlowAnalysis.dll
+
+ CECIL = Mono.Cecil.dll
+ FLOWANALYSIS = Cecil.FlowAnalysis.dll
-GETOPTIONS = Mono.GetOptions.dll
+GETOPTIONS = Mono.GetOptions
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..289961d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+00-configurable_compiler.patch
+01-dos2unix.patch
+02-link_system_libs.patch
+03-generate_xml_doc.patch
--
db4o
More information about the Pkg-cli-libs-commits
mailing list