[Pkg-mono-svn-commits] rev 3083 - in db4o/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at alioth.debian.org
Thu Apr 26 22:05:19 UTC 2007 

Author: jsogo
Date: 2007-04-26 22:05:16 +0000 (Thu, 26 Apr 2007)
New Revision: 3083

Added:
   db4o/trunk/debian/db4o-6.1.pc
   db4o/trunk/debian/libdb4o6.1-cil.install
Removed:
   db4o/trunk/debian/db4o-6.0.pc
   db4o/trunk/debian/libdb4o6.0-cil.install
Modified:
   db4o/trunk/debian/changelog
   db4o/trunk/debian/control
   db4o/trunk/debian/copyright
   db4o/trunk/debian/installcligac
   db4o/trunk/debian/patches/makefile.dpatch
   db4o/trunk/debian/rules
Log:
  db4o (6.1.401-1)
   + Fix copyright file
   + ABI change: new package name
   + Change packaging to adapt to this change
   + makefile.dpatch:
      - use pkg-config where possible
      - do not copy libraries to building dir, instead, use system ones.



Modified: db4o/trunk/debian/changelog
===================================================================
--- db4o/trunk/debian/changelog	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/changelog	2007-04-26 22:05:16 UTC (rev 3083)
@@ -1,3 +1,18 @@
+db4o (6.1.401~dfsg-1) unstable; urgency=low
+
+  * New usptream release.
+  * Build Depend on Cecil.Flowanalysis
+  * Rewrite copyright file. It was a copy of tangerine's copyright, and were
+    not adapted to this package. Make clear that db4o is licensed under GPL.
+  * There is an ABI change, so make a new binary package: libdb4o6.1-cil
+  * Adapt packaging to this change.
+  * makefile.dpatch:
+     + Don't copy libraries from system to our building dir.
+     + Use pkg-config where possible
+     + Fix Mono.GetOptions reference
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Fri, 27 Apr 2007 00:03:26 +0200
+
 db4o (6.0.003~dfsg-2) unstable; urgency=low
 
   * Install Db4oAdmin.exe file in /usr/lib/db4o and a wrapper in /usr/bin

Modified: db4o/trunk/debian/control
===================================================================
--- db4o/trunk/debian/control	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/control	2007-04-26 22:05:16 UTC (rev 3083)
@@ -4,10 +4,10 @@
 Maintainer: Debian Mono Group <pkg-mono-group 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)
+Build-Depends-Indep: mono-gmcs (>= 1.1.6) | c-sharp-compiler, mono-gac, cli-common-dev (>= 0.4.4), libmono-cecil-flowanalysis0.1-cil
 Standards-Version: 3.7.2
 
-Package: libdb4o6.0-cil
+Package: libdb4o6.1-cil
 Architecture: all
 Depends: ${cli:Depends}
 Description: A native OODBMS for Mono

Modified: db4o/trunk/debian/copyright
===================================================================
--- db4o/trunk/debian/copyright	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/copyright	2007-04-26 22:05:16 UTC (rev 3083)
@@ -1,57 +1,42 @@
-This package was debianized by Brandon Hale <brandon at ubuntu.com> on
-Tue,  9 May 2006 17:17:33 -0400.
-It was updated and uploaded to Debian
+This package was debianized by Jose Carlos Garcia Sogo <jsogo at debian.org> on
+Sat, 11 Nov 2006 12:15:33 -0400.
 
-It was downloaded from http://www.snorp.net/log/tangerine/
+It was downloaded from http://www.db4o.com
 
 Copyright Holder: 
-Copyright (C) 2005-2006 James Willcox <snorp at snorp.net>
-Copyright (C) 2005 John McCutchan (src/inotify.h)
-Copyright (C) 2004 Novell, Inc. (src/inotify-glue.c)
+Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com
 
 License:
+   db4o is free software; you can redistribute it and/or modify it under
+   the terms of version 2 of the GNU General Public License as published
+   by the Free Software Foundation and as clarified by db4objects' GPL
+   interpretation policy, available at
+   http://www.db4o.com/about/company/legalpolicies/gplinterpretation/
+   Alternatively you can write to db4objects, Inc., 1900 S Norfolk Street,
+   Suite 350, San Mateo, CA 94403, USA.
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
+   db4o is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301 USA.
-
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-MuineDatabase.cs is (C) 2004 Tamara Roberson <tamara.roberson at gmail.com>
-and it is under GPL.
+This package also can contain the following software:
+     * http://mono-project.com/Cecil Mono.Cecil (MIT/X11)
+       Used inside Db4objects.Db4o.Tools.dll
+       Cecil is used to read the CIL code during native queries optimization.
+     * http://mono-project.com/Cecil Cecil.FlowAnalysis (MIT/X11)
+       Used inside Db4objects.Db4o.Tools.dll
+       Cecil.FlowAnalysis is used to analyse the CIL code during native queries optimization.
+     * http://mono-project.com/ Mono.GetOptions (MIT/X11)
+       Used inside Db4oAdmin.exe
+       Mono.GetOptions is used to parse the command line of the Db4oAdmin.exe tool.
 
-TagLib is (C) 2005-2006 Brian Nickel; (C) 2006 Novell, Inc. and
-it released under the terms of LGPL 2.1
-
-Mono.Zeroconf and inotify code are (C) 2006 Novell, Inc and
-under MIT license:
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
- 
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
- 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+Information above was took from License.html file as found at 
+doc/reference/html in source dir.

Deleted: db4o/trunk/debian/db4o-6.0.pc
===================================================================
--- db4o/trunk/debian/db4o-6.0.pc	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/db4o-6.0.pc	2007-04-26 22:05:16 UTC (rev 3083)
@@ -1,7 +0,0 @@
-prefix=/usr
-libdir=${prefix}/lib
-
-Name: db4o
-Description: db4o - embeddable OODBC engine
-Version: 6.0.1
-Libs: -r:${libdir}/cli/db4o-6.0/db4o.dll

Copied: db4o/trunk/debian/db4o-6.1.pc (from rev 3066, db4o/trunk/debian/db4o-6.0.pc)

Modified: db4o/trunk/debian/installcligac
===================================================================
--- db4o/trunk/debian/installcligac	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/installcligac	2007-04-26 22:05:16 UTC (rev 3083)
@@ -1,4 +1,4 @@
-/usr/lib/cli/db4o-6.0/Db4objects.Db4o.dll
-/usr/lib/cli/db4o-6.0/Db4objects.Db4o.Tools.dll
-/usr/lib/cli/db4o-6.0/Db4oUnit.dll
-/usr/lib/cli/db4o-6.0/Db4oUnit.Extensions.dll
+/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

Deleted: db4o/trunk/debian/libdb4o6.0-cil.install
===================================================================
--- db4o/trunk/debian/libdb4o6.0-cil.install	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/libdb4o6.0-cil.install	2007-04-26 22:05:16 UTC (rev 3083)
@@ -1,4 +0,0 @@
-usr/lib/cli/db4o/*.dll usr/lib/cli/db4o-6.0/
-usr/lib/cli/db4o/*.exe usr/lib/db4o
-usr/lib/pkgconfig
-usr/bin

Copied: db4o/trunk/debian/libdb4o6.1-cil.install (from rev 3066, db4o/trunk/debian/libdb4o6.0-cil.install)
===================================================================
--- db4o/trunk/debian/libdb4o6.0-cil.install	2007-04-17 21:43:31 UTC (rev 3066)
+++ db4o/trunk/debian/libdb4o6.1-cil.install	2007-04-26 22:05:16 UTC (rev 3083)
@@ -0,0 +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

Modified: db4o/trunk/debian/patches/makefile.dpatch
===================================================================
--- db4o/trunk/debian/patches/makefile.dpatch	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/patches/makefile.dpatch	2007-04-26 22:05:16 UTC (rev 3083)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad db4o-6.0.003~dfsg~/Makefile db4o-6.0.003~dfsg/Makefile
---- db4o-6.0.003~dfsg~/Makefile	2006-11-20 23:23:54.000000000 +0100
-+++ db4o-6.0.003~dfsg/Makefile	2006-12-06 15:26:38.000000000 +0100
+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
 @@ -6,16 +6,6 @@
  DIR_BIN=$(DIR_HOME)/bin
  DIR_SRC=$(DIR_HOME)/src
@@ -25,10 +25,52 @@
  
  MAIN_TEST=com.db4o.test.AllTests
  
-@@ -38,4 +28,4 @@
+@@ -39,4 +29,4 @@
  	cp -R $(DIR_DOC)/* $(DIR_INSTALL_DOC)
  endif
  
 -.PHONY: clean buildall
 \ No newline at end of file
 +.PHONY: clean buildall
+diff -urNad db4o-6.1.401~dfsg~/src/Db4oAdmin/Makefile db4o-6.1.401~dfsg/src/Db4oAdmin/Makefile
+--- db4o-6.1.401~dfsg~/src/Db4oAdmin/Makefile	2007-04-25 23:52:26.000000000 +0200
++++ db4o-6.1.401~dfsg/src/Db4oAdmin/Makefile	2007-04-25 23:55:18.000000000 +0200
+@@ -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 cecil-flowanalysis) -r:$(GETOPTIONS)
+diff -urNad db4o-6.1.401~dfsg~/src/Db4objects.Db4o.Tools/Makefile db4o-6.1.401~dfsg/src/Db4objects.Db4o.Tools/Makefile
+--- 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)
++REFERENCES = -r:$(OUTDIR)/$(CORE) $(shell pkg-config --libs mono-cecil cecil-flowanalysis)
+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:26.000000000 +0200
++++ db4o-6.1.401~dfsg/src/Makefile	2007-04-25 23:52:57.000000000 +0200
+@@ -15,7 +15,7 @@
+ 
+ prebuild:
+ 	[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
+-	cp $(LIBS)/*.dll $(OUTDIR)
++#	cp $(LIBS)/*.dll $(OUTDIR)
+ 
+ build: tests admin
+ 
+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
+-GETOPTIONS = Mono.GetOptions.dll
++GETOPTIONS = Mono.GetOptions
+ 
+ build: precompile compile postcompile
+ 

Modified: db4o/trunk/debian/rules
===================================================================
--- db4o/trunk/debian/rules	2007-04-25 15:15:22 UTC (rev 3082)
+++ db4o/trunk/debian/rules	2007-04-26 22:05:16 UTC (rev 3083)
@@ -25,6 +25,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp stamp-patched
 	-$(MAKE) clean
+	rm -rf src/bin
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	dh_clean 
 
@@ -37,8 +38,8 @@
 	$(MAKE) install
 
 	mkdir debian/tmp/usr/lib/pkgconfig
-	cp debian/db4o-6.0.pc debian/tmp/usr/lib/pkgconfig
-	ln -s debian/tmp/usr/lib/pkgconfig/db4o-6.0.pc debian/tmp/usr/lib/pkgconfig/db4o.pc
+	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
 
 	mkdir debian/tmp/usr/bin
 	cp debian/db4oadmin debian/tmp/usr/bin
@@ -47,6 +48,9 @@
 
 	-cd $(CURDIR)/debian && find -type f -name "*.dll" -exec chmod 644 {} \;
 
+	# Delete unneeded license files
+	rm -f debian/tmp/usr/lib/cli/db4o/*.txt
+
 binary-arch:
 binary-indep: build install
 	dh_testdir

More information about the Pkg-mono-svn-commits mailing list