[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/6.1.604+dfsg-13-ga87a231

Iain Lane laney at ubuntu.com
Mon Nov 9 00:29:53 UTC 2009 

The following commit has been merged in the master branch:
commit a87a2319c4975fbf20e0f103dec74dea0861d4a6
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Nov 9 00:22:12 2009 +0000

    Get building before we do the new upstream
    
    *** NEEDS NEW UPSTREAM UPDATE STILL! ***
    * debian/patches/01-dos2unix.patch: Regenerate; didn't apply before
    * debian/rules:
      + Update to be more DH7ish
      + Use mono-csc as compiler, per latest CLI policy
    * debian/control: Bump mono-devel build-dep to >= 2.4.2.3 to have mono-csc
      available

diff --git a/debian/changelog b/debian/changelog
index e763c47..5eda855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 db4o (6.1.604+dfsg-4) UNRELEASED; urgency=low
 
-  ***WORKING ON IT***
-  (currently FTBFS)
+  *** NEEDS NEW UPSTREAM UPDATE STILL! ***
+
+  [ David Paleino ]
   * debian/control:
     - Vcs-* fields updated, package moved to Git
     - moved from Section libs to cli-mono
@@ -14,7 +15,15 @@ db4o (6.1.604+dfsg-4) UNRELEASED; urgency=low
     - rewritten using overriden targets and dh7
   * debian/patches/* converted to quilt
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 26 Sep 2009 19:35:19 +0200
+  [ Iain Lane ]
+  * debian/patches/01-dos2unix.patch: Regenerate; didn't apply before
+  * debian/rules: 
+    + Update to be more DH7ish
+    + Use mono-csc as compiler, per latest CLI policy
+  * debian/control: Bump mono-devel build-dep to >= 2.4.2.3 to have mono-csc
+    available
+
+ -- Iain Lane <laney at ubuntu.com>  Mon, 09 Nov 2009 00:08:05 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f58add5..cab92af 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
 Build-Depends-Indep: cli-common-dev (>= 0.5.7),
- mono-devel (>= 2.0),
+ mono-devel (>= 2.4.2.3),
  libmono-cecil0.5-cil,
  libmono-cecil-flowanalysis0.1-cil,
  pkg-config,
diff --git a/debian/libdb4o6.0-cil.install b/debian/libdb4o6.0-cil.install
index f4a3db6..c26d3e8 100644
--- a/debian/libdb4o6.0-cil.install
+++ b/debian/libdb4o6.0-cil.install
@@ -1,4 +1,4 @@
-usr/lib/db4o/*.dll*	/usr/lib/cli/db4o-6.0/
-usr/lib/db4o/*.exe*	/usr/lib/db4o/
+usr/lib/db4o/*.dll /usr/lib/cli/db4o-6.0/
+usr/lib/db4o/*.exe	/usr/lib/db4o/
 usr/lib/pkgconfig/
 usr/bin/
diff --git a/debian/patches/00-configurable_compiler.patch b/debian/patches/00-configurable_compiler.patch
index 5c2411b..ab88003 100644
--- a/debian/patches/00-configurable_compiler.patch
+++ b/debian/patches/00-configurable_compiler.patch
@@ -5,8 +5,8 @@ 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
+--- db4o.git.orig/src/include.mk
++++ db4o.git/src/include.mk
 @@ -1,6 +1,6 @@
  
  MONO = mono
@@ -14,4 +14,4 @@ Author: Iain Lane <laney at ubuntu.com>
 +MCS ?= gmcs
  KEY_FILE = ../db4objects.snk
  MCS_FLAGS = -keyfile:$(KEY_FILE) -define:NET_2_0,MONO,EMBEDDED
- OUTDIR = ../bin
+ OUTDIR = ../bin
diff --git a/debian/patches/01-dos2unix.patch b/debian/patches/01-dos2unix.patch
index 099fcaf..5478970 100644
--- a/debian/patches/01-dos2unix.patch
+++ b/debian/patches/01-dos2unix.patch
@@ -12,13 +12,13 @@ Forwarded: not-needed
  src/Makefile                       |    8 ++++----
  7 files changed, 19 insertions(+), 19 deletions(-)
 
---- db4o.orig/src/Db4oAdmin/Makefile
-+++ db4o/src/Db4oAdmin/Makefile
+--- 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
 +
 +include ../include.mk
 +
@@ -26,66 +26,66 @@ Forwarded: not-needed
  
  TARGET = exe
  ASSEMBLY = $(ADMIN)
---- db4o.orig/src/Db4oUnit/Makefile
-+++ db4o/src/Db4oUnit/Makefile
+--- db4o.git.orig/src/Db4oUnit/Makefile
++++ db4o.git/src/Db4oUnit/Makefile
 @@ -1,5 +1,5 @@
--
--include ../include.mk
+-
+-include ../include.mk
 +
 +include ../include.mk
  
  TARGET = library
  ASSEMBLY = $(UNIT)
---- db4o.orig/src/Db4oUnit.Extensions/Makefile
-+++ db4o/src/Db4oUnit.Extensions/Makefile
+--- db4o.git.orig/src/Db4oUnit.Extensions/Makefile
++++ db4o.git/src/Db4oUnit.Extensions/Makefile
 @@ -1,5 +1,5 @@
--
--include ../include.mk
+-
+-include ../include.mk
 +
 +include ../include.mk
  
  TARGET = library
  ASSEMBLY = $(UNIT_EXT)
---- db4o.orig/src/Db4objects.Db4o/Makefile
-+++ db4o/src/Db4objects.Db4o/Makefile
+--- db4o.git.orig/src/Db4objects.Db4o/Makefile
++++ db4o.git/src/Db4objects.Db4o/Makefile
 @@ -1,5 +1,5 @@
--
--include ../include.mk
+-
+-include ../include.mk
 +
 +include ../include.mk
  
  TARGET = library
  ASSEMBLY = $(CORE)
---- db4o.orig/src/Db4objects.Db4o.Tests/Makefile
-+++ db4o/src/Db4objects.Db4o.Tests/Makefile
+--- db4o.git.orig/src/Db4objects.Db4o.Tests/Makefile
++++ db4o.git/src/Db4objects.Db4o.Tests/Makefile
 @@ -1,5 +1,5 @@
--
--include ../include.mk
+-
+-include ../include.mk
 +
 +include ../include.mk
  
  TARGET = exe
  ASSEMBLY = $(TESTS)
---- db4o.orig/src/Db4objects.Db4o.Tools/Makefile
-+++ db4o/src/Db4objects.Db4o.Tools/Makefile
+--- db4o.git.orig/src/Db4objects.Db4o.Tools/Makefile
++++ db4o.git/src/Db4objects.Db4o.Tools/Makefile
 @@ -1,6 +1,6 @@
--
--include ../include.mk
--
+-
+-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
+--- 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
--
+-ADMIN = Db4oAdmin
+-
 +ADMIN = Db4oAdmin
 +
  LIBS = Libs/net-2.0
@@ -94,8 +94,8 @@ Forwarded: not-needed
  
  all: prebuild build postbuild
  
--prebuild:
--	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
+-prebuild:
+-	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
 +prebuild:
 +	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
  	cp $(LIBS)/*.dll $(OUTDIR)
diff --git a/debian/rules b/debian/rules
index 864bd83..433e0b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,14 +8,22 @@ DEB_CLI_API_VERSION = 6.1.604
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
 
-override_dh_build:
-	dh_auto_build -D src -- MCS=/usr/bin/csc core admin
+override_dh_auto_build:
+	dh_auto_build -D src -- MCS=/usr/bin/mono-csc core admin
+	mdoc update \
+	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
+	  -o $(CURDIR)/src/bin/monodocer \
+	  $(CURDIR)/src/bin/Db4objects.Db4o.dll
+	mdoc assemble \
+	  -f ecma \
+	  -o $(CURDIR)/src/bin/Db4objects.Db4o \
+	  $(CURDIR)/src/bin/monodocer
 
-override_dh_clean:
+override_dh_auto_clean:
 	dh_auto_clean -D src
 	rm -rf src/bin
 
-override_dh_auto-install:
+override_dh_auto_install:
 	# <$(MAKE) install>
 
 	# db4o libs / admin tool
@@ -56,6 +64,11 @@ override_dh_auto-install:
 
 	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
 	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc
+	dh_auto_install
+
+# Should this really be necessary? :(
+override_dh_install:
+	dh_install --sourcedir=$(CURDIR)/debian/tmp
 
 override_dh_compress:
 	dh_compress -i -Xapi/ -Xtutorial/ -Xreference/
@@ -63,31 +76,5 @@ override_dh_compress:
 override_dh_makeclilibs:
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
 
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-	dh build
-	mdoc update \
-	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
-	  -o $(CURDIR)/src/bin/monodocer \
-	  $(CURDIR)/src/bin/Db4objects.Db4o.dll
-	mdoc assemble \
-	  -f ecma \
-	  -o $(CURDIR)/src/bin/Db4objects.Db4o \
-	  $(CURDIR)/src/bin/monodocer
-	touch $@
-
-clean: clean-patched unpatch
-clean-patched:
-	dh clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch:
-binary-indep: build install
-	dh $@
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with=quilt $@

-- 
db4o

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