[Pkg-cli-libs-commits] r3724 - in /packages/mysql-connector-net-5.0/trunk/debian: ./ patches/
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Sun May 11 13:15:38 UTC 2008
Author: meebey
Date: Sun May 11 13:15:37 2008
New Revision: 3724
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3724
Log:
mysql-connector-net-5.0 5.2.1+dfsg-1 release
Added:
packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.cligacpolicy
packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net.pc
- copied, changed from r3475, packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net-5.0.pc
packages/mysql-connector-net-5.0/trunk/debian/patches/
packages/mysql-connector-net-5.0/trunk/debian/patches/00list
packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch (with props)
Removed:
packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net-5.0.pc
Modified:
packages/mysql-connector-net-5.0/trunk/debian/MySql.Data.source
packages/mysql-connector-net-5.0/trunk/debian/changelog
packages/mysql-connector-net-5.0/trunk/debian/compat
packages/mysql-connector-net-5.0/trunk/debian/control
packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.install
packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.postinst
packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.prerm
packages/mysql-connector-net-5.0/trunk/debian/rules
packages/mysql-connector-net-5.0/trunk/debian/watch
Modified: packages/mysql-connector-net-5.0/trunk/debian/MySql.Data.source
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/MySql.Data.source?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/MySql.Data.source (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/MySql.Data.source Sun May 11 13:15:37 2008
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<monodoc>
- <source provider="ecma" basefile="MySql.Data" path="classlib-mysql"/>
+ <source provider="ecma" basefile="MySql.Data" path="mysql"/>
</monodoc>
Modified: packages/mysql-connector-net-5.0/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/changelog?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/changelog (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/changelog Sun May 11 13:15:37 2008
@@ -1,3 +1,30 @@
+mysql-connector-net-5.0 (5.2.1+dfsg-1) unstable; urgency=low
+
+ * The "get sexy and ready for lenny" release
+ * DFSG version of mysql-connector-net 5.2.1
+ (deleted all pre-compiled binaries from the tarball)
+ + For the record here a list of the deleted files:
+ Installer/Binary/H2Reg.exe
+ Documentation/CollectionFiles/FixRegTables.exe
+ * New upstream release
+ * Changed the monodoc documentation node from "classlib-mysql" to "various".
+ * debian/control:
+ + Updated cli-common-dev build-dependency to >= 0.5.7
+ (needed for cli.make)
+ * debian/rules:
+ + Include /usr/share/cli-common/cli.make
+ + Migrated to debhelper v7 minimalistic style.
+ + Bumped clilibs to 5.2.1
+ * debian/libmysql5.0-cil.cligacpolicy:
+ + Install GAC policy file for 5.0.8.1 as they are ABI compatible.
+ * debian/patches/remove_AssemblyKeyName.dpatch:
+ + Remove AssemblyKeyName attribute from AssemblyInfo.cs, else gmcs will
+ ignore the passed keyfile.
+ * debiab/watch:
+ + Updated.
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 11 May 2008 15:13:21 +0200
+
mysql-connector-net-5.0 (5.0.8.1-1) unstable; urgency=low
* Initial release.
Modified: packages/mysql-connector-net-5.0/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/compat?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/compat (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/compat Sun May 11 13:15:37 2008
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/mysql-connector-net-5.0/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/control?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/control (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/control Sun May 11 13:15:37 2008
@@ -1,14 +1,20 @@
Source: mysql-connector-net-5.0
-Homepage: http://www.mysql.com/
-Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/
Section: libs
Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
Uploaders: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), sharutils, mono-gmcs (>= 1.0), libmono-dev, monodoc-base, libmono-system2.0-cil, libmono-system-data2.0-cil
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: cli-common-dev (>= 0.5.7),
+ sharutils,
+ mono-gmcs (>= 1.0),
+ libmono-dev,
+ monodoc-base,
+ libmono-system2.0-cil,
+ libmono-system-data2.0-cil
+Standards-Version: 3.7.3
+Homepage: http://www.mysql.com/
+Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/
Package: libmysql5.0-cil
Architecture: all
Added: packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.cligacpolicy
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.cligacpolicy?rev=3724&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.cligacpolicy (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.cligacpolicy Sun May 11 13:15:37 2008
@@ -1,0 +1,2 @@
+# SNK File Assembly Name Versions Assembly Ver. Priority
+debian/mysql.snk MySql.Data 5.0.8.1 5.2.1.0 10
Modified: packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.install?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.install (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.install Sun May 11 13:15:37 2008
@@ -1,2 +1,2 @@
-bin/MySql.Data.dll /usr/lib/cli/mysql-connector-net-5.0/
-debian/mysql-connector-net-5.0.pc /usr/lib/pkgconfig/
+debian/tmp/usr/lib/mysql-connector-net/MySql.Data.dll /usr/lib/cli/mysql-connector-net-5.0/
+debian/tmp/usr/lib/pkgconfig/mysql-connector-net-5.0.pc /usr/lib/pkgconfig/
Modified: packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.postinst
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.postinst?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.postinst (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.postinst Sun May 11 13:15:37 2008
@@ -1,17 +1,19 @@
#!/bin/sh
set -e
-# Add the MySql.Data node entry
-grep -v MySql /usr/lib/monodoc/monodoc.xml \
- | sed 's@^</node>@ <node label="MySql" name="classlib-mysql"/>\n</node>@' \
- > /usr/lib/monodoc/monodoc.xml.new
-mv -f /usr/lib/monodoc/monodoc.xml.new \
- /usr/lib/monodoc/monodoc.xml
-
-# Rebuild the index
-if [ -x /usr/lib/monodoc/browser.exe ]; then
- echo "generating monodoc search index..."
- monodoc --make-index > /dev/null
+if [ "$1" = "configure" ]; then
+ # Add the MySql.Data node entry
+ grep -v MySql /usr/lib/monodoc/monodoc.xml \
+ | sed 's@ <node label="Various" name="various">@ <node label="Various" name="various">\n <node label="MySql" name="mysql"/>@' \
+ > /usr/lib/monodoc/monodoc.xml.new
+ mv -f /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/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.prerm
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.prerm?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.prerm (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.prerm Sun May 11 13:15:37 2008
@@ -1,10 +1,10 @@
#!/bin/sh
set -e
-# Make sure the index is in exactly once
+# Remove the node entry
grep -v MySql /usr/lib/monodoc/monodoc.xml \
- > /usr/lib/monodoc/monodoc.xml.new
+ > /usr/lib/monodoc/monodoc.xml.new
mv /usr/lib/monodoc/monodoc.xml.new \
- /usr/lib/monodoc/monodoc.xml
+ /usr/lib/monodoc/monodoc.xml
#DEBHELPER#
Copied: packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net.pc (from r3475, packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net-5.0.pc)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net.pc?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net-5.0.pc (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/mysql-connector-net.pc Sun May 11 13:15:37 2008
@@ -4,5 +4,5 @@
Name: MySql.Data
Description: MySql.Data - MySQL connector for CLI
-Version: 5.0.8.1
-Libs: -r:${libdir}/cli/mysql-connector-net-5.0/MySql.Data.dll
+Version: #VERSION#
+Libs: -r:${libdir}/cli/mysql-connector-net-#DEB_CLI_ABI_VERSION#/MySql.Data.dll
Added: packages/mysql-connector-net-5.0/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/patches/00list?rev=3724&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/patches/00list (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/patches/00list Sun May 11 13:15:37 2008
@@ -1,0 +1,1 @@
+remove_AssemblyKeyName
Added: packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch?rev=3724&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch Sun May 11 13:15:37 2008
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_AssemblyKeyName.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 mysql-connector-net-5.2.1+dfsg~/Driver/Properties/AssemblyInfo.cs mysql-connector-net-5.2.1+dfsg/Driver/Properties/AssemblyInfo.cs
+--- mysql-connector-net-5.2.1+dfsg~/Driver/Properties/AssemblyInfo.cs 2008-02-22 13:23:06.000000000 +0100
++++ mysql-connector-net-5.2.1+dfsg/Driver/Properties/AssemblyInfo.cs 2008-05-03 18:02:19.000000000 +0200
+@@ -81,5 +81,4 @@
+ // documentation for more information on this.
+ //
+ [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyName("ConnectorNet")]
+
Propchange: packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/mysql-connector-net-5.0/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/rules?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/rules (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/rules Sun May 11 13:15:37 2008
@@ -1,25 +1,28 @@
#!/usr/bin/make -f
+export DH_VERBOSE=1
-#export DH_VERBOSE=1
-export MONO_SHARED_DIR=$(CURDIR)
+DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
+VERSION = $(shell echo $(DEB_VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
+DEB_CLI_ABI_VERSION = 5.0
+DEB_CLI_API_VERSION = 5.2.1
-configure: configure-stamp
-configure-stamp:
- dh_testdir
+include /usr/share/cli-common/cli.make
+include /usr/share/dpatch/dpatch.make
+
+build: patch-stamp
+ dh $@ --before build
+ # unpack signing key
cd debian && uudecode < snk.uu
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- mkdir -p bin/monodocer
- /usr/bin/gmcs \
+
+ # compile & sign lib
+ mkdir bin
+ gmcs \
-t:library \
-out:bin/MySql.Data.dll \
-keyfile:debian/mysql.snk \
-doc:bin/MySql.Data.xml \
-define:MONO,MONO2,NET20 \
- -resource:Driver/Source/Resources.resources,MySql.Data.MySqlClient.Source.Resources.resources \
+ -resource:Driver/Properties/Resources.resx,MySql.Data.MySqlClient.Properties.Resources.resources \
-resource:Driver/Properties/ReservedWords.txt,MySql.Data.MySqlClient.Source.ReservedWords.txt \
-r:System.Data \
-r:System.Drawing \
@@ -29,52 +32,44 @@
$(wildcard Driver/Source/common/*.cs) \
$(wildcard Driver/Source/Types/*.cs) \
$(wildcard Driver/Source/zlib/*.cs)
- /usr/bin/monodocer \
+
+ # build API docs
+ mkdir bin/monodocer
+ monodocer \
-importslashdoc:$(CURDIR)/bin/MySql.Data.xml \
--assembly:$(CURDIR)/bin/MySql.Data.dll \
--path:$(CURDIR)/bin/monodocer;
- /usr/bin/mdassembler \
+ mdassembler \
--out $(CURDIR)/bin/MySql.Data \
--ecma $(CURDIR)/bin/monodocer
- touch build-stamp
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+binary: binary-indep
+binary-indep: install
+ dh $@ --before dh_makeclilibs
+ dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
+ dh $@ --after dh_makeclilibs
+
+install: build
+ dh $@ --before dh_install
+ # <$(MAKE) install>
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/mysql-connector-net
+ cp $(CURDIR)/bin/MySql.Data.dll $(CURDIR)/debian/tmp/usr/lib/mysql-connector-net/
+ # </$(MAKE) install>
+
+ # pkg-config
+ install -D $(CURDIR)/debian/mysql-connector-net.pc \
+ $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net-$(DEB_CLI_ABI_VERSION).pc
+ perl -pe 's/#VERSION#/$(VERSION)/' -i \
+ $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net-$(DEB_CLI_ABI_VERSION).pc
+ perl -pe 's/#DEB_CLI_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/' -i \
+ $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net-$(DEB_CLI_ABI_VERSION).pc
+ dh $@ --remaining
+
+clean: unpatch
rm -f debian/mysql.snk
rm -rf bin/
- rm -rf $(CURDIR)/.wapi
- dh_clean
+
+ dh $@
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install
- dh_installchangelogs CHANGES
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_installcligac
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_clifixperms
- dh_installdeb
- dh_makeclilibs -V
- dh_clideps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+ dh $@
Modified: packages/mysql-connector-net-5.0/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/watch?rev=3724&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/watch (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/watch Sun May 11 13:15:37 2008
@@ -1,2 +1,2 @@
version=3
-http://dev.mysql.com/downloads/connector/net/5.0.html .*/mysql-connector-net-([\d\.]+)-src\.zip/.*
+http://dev.mysql.com/downloads/connector/net/5.2.html .*/mysql-connector-net-([\d\.]+)-src\.zip/.*
More information about the Pkg-cli-libs-commits
mailing list