[Pkg-cli-libs-commits] r3600 - in /packages/db4o/trunk/debian: ./ patches/
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sun Feb 17 18:52:49 UTC 2008
Author: meebey
Date: Sun Feb 17 18:52:49 2008
New Revision: 3600
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3600
Log:
Much love to db4o!
db4o 6.1.604+dfsg-1 release
Added:
packages/db4o/trunk/debian/Db4objects.Db4o.source
packages/db4o/trunk/debian/db4o.pc
- copied, changed from r3599, packages/db4o/trunk/debian/db4o-6.1.pc
packages/db4o/trunk/debian/libdb4o-doc.docs
packages/db4o/trunk/debian/libdb4o6.0-cil.install
- copied, changed from r3599, packages/db4o/trunk/debian/libdb4o6.1-cil.install
packages/db4o/trunk/debian/libdb4o6.0-cil.installcligac
- copied, changed from r3599, packages/db4o/trunk/debian/installcligac
packages/db4o/trunk/debian/libdb4o6.0-cil.links
packages/db4o/trunk/debian/monodoc-db4o-manual.install
packages/db4o/trunk/debian/monodoc-db4o-manual.postinst
packages/db4o/trunk/debian/monodoc-db4o-manual.postrm
packages/db4o/trunk/debian/patches/01_dos2unix.dpatch (with props)
packages/db4o/trunk/debian/patches/02_link_system_libs.dpatch (with props)
packages/db4o/trunk/debian/patches/03_generate_xml_doc.dpatch (with props)
packages/db4o/trunk/debian/update_src_dos2unix.sh (with props)
packages/db4o/trunk/debian/update_src_link_system_libs.sh (with props)
Removed:
packages/db4o/trunk/debian/db4o-6.1.pc
packages/db4o/trunk/debian/installcligac
packages/db4o/trunk/debian/libdb4o-doc.install
packages/db4o/trunk/debian/libdb4o6.1-cil.install
Modified:
packages/db4o/trunk/debian/changelog
packages/db4o/trunk/debian/control
packages/db4o/trunk/debian/patches/00list
packages/db4o/trunk/debian/rules
Added: packages/db4o/trunk/debian/Db4objects.Db4o.source
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/Db4objects.Db4o.source?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/Db4objects.Db4o.source (added)
+++ packages/db4o/trunk/debian/Db4objects.Db4o.source Sun Feb 17 18:52:49 2008
@@ -1,0 +1,4 @@
+<?xml version="1.0"?>
+<monodoc>
+ <source provider="ecma" basefile="Db4objects.Db4o" path="db4o" title="db4o"/>
+</monodoc>
Modified: packages/db4o/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/changelog?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/changelog (original)
+++ packages/db4o/trunk/debian/changelog Sun Feb 17 18:52:49 2008
@@ -1,3 +1,66 @@
+db4o (6.1.604+dfsg-1) unstable; urgency=low
+
+ * The "get sexy and ready for lenny" release
+ * DFSG version of db4o 6.1.604
+ (deleted all pre-compiled binaries from the tarball)
+ + For the record here a list of the deleted files:
+ bin/compact-2.0/Cecil.FlowAnalysis.dll
+ bin/compact-2.0/Db4objects.Db4o.Tools.dll
+ bin/compact-2.0/Db4objects.Db4o.dll
+ bin/compact-2.0/Mono.Cecil.dll
+ bin/compact-2.0-legacy/Db4oTools.dll
+ bin/compact-2.0-legacy/db4o.dll
+ bin/net-2.0/Cecil.FlowAnalysis.dll
+ bin/net-2.0/Db4oAdmin.exe
+ bin/net-2.0/Db4objects.Db4o.Tools.dll
+ bin/net-2.0/Db4objects.Db4o.dll
+ bin/net-2.0/Mono.Cecil.dll
+ bin/net-2.0/Mono.GetOptions.dll
+ bin/net-2.0-legacy/Db4oTools.dll
+ bin/net-2.0-legacy/db4o.dll
+ doc/api/H2Reg.exe
+ doc/tutorial/Db4objects.Db4o.Tutorial.exe
+ doc/tutorial/bin/AxSHDocVw.dll
+ doc/tutorial/bin/Cecil.FlowAnalysis.dll
+ doc/tutorial/bin/Db4oUnit.Extensions.dll
+ doc/tutorial/bin/Db4oUnit.dll
+ doc/tutorial/bin/Db4objects.Db4o.Tools.dll
+ doc/tutorial/bin/Db4objects.Db4o.Tutorial.Chapters.dll
+ doc/tutorial/bin/Db4objects.Db4o.dll
+ doc/tutorial/bin/Mono.Cecil.dll
+ doc/tutorial/bin/Mono.GetOptions.dll
+ doc/tutorial/bin/SHDocVw.dll
+ doc/tutorial/bin/WeifenLuo.WinFormsUI.dll
+ src/Libs/compact-1.0/Cecil.FlowAnalysis.dll
+ src/Libs/compact-1.0/Mono.Cecil.dll
+ src/Libs/compact-2.0/Cecil.FlowAnalysis.dll
+ src/Libs/compact-2.0/Mono.Cecil.dll
+ src/Libs/net-1.1/Cecil.FlowAnalysis.dll
+ src/Libs/net-1.1/Mono.Cecil.dll
+ src/Libs/net-2.0/Cecil.FlowAnalysis.dll
+ src/Libs/net-2.0/Mono.Cecil.dll
+ src/Libs/net-2.0/Mono.GetOptions.dll
+ * New upstream release
+ * debian/control:
+ + Fixed ABI version in the package name, Db4objects.Db4o.dll is versioned
+ as 6.0.* and not 6.1.*.
+ + Added Replaces and Conflicts for libdb4o6.1-cil << 6.1.604.
+ + Added Homepage, Vcs-Browser and Vcs-Svn fields.
+ + Added libmono-cecil0.5-cil, monodoc-base and libchm-bin to build
+ dependencies.
+ + Updated cli-common-dev build dependency to >= 0.5.4, as we need
+ dh_clistrip from it.
+ + Updated Section of libdb4o-doc to doc. (Closes: #427581)
+ + Bumped Standards-Version to 3.7.3, no changes needed.
+ + Added monodoc-db4o-manual package.
+ * debian/rules:
+ + Use dh_clistrip instead of custom find command.
+ + Only build libraries and admin tool (without test-cases).
+ Building the test-cases failed caused by a bug in the gmcs compiler.
+ (Closes: #458658)
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 17 Feb 2008 14:15:28 +0100
+
db4o (6.1.401~dfsg-2) unstable; urgency=low
* Build depends on pkg-config (Closes: #423752)
Modified: packages/db4o/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/control?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/control (original)
+++ packages/db4o/trunk/debian/control Sun Feb 17 18:52:49 2008
@@ -2,25 +2,53 @@
Section: libs
Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, dpatch
-Build-Depends-Indep: mono-gmcs (>= 1.1.6) | c-sharp-compiler, mono-gac, cli-common-dev (>= 0.4.4), libmono-cecil-flowanalysis0.1-cil, pkg-config
-Standards-Version: 3.7.2
+Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
+Build-Depends: debhelper (>= 5), dpatch
+Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+ mono-gmcs (>= 1.1.6),
+ mono-gac,
+ libmono-cecil0.5-cil,
+ libmono-cecil-flowanalysis0.1-cil,
+ pkg-config,
+ libchm-bin,
+ monodoc-base
+Standards-Version: 3.7.3
+Homepage: http://www.db4o.com/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/db4o/trunk/
-Package: libdb4o6.1-cil
+Package: libdb4o6.0-cil
Architecture: all
-Depends: ${cli:Depends}
-Description: A native OODBMS for Mono
- Mono native open source object database. This is an embeddable engine
- with zero-administration and high performance.
+Replaces: libdb4o6.1-cil (<< 6.1.604)
+Conflicts: libdb4o6.1-cil (<< 6.1.604)
+Suggests: libdb4o-doc, monodoc-db4o-manual
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
+Description: native OODBMS for CLI
+ db4o is the open source object database that enables Java and .NET developers
+ to store and retrieve any application object with only one line of code,
+ eliminating the need to predefine or maintain a separate, rigid data model.
.
- This is Mono native version but there is also a native Java version;
- check http://www.db4o.com.
+ This is the native CLI version of db4o for Mono and Microsoft .NET Framework,
+ but there is also a native Java version, check http://www.db4o.com.
Package: libdb4o-doc
+Section: doc
Architecture: all
-Description: A native OODBMS for Mono. Documentation package
- Mono native open source object database. This is an embeddable engine
- with zero-administration and high performance.
+Suggests: www-browser | xchm | kchmviewer
+Description: native OODBMS for CLI (documentation)
+ db4o is the open source object database that enables Java and .NET developers
+ to store and retrieve any application object with only one line of code,
+ eliminating the need to predefine or maintain a separate, rigid data model.
.
- This package contains API reference and tutorial on db4o.
+ This package contains API reference and tutorial on db4o in HTML and CHM form.
+
+Package: monodoc-db4o-manual
+Section: doc
+Architecture: all
+Depends: monodoc-manual
+Description: compiled XML documentation for db4o
+ db4o is the open source object database that enables Java and .NET developers
+ to store and retrieve any application object with only one line of code,
+ eliminating the need to predefine or maintain a separate, rigid data model.
+ .
+ This packages contains the compiled XML documentation for db4o.
Copied: packages/db4o/trunk/debian/db4o.pc (from r3599, packages/db4o/trunk/debian/db4o-6.1.pc)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/db4o.pc?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/db4o-6.1.pc (original)
+++ packages/db4o/trunk/debian/db4o.pc Sun Feb 17 18:52:49 2008
@@ -1,7 +1,8 @@
prefix=/usr
libdir=${prefix}/lib
+pkglibdir=${libdir}/cli/db4o-#PACKAGE_ABI_VERSION#
Name: db4o
-Description: db4o - embeddable OODBC engine
-Version: 6.0.1
-Libs: -r:${libdir}/cli/db4o-6.0/db4o.dll
+Description: db4o - native OODBMS for CLI
+Version: 6.0.1.0
+Libs: -r:${pkglibdir}/Db4objects.Db4o.dll -r:${pkglibdir}/Db4objects.Db4o.Tools
Added: packages/db4o/trunk/debian/libdb4o-doc.docs
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/libdb4o-doc.docs?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/libdb4o-doc.docs (added)
+++ packages/db4o/trunk/debian/libdb4o-doc.docs Sun Feb 17 18:52:49 2008
@@ -1,0 +1,1 @@
+debian/tmp/usr/share/db4o/doc/*
Copied: packages/db4o/trunk/debian/libdb4o6.0-cil.install (from r3599, packages/db4o/trunk/debian/libdb4o6.1-cil.install)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/libdb4o6.0-cil.install?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/libdb4o6.1-cil.install (original)
+++ packages/db4o/trunk/debian/libdb4o6.0-cil.install Sun Feb 17 18:52:49 2008
@@ -1,4 +1,4 @@
-usr/lib/cli/db4o/*.dll usr/lib/cli/db4o-6.1/
-usr/lib/cli/db4o/*.exe usr/lib/db4o
-usr/lib/pkgconfig
-usr/bin
+usr/lib/db4o/*.dll* /usr/lib/cli/db4o-6.0/
+usr/lib/db4o/*.exe* /usr/lib/db4o/
+usr/lib/pkgconfig/
+usr/bin/
Copied: packages/db4o/trunk/debian/libdb4o6.0-cil.installcligac (from r3599, packages/db4o/trunk/debian/installcligac)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/libdb4o6.0-cil.installcligac?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/installcligac (original)
+++ packages/db4o/trunk/debian/libdb4o6.0-cil.installcligac Sun Feb 17 18:52:49 2008
@@ -1,4 +1,2 @@
-/usr/lib/cli/db4o-6.1/Db4objects.Db4o.dll
-/usr/lib/cli/db4o-6.1/Db4objects.Db4o.Tools.dll
-/usr/lib/cli/db4o-6.1/Db4oUnit.dll
-/usr/lib/cli/db4o-6.1/Db4oUnit.Extensions.dll
+/usr/lib/cli/db4o-6.0/Db4objects.Db4o.dll
+/usr/lib/cli/db4o-6.0/Db4objects.Db4o.Tools.dll
Added: packages/db4o/trunk/debian/libdb4o6.0-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/libdb4o6.0-cil.links?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/libdb4o6.0-cil.links (added)
+++ packages/db4o/trunk/debian/libdb4o6.0-cil.links Sun Feb 17 18:52:49 2008
@@ -1,0 +1,1 @@
+usr/lib/pkgconfig/db4o-6.0.pc /usr/lib/pkgconfig/db4o.pc
Added: packages/db4o/trunk/debian/monodoc-db4o-manual.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/monodoc-db4o-manual.install?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/monodoc-db4o-manual.install (added)
+++ packages/db4o/trunk/debian/monodoc-db4o-manual.install Sun Feb 17 18:52:49 2008
@@ -1,0 +1,1 @@
+/usr/lib/monodoc/sources/
Added: packages/db4o/trunk/debian/monodoc-db4o-manual.postinst
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/monodoc-db4o-manual.postinst?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/monodoc-db4o-manual.postinst (added)
+++ packages/db4o/trunk/debian/monodoc-db4o-manual.postinst Sun Feb 17 18:52:49 2008
@@ -1,0 +1,19 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+ # Add the node entry
+ grep -v db4o /usr/lib/monodoc/monodoc.xml \
+ | sed 's@ <node label="Various" name="various">@ <node label="Various" name="various">\n <node label="db4o" name="db4o"/>@' \
+ > /usr/lib/monodoc/monodoc.xml.new
+ mv /usr/lib/monodoc/monodoc.xml.new \
+ /usr/lib/monodoc/monodoc.xml
+
+ # Rebuild the index
+ if [ -x /usr/bin/monodoc ]; then
+ echo "generating monodoc search index..."
+ /usr/bin/monodoc --make-index > /dev/null
+ fi
+fi
+
+#DEBHELPER#
Added: packages/db4o/trunk/debian/monodoc-db4o-manual.postrm
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/monodoc-db4o-manual.postrm?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/monodoc-db4o-manual.postrm (added)
+++ packages/db4o/trunk/debian/monodoc-db4o-manual.postrm Sun Feb 17 18:52:49 2008
@@ -1,0 +1,18 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ]; then
+ # Remove the node entry
+ grep -v db4o /usr/lib/monodoc/monodoc.xml \
+ > /usr/lib/monodoc/monodoc.xml.new
+ mv /usr/lib/monodoc/monodoc.xml.new \
+ /usr/lib/monodoc/monodoc.xml
+
+ # Rebuild the index
+ if [ -x /usr/bin/monodoc ]; then
+ echo "generating monodoc search index..."
+ /usr/bin/monodoc --make-index > /dev/null
+ fi
+fi
+
+#DEBHELPER#
Modified: packages/db4o/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/patches/00list?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/patches/00list (original)
+++ packages/db4o/trunk/debian/patches/00list Sun Feb 17 18:52:49 2008
@@ -1,1 +1,3 @@
-makefile.dpatch
+01_dos2unix
+02_link_system_libs
+03_generate_xml_doc
Added: packages/db4o/trunk/debian/patches/01_dos2unix.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/patches/01_dos2unix.dpatch?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/patches/01_dos2unix.dpatch (added)
+++ packages/db4o/trunk/debian/patches/01_dos2unix.dpatch Sun Feb 17 18:52:49 2008
@@ -1,0 +1,103 @@
+#! /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
Propchange: packages/db4o/trunk/debian/patches/01_dos2unix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/db4o/trunk/debian/patches/02_link_system_libs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/patches/02_link_system_libs.dpatch?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/patches/02_link_system_libs.dpatch (added)
+++ packages/db4o/trunk/debian/patches/02_link_system_libs.dpatch Sun Feb 17 18:52:49 2008
@@ -1,0 +1,37 @@
+#! /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
+
Propchange: packages/db4o/trunk/debian/patches/02_link_system_libs.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/db4o/trunk/debian/patches/03_generate_xml_doc.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/patches/03_generate_xml_doc.dpatch?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/patches/03_generate_xml_doc.dpatch (added)
+++ packages/db4o/trunk/debian/patches/03_generate_xml_doc.dpatch Sun Feb 17 18:52:49 2008
@@ -1,0 +1,19 @@
+#! /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)
Propchange: packages/db4o/trunk/debian/patches/03_generate_xml_doc.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/db4o/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/rules?rev=3600&op=diff
==============================================================================
--- packages/db4o/trunk/debian/rules (original)
+++ packages/db4o/trunk/debian/rules Sun Feb 17 18:52:49 2008
@@ -1,32 +1,39 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export MONO_SHARED_DIR=$(CURDIR)
-export DIR_INSTALL_BIN=$(CURDIR)/debian/tmp/usr/lib/cli/db4o
-export DIR_INSTALL_DOC=$(CURDIR)/debian/tmp/usr/share/doc/libdb4o-doc
+DEB_CLI_ABI_VERSION = 6.0
+DEB_CLI_API_VERSION = 6.1.604
include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch
+configure-stamp: patch-stamp
dh_testdir
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) buildall
+ cd src && $(MAKE) core admin
+ monodocer \
+ -importslashdoc:$(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
+ --assembly:$(CURDIR)/src/bin/Db4objects.Db4o.dll \
+ --path:$(CURDIR)/src/bin/monodocer
+ mdassembler \
+ --out $(CURDIR)/src/bin/Db4objects.Db4o \
+ --ecma $(CURDIR)/src/bin/monodocer
touch build-stamp
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp stamp-patched
- -$(MAKE) clean
+ cd src && $(MAKE) clean
rm -rf src/bin
rm -rf $(MONO_SHARED_DIR)/.wapi
+ rm -f build-stamp configure-stamp
dh_clean
install: build
@@ -35,41 +42,71 @@
dh_clean -k
dh_installdirs
- $(MAKE) install
+ # <$(MAKE) install>
- mkdir debian/tmp/usr/lib/pkgconfig
- cp debian/db4o-6.1.pc debian/tmp/usr/lib/pkgconfig
- ln -s debian/tmp/usr/lib/pkgconfig/db4o-6.1.pc debian/tmp/usr/lib/pkgconfig/db4o.pc
+ # db4o libs / admin tool
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/db4o
+ cp $(CURDIR)/src/bin/*.dll $(CURDIR)/debian/tmp/usr/lib/db4o/
+ cp $(CURDIR)/src/bin/*.exe $(CURDIR)/debian/tmp/usr/lib/db4o/
+
+ # db4oadmin shell wrapper
+ mkdir -p $(CURDIR)/debian/tmp/usr/bin
+ cp $(CURDIR)/debian/db4oadmin $(CURDIR)/debian/tmp/usr/bin/
+ chmod +x $(CURDIR)/debian/tmp/usr/bin/db4oadmin
- mkdir debian/tmp/usr/bin
- cp debian/db4oadmin debian/tmp/usr/bin
- chmod 755 debian/tmp/usr/bin/db4oadmin
- rm -f debian/tmp/usr/lib/cli/db4o/Db4objects.Db4o.Tests.exe
+ # db4o docs
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o
+ cp -r $(CURDIR)/doc $(CURDIR)/debian/tmp/usr/share/db4o/
- # Delete unneeded license files
- rm -f debian/tmp/usr/lib/cli/db4o/*.txt
+ # db4o monodoc docs
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/monodoc/sources/
+ cp $(CURDIR)/debian/Db4objects.Db4o.source \
+ $(CURDIR)/src/bin/Db4objects.Db4o.tree \
+ $(CURDIR)/src/bin/Db4objects.Db4o.zip \
+ $(CURDIR)/debian/tmp/usr/lib/monodoc/sources/
+ # </$(MAKE) install>
+
+ # convert db4o.chm to HTML
+ extract_chmLib $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/
+ ln -s html/R_Project.htm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/index.html
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm
+ mv $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm \
+ $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm/
+
+ # pkg-config
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+ cp debian/db4o.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
+ mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o.pc \
+ $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc
+
+ perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
+ $(CURDIR)/debian/libdb4o$(DEB_CLI_ABI_VERSION)-cil.links \
+ $(CURDIR)/debian/libdb4o$(DEB_CLI_ABI_VERSION)-cil.install \
+ $(CURDIR)/debian/libdb4o$(DEB_CLI_ABI_VERSION)-cil.installcligac \
+ $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o-$(DEB_CLI_ABI_VERSION).pc
+
binary-arch:
+
binary-indep: build install
dh_testdir
dh_testroot
- dh_install --sourcedir=debian/tmp --list-missing
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- -cd $(CURDIR)/debian && find -type f -name "*.mdb" -exec rm -f {} \;
-endif
- dh_clifixperms
- dh_installchangelogs
- dh_installdocs
- dh_installcligac
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeclilibs -V
- dh_installdeb
- dh_clideps -d
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_install -i --sourcedir=debian/tmp
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_installcligac -i
+ dh_link -i
+ dh_strip -i
+ dh_clistrip -i
+ dh_compress -i -Xapi/ -Xtutorial/ -Xreference/
+ dh_fixperms -i
+ dh_clifixperms -i
+ dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
+ dh_installdeb -i
+ dh_clideps -i -d
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install configure
Added: packages/db4o/trunk/debian/update_src_dos2unix.sh
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/update_src_dos2unix.sh?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/update_src_dos2unix.sh (added)
+++ packages/db4o/trunk/debian/update_src_dos2unix.sh Sun Feb 17 18:52:49 2008
@@ -1,0 +1,7 @@
+#!/bin/sh
+# Description: Updates upstream source files to fix all newlines
+# Author: Mirco Bauer <meebey at debian.org>
+# License: GPL-2
+
+echo "Converting all Makefiles (dos2unix)"
+find -name "Makefile" -exec dos2unix {} \;
Propchange: packages/db4o/trunk/debian/update_src_dos2unix.sh
------------------------------------------------------------------------------
svn:executable = *
Added: packages/db4o/trunk/debian/update_src_link_system_libs.sh
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/db4o/trunk/debian/update_src_link_system_libs.sh?rev=3600&op=file
==============================================================================
--- packages/db4o/trunk/debian/update_src_link_system_libs.sh (added)
+++ packages/db4o/trunk/debian/update_src_link_system_libs.sh Sun Feb 17 18:52:49 2008
@@ -1,0 +1,18 @@
+#!/bin/sh
+# Description: Updates upstream source files to link with system Mono.Cecil,
+# Cecil.FlowAnalysis and Mono.GetOptions
+# Author: Mirco Bauer <meebey at debian.org>
+# License: GPL-2
+
+#-r:$(OUTDIR)/$(CECIL)
+echo "Updating Mono.Cecil references"
+find -name "Makefile" -exec perl -pe 's!-r:\$\(OUTDIR\)/\$\(CECIL\)!\$(shell pkg-config --libs mono-cecil)!g' -i {} \;
+
+echo "Updating Cecil.FlowAnalysis references"
+find -name "Makefile" -exec perl -pe 's!-r:\$\(OUTDIR\)/\$\(FLOWANALYSIS\)!\$(shell pkg-config --libs cecil-flowanalysis)!g' -i {} \;
+
+echo "Updating Mono.GetOptions references"
+find -name "Makefile" -exec perl -pe 's!-r:\$\(OUTDIR\)/\$\(GETOPTIONS\)!-r Mono.GetOptions!g' -i {} \;
+
+echo "Deleting reject files (*.rej)"
+find -name "*.rej" -delete
Propchange: packages/db4o/trunk/debian/update_src_link_system_libs.sh
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-libs-commits
mailing list