[Pkg-cli-libs-commits] r4191 - in /packages: mysql-connector-net-5.0/trunk/debian/ mysql-connector-net-5.0/trunk/debian/patches/ mysql-connector-net-6.0/
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Fri Jun 12 11:09:15 UTC 2009
Author: directhex-guest
Date: Fri Jun 12 11:09:14 2009
New Revision: 4191
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4191
Log:
Re-use old source package name
Added:
packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.install
packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.installcligac
packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.links
packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.install
packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.postinst
packages/mysql-connector-net-5.0/trunk/debian/patches/fix-faulty-DEFINE.patch
packages/mysql-connector-net-5.0/trunk/debian/patches/remove-spurious-override.patch
packages/mysql-connector-net-5.0/trunk/debian/patches/series
packages/mysql-connector-net-5.0/trunk/debian/patches/use-mono-key-for-signing.patch
Removed:
packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.cligacpolicy
packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.install
packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.installcligac
packages/mysql-connector-net-5.0/trunk/debian/libmysql5.0-cil.links
packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql5.0-manual.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/patches/00list
packages/mysql-connector-net-5.0/trunk/debian/patches/remove_AssemblyKeyName.dpatch
packages/mysql-connector-net-6.0/
Modified:
packages/mysql-connector-net-5.0/trunk/debian/changelog
packages/mysql-connector-net-5.0/trunk/debian/control
packages/mysql-connector-net-5.0/trunk/debian/copyright
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/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/changelog?rev=4191&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/changelog (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/changelog Fri Jun 12 11:09:14 2009
@@ -1,17 +1,32 @@
-mysql-connector-net-5.0 (5.2.1+dfsg-3) unstable; urgency=low
+mysql-connector-net-5.0 (6.0.3-1) UNRELEASED; urgency=low
- [ Jo Shields ]
+ * New upstream release
+ * monodoc-mysql6.0-manual.postinst,
+ monodoc-mysql6.0-manual.prerm:
+ + With modern monodoc, no need to mangle the monodoc.xml index file
* debian/control:
- + No-change bump to Standards 3.8.0
- * debian/control,
- debian/rules:
- + Update for Mono 2.0 transition
-
- [ Mirco Bauer ]
+ + No-change bump to Standards 3.8.1
+ + Add a Conflicts on libmysql5.0-cil since both packages contain
+ a pcfile with the same name
+ + Add a Conflicts on monodoc-mysql6.0-cil since both packages contain
+ documentation files with the same name
+ + Switch from dpatch to quilt, for easier handling of conflicting patches
+ * debian/watch:
+ + Unmangle dfsg version
+ + Update to point to mirror - mangling mysql.com directly is painful
* debian/rules:
- + Call csc without path.
- * debian/watch:
- + Mangle dfsg version.
+ + Change ABI and API version
+ + get-orig-source rule
+ + Switch from manual compilation to using xbuild on the Visual Studio
+ project
+ * debian/patches/fix-faulty-DEFINE.patch:
+ + Tweak csproj file to change definition of "WINDOWS NET20" to just
+ "NET20" - the space was causing an issue
+ * debian/patches/remove-spurious-override.patch:
+ + Tweak source to remove "override" from non-overridden property
+ * debian/patches/use-mono-key-for-signing.patch:
+ + Switch to using our own uuencoded signing key rather than trying
+ to use the crypto store
-- Jo Shields <directhex at apebox.org> Sat, 07 Mar 2009 18:16:57 +0100
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=4191&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/control (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/control Fri Jun 12 11:09:14 2009
@@ -3,32 +3,33 @@
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 (>= 7), dpatch
+Build-Depends: debhelper (>= 7), quilt
Build-Depends-Indep: cli-common-dev (>= 0.5.7),
sharutils,
mono-devel (>= 2.0.1),
- libmono-dev,
- monodoc-base,
+ mono-xbuild,
+ monodoc-base (>= 2.0.1),
libmono-system2.0-cil,
libmono-system-data2.0-cil,
libmono-winforms2.0-cil
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
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/
+Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/mysql-connector-net-6.0/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-6.0/trunk/
-Package: libmysql5.0-cil
+Package: libmysql6.0-cil
Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, ${misc:Depends}
+Conflicts: libmysql5.0-cil
Description: MySQL database connector for CLI
The MySql.Data library is a fully managed (100% C#) driver for all CLI
languages (C#, VB.NET, Boo, Nemerle, etc) for accessing MySQL databases.
-Package: monodoc-mysql5.0-manual
+Package: monodoc-mysql6.0-manual
Architecture: all
Section: doc
-Depends: monodoc-manual
-Conflicts: monodoc-mysql-manual
+Depends: monodoc-manual, ${misc:Depends}
+Conflicts: monodoc-mysql-manual, monodoc-mysql5.0-manual
Description: compiled XML documentation for the MySql.Data library
The MonoDoc Project is the documentation framework of the Mono project which
provides detailed API documentation for all Mono components and the Mono CLI
Modified: packages/mysql-connector-net-5.0/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/copyright?rev=4191&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/copyright (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/copyright Fri Jun 12 11:09:14 2009
@@ -1,25 +1,25 @@
-This package was debianized by Mirco Bauer <meebey at debian.org> on
-Sat, 1 Dec 2007 19:16:43 +0200.
+This package was debianized by Jo Shields <directhex at apebox.org> on
+Thu, 11 Jun 2009 12:29:08 +0100.
It was downloaded from:
-http://dev.mysql.com/downloads/connector/net/5.0.html
+http://dev.mysql.com/downloads/connector/net/6.0.html
Upstream Authors:
Copyright:
-Copyright (C) 2004-2007 MySQL AB
-
-Driver/Source/zlib/*: (except ZOutputStream.cs and ZInputStream.cs)
+Copyright (C) 2004-2009 MySQL AB
+
+MySql.Data/Provider/Source/zlib/*: (except ZOutputStream.cs and ZInputStream.cs)
Copyright (c) 2006, ComponentAce
Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
-Driver/Source/zlib/{ZOutputStream.cs,ZInputStream.cs}:
+MySql.Data/Provider/Source/zlib/{ZOutputStream.cs,ZInputStream.cs}:
Copyright (c) 2006, ComponentAce
Copyright (c) 2001 Lapo Luchini.
License:
This library is covered under GPL-2 with the FLOSS exception.
-The Driver/Sources/zlib/ part is not covered by the GPL-2, for their licenses see below.
+The MySql.Data/Provider/Sources/zlib/ part is not covered by the GPL-2, for their licenses see below.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as published by
@@ -37,7 +37,7 @@
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Full text of the GPL-2 license may be found at
/usr/share/common-licenses/GPL-2.
@@ -165,7 +165,7 @@
Apache Portable Runtime (APR) Apache Software License 2.0
-------------------------------------------------------------------------------
-Driver/Sources/zlib/*:
+MySql.Data/Provider/Sources/zlib/*:
Copyright (c) 2006, ComponentAce
http://www.componentace.com
@@ -194,7 +194,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-------------------------------------------------------------------------------
-Driver/Sources/zlib/*:
+MySql.Data/Provider/Sources/zlib/*:
Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
Added: packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.install?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.install (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.install Fri Jun 12 11:09:14 2009
@@ -1,0 +1,2 @@
+debian/tmp/usr/lib/mysql-connector-net/MySql.Data.dll* /usr/lib/cli/mysql-connector-net-6.0/
+debian/tmp/usr/lib/pkgconfig/mysql-connector-net-6.0.pc /usr/lib/pkgconfig/
Added: packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.installcligac?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.installcligac (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.installcligac Fri Jun 12 11:09:14 2009
@@ -1,0 +1,1 @@
+/usr/lib/cli/mysql-connector-net-6.0/MySql.Data.dll
Added: packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.links?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.links (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/libmysql6.0-cil.links Fri Jun 12 11:09:14 2009
@@ -1,0 +1,1 @@
+usr/lib/pkgconfig/mysql-connector-net-6.0.pc usr/lib/pkgconfig/mysql-connector-net.pc
Added: packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.install?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.install (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.install Fri Jun 12 11:09:14 2009
@@ -1,0 +1,3 @@
+debian/tmp/usr/lib/mysql-connector-net/MySql.Data.tree /usr/lib/monodoc/sources/
+debian/tmp/usr/lib/mysql-connector-net/MySql.Data.zip /usr/lib/monodoc/sources/
+debian/MySql.Data.source /usr/lib/monodoc/sources/
Added: packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.postinst
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.postinst?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.postinst (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/monodoc-mysql6.0-manual.postinst Fri Jun 12 11:09:14 2009
@@ -1,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+ # 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/mysql-connector-net-5.0/trunk/debian/patches/fix-faulty-DEFINE.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/patches/fix-faulty-DEFINE.patch?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/patches/fix-faulty-DEFINE.patch (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/patches/fix-faulty-DEFINE.patch Fri Jun 12 11:09:14 2009
@@ -1,0 +1,20 @@
+Index: mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/MySql.Data.csproj
+===================================================================
+--- mysql-connector-net-6.0-6.0.3.orig/MySql.Data/Provider/MySql.Data.csproj 2009-06-11 11:29:55.000000000 +0100
++++ mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/MySql.Data.csproj 2009-06-11 11:30:12.000000000 +0100
+@@ -36,7 +36,7 @@
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+- <DefineConstants>TRACE;DEBUG;WINDOWS NET20</DefineConstants>
++ <DefineConstants>TRACE;DEBUG;NET20</DefineConstants>
+ <DocumentationFile>MySql.Data.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+@@ -237,4 +237,4 @@
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+-</Project>
+\ No newline at end of file
++</Project>
Added: packages/mysql-connector-net-5.0/trunk/debian/patches/remove-spurious-override.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/patches/remove-spurious-override.patch?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/patches/remove-spurious-override.patch (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/patches/remove-spurious-override.patch Fri Jun 12 11:09:14 2009
@@ -1,0 +1,13 @@
+Index: mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/Source/Connection.cs
+===================================================================
+--- mysql-connector-net-6.0-6.0.3.orig/MySql.Data/Provider/Source/Connection.cs 2009-06-11 11:29:04.000000000 +0100
++++ mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/Source/Connection.cs 2009-06-11 11:29:14.000000000 +0100
+@@ -277,7 +277,7 @@
+
+ #if !CF
+
+- protected override DbProviderFactory DbProviderFactory
++ protected DbProviderFactory DbProviderFactory
+ {
+ get
+ {
Added: packages/mysql-connector-net-5.0/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/patches/series?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/patches/series (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/patches/series Fri Jun 12 11:09:14 2009
@@ -1,0 +1,3 @@
+remove-spurious-override.patch
+fix-faulty-DEFINE.patch
+use-mono-key-for-signing.patch
Added: packages/mysql-connector-net-5.0/trunk/debian/patches/use-mono-key-for-signing.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net-5.0/trunk/debian/patches/use-mono-key-for-signing.patch?rev=4191&op=file
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/patches/use-mono-key-for-signing.patch (added)
+++ packages/mysql-connector-net-5.0/trunk/debian/patches/use-mono-key-for-signing.patch Fri Jun 12 11:09:14 2009
@@ -1,0 +1,44 @@
+Index: mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/MySql.Data.csproj
+===================================================================
+--- mysql-connector-net-6.0-6.0.3.orig/MySql.Data/Provider/MySql.Data.csproj 2009-06-11 12:01:26.000000000 +0100
++++ mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/MySql.Data.csproj 2009-06-11 12:05:44.000000000 +0100
+@@ -11,12 +11,11 @@
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>MySql.Data</AssemblyName>
+- <AssemblyOriginatorKeyFile>
+- </AssemblyOriginatorKeyFile>
++ <KeyOriginatorFile>..\..\debian\mysql.snk</KeyOriginatorFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+- <DelaySign>false</DelaySign>
++ <DelaySign>true</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>MySql.Data.MySqlClient</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+@@ -26,7 +25,7 @@
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+- <SignAssembly>false</SignAssembly>
++ <SignAssembly>true</SignAssembly>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+@@ -237,4 +236,4 @@
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+-</Project>
++</Project>
+Index: mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/Properties/AssemblyInfo.cs
+===================================================================
+--- mysql-connector-net-6.0-6.0.3.orig/MySql.Data/Provider/Properties/AssemblyInfo.cs 2009-06-11 12:01:24.000000000 +0100
++++ mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/Properties/AssemblyInfo.cs 2009-06-11 12:01:26.000000000 +0100
+@@ -82,5 +82,4 @@
+ // documentation for more information on this.
+ //
+ [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyName("ConnectorNet")]
+
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=4191&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/rules (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/rules Fri Jun 12 11:09:14 2009
@@ -2,47 +2,31 @@
export DH_VERBOSE=1
DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2)
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | 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
+DEB_CLI_ABI_VERSION = 6.0
+DEB_CLI_API_VERSION = 6.0.3
include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-build: patch-stamp
+build: $(QUILT_STAMPFN)
dh $@ --before build
# unpack signing key
cd debian && uudecode < snk.uu
# compile & sign lib
- mkdir -p bin
- resgen Driver/Properties/Resources.resx
- csc \
- -t:library \
- -out:bin/MySql.Data.dll \
- -keyfile:debian/mysql.snk \
- -doc:bin/MySql.Data.xml \
- -define:MONO,MONO2,NET20 \
- -resource:Driver/Properties/Resources.resources,MySql.Data.MySqlClient.Properties.Resources.resources \
- -resource:Driver/Properties/ReservedWords.txt,MySql.Data.MySqlClient.Properties.ReservedWords.txt \
- -r:System.Data \
- -r:System.Drawing \
- -r:System.Transactions \
- $(wildcard Driver/Properties/*.cs) \
- $(wildcard Driver/Source/*.cs) \
- $(wildcard Driver/Source/common/*.cs) \
- $(wildcard Driver/Source/Types/*.cs) \
- $(wildcard Driver/Source/zlib/*.cs)
+ resgen MySql.Data/Provider/Properties/Resources.resx
+ cd MySql.Data/Provider && xbuild MySql.Data.csproj
# build API docs
- mkdir -p bin/monodocer
- monodocer \
- -importslashdoc:$(CURDIR)/bin/MySql.Data.xml \
- --assembly:$(CURDIR)/bin/MySql.Data.dll \
- --path:$(CURDIR)/bin/monodocer;
- mdassembler \
- --out $(CURDIR)/bin/MySql.Data \
- --ecma $(CURDIR)/bin/monodocer
+ mdoc update \
+ -i $(CURDIR)/MySql.Data/Provider/MySql.Data.xml \
+ -o $(CURDIR)/MySql.Data/Provider/bin/Debug/monodocer \
+ $(CURDIR)/MySql.Data/Provider/bin/Debug/MySql.Data.dll
+ cd MySql.Data/Provider/bin/Debug && mdoc assemble -o MySql.Data monodocer
binary: binary-indep
binary-indep: install
@@ -54,7 +38,7 @@
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/
+ cp $(CURDIR)/MySql.Data/Provider/bin/Debug/MySql.Data.* $(CURDIR)/debian/tmp/usr/lib/mysql-connector-net/
# </$(MAKE) install>
# pkg-config
@@ -68,10 +52,24 @@
clean: unpatch
rm -f debian/mysql.snk
- rm -f Driver/Properties/Resources.resources
- rm -rf bin/
+ rm -f MySql.Data/Provider/Properties/Resources.resources
+ rm -rf MySql.Data/Provider/bin/
+ rm -f MySql.Data/Provider/MySql.Data.xml
dh $@
+get-orig-source:
+ [ -d ../tarballs ] || mkdir ../tarballs
+ uscan \
+ --force-download \
+ --download-version $(VERSION) \
+ --rename \
+ --destdir ../tarballs
+ mkdir ../tarballs/$(DEB_SOURCE_NAME)-$(VERSION)
+ unzip ../tarballs/mysql-connector-net-$(VERSION)-src.zip -d ../tarballs/$(DEB_SOURCE_NAME)-$(VERSION)
+ cd ../tarballs && tar --mtime=@0 -cf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar $(DEB_SOURCE_NAME)-$(VERSION)
+ gzip -9fn ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar
+ rm -r ../tarballs/$(DEB_SOURCE_NAME)-$(VERSION) ../tarballs/mysql-connector-net-$(VERSION)-src.zip
+
%:
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=4191&op=diff
==============================================================================
--- packages/mysql-connector-net-5.0/trunk/debian/watch (original)
+++ packages/mysql-connector-net-5.0/trunk/debian/watch Fri Jun 12 11:09:14 2009
@@ -1,3 +1,2 @@
version=3
-opts=dversionmangle=s/\+dfsg(\.\d+)?$// \
- http://dev.mysql.com/downloads/connector/net/5.2.html .*/mysql-connector-net-([\d\.]+)-src\.zip/.*
+http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/Connector-Net/[page=0] .*/mysql-connector-net-(6.0.[\d]+)-src.zip
More information about the Pkg-cli-libs-commits
mailing list