[Pkg-cli-libs-commits] r4263 - in /packages/mysql-connector-net/trunk/debian: ./ patches/

directhex at users.alioth.debian.org directhex at users.alioth.debian.org
Thu Nov 5 23:33:22 UTC 2009 

Author: directhex
Date: Thu Nov  5 23:33:22 2009
New Revision: 4263

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4263
Log:
  * debian/rules,
    debian/control,
    debian/libmysql6.1-cil.*,
    debian/monodoc-mysql6.1-manual.*:
    + New ABI (6.1) compared to previous package. Bah.
  * debian/control,
    debian/libmysql6.1-cil.install,
    debian/libmysql-cil-dev:
    + Add a new -dev package
  * debian/control:
  * debian/libmysql-cil-dev.links:
    + We no longer include arbitrary Debian-specific symlinks for 
      pkgconfig files


Added:
    packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.install
      - copied, changed from r4261, packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.install
    packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.installcligac
      - copied, changed from r4261, packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.installcligac
    packages/mysql-connector-net/trunk/debian/monodoc-mysql6.1-manual.install
      - copied unchanged from r4261, packages/mysql-connector-net/trunk/debian/monodoc-mysql6.0-manual.install
    packages/mysql-connector-net/trunk/debian/monodoc-mysql6.1-manual.postinst
      - copied unchanged from r4261, packages/mysql-connector-net/trunk/debian/monodoc-mysql6.0-manual.postinst
Removed:
    packages/mysql-connector-net/trunk/debian/libmysql-cil-dev.links
    packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.install
    packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.installcligac
    packages/mysql-connector-net/trunk/debian/monodoc-mysql6.0-manual.install
    packages/mysql-connector-net/trunk/debian/monodoc-mysql6.0-manual.postinst
Modified:
    packages/mysql-connector-net/trunk/debian/README.Debian
    packages/mysql-connector-net/trunk/debian/changelog
    packages/mysql-connector-net/trunk/debian/control
    packages/mysql-connector-net/trunk/debian/copyright
    packages/mysql-connector-net/trunk/debian/libmysql-cil-dev.install
    packages/mysql-connector-net/trunk/debian/patches/fix-faulty-DEFINE.patch
    packages/mysql-connector-net/trunk/debian/patches/use-mono-key-for-signing.patch
    packages/mysql-connector-net/trunk/debian/rules
    packages/mysql-connector-net/trunk/debian/watch

Modified: packages/mysql-connector-net/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/README.Debian?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/README.Debian (original)
+++ packages/mysql-connector-net/trunk/debian/README.Debian Thu Nov  5 23:33:22 2009
@@ -1,4 +1,4 @@
 Online documentation for the MySQL Connector/NET can be found at:
 http://dev.mysql.com/doc/refman/5.0/en/connector-net.html
 
-Local API documentation can also be found in the monodoc-mysql5.0-manual package.
+Local API documentation can also be found in the monodoc-mysql6.1-manual package.

Modified: packages/mysql-connector-net/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/changelog?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/changelog (original)
+++ packages/mysql-connector-net/trunk/debian/changelog Thu Nov  5 23:33:22 2009
@@ -1,9 +1,13 @@
-mysql-connector-net (6.0.4-2) UNRELEASED; urgency=low
+mysql-connector-net (6.1.2-1) UNRELEASED; urgency=low
 
-  DO WE WANT TO USE A NEWER UPSTREAM - 6.1 OR 6.2?
   * Rename source package, at ftpmaster's request (and for general sanity)
+  * debian/rules,
+    debian/control,
+    debian/libmysql6.1-cil.*,
+    debian/monodoc-mysql6.1-manual.*:
+    + New ABI (6.1) compared to previous package. Bah.
   * debian/control,
-    debian/libmysql6.0-cil.install,
+    debian/libmysql6.1-cil.install,
     debian/libmysql-cil-dev:
     + Add a new -dev package
   * debian/control:
@@ -12,6 +16,9 @@
     + Policy-compliant get-orig-source location
   * debian/README.source:
     + Quilt readme
+  * debian/libmysql-cil-dev.links:
+    + We no longer include arbitrary Debian-specific symlinks for 
+      pkgconfig files
 
  -- Jo Shields <directhex at apebox.org>  Thu, 05 Nov 2009 00:12:23 +0000
 

Modified: packages/mysql-connector-net/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/control?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/control (original)
+++ packages/mysql-connector-net/trunk/debian/control Thu Nov  5 23:33:22 2009
@@ -14,10 +14,10 @@
  libmono-winforms2.0-cil
 Standards-Version: 3.8.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/
+Vcs-Svn: svn://svn.debian.org/pkg-cli-libs/packages/mysql-connector-net/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/
 
-Package: libmysql6.0-cil
+Package: libmysql6.1-cil
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
 Replaces: libmysql5.0-cil
@@ -30,8 +30,8 @@
 Package: libmysql-cil-dev
 Section: libdevel
 Architecture: all
-Depends: libmysql6.0-cil (= ${binary:Version}), ${misc:Depends}
-Replaces: libmysql5.0-cil, libmysql6.0-cil (<< 6.0.4-2)
+Depends: libmysql6.1-cil (= ${binary:Version}), ${misc:Depends}
+Replaces: 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.
@@ -39,11 +39,11 @@
  This package contains development files for Connector/NET and will always 
  pull in the current default version - and should be used for compilation.
 
-Package: monodoc-mysql6.0-manual
+Package: monodoc-mysql6.1-manual
 Architecture: all
 Section: doc
 Depends: monodoc-manual, ${misc:Depends}
-Conflicts: monodoc-mysql-manual, monodoc-mysql5.0-manual
+Conflicts: monodoc-mysql-manual, monodoc-mysql5.0-manual, monodoc-mysql6.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/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/copyright?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/copyright (original)
+++ packages/mysql-connector-net/trunk/debian/copyright Thu Nov  5 23:33:22 2009
@@ -1,5 +1,5 @@
 Name: MySQL Connector/NET
-Source: http://dev.mysql.com/downloads/connector/net/6.0.html
+Source: http://dev.mysql.com/downloads/connector/net/6.1.html
 
 Copyright: 2004-2009 MySQL AB
 License: GPL-2-MySQL

Modified: packages/mysql-connector-net/trunk/debian/libmysql-cil-dev.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/libmysql-cil-dev.install?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/libmysql-cil-dev.install (original)
+++ packages/mysql-connector-net/trunk/debian/libmysql-cil-dev.install Thu Nov  5 23:33:22 2009
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/pkgconfig/mysql-connector-net-6.0.pc /usr/lib/pkgconfig/
+debian/tmp/usr/lib/pkgconfig/mysql-connector-net.pc /usr/lib/pkgconfig/

Copied: packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.install (from r4261, packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.install)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.install?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.install (original)
+++ packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.install Thu Nov  5 23:33:22 2009
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/mysql-connector-net/MySql.Data.dll*	/usr/lib/cli/mysql-connector-net-6.0/
+debian/tmp/usr/lib/mysql-connector-net/MySql.Data.dll*	/usr/lib/cli/mysql-connector-net-6.1/

Copied: packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.installcligac (from r4261, packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.installcligac)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.installcligac?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/libmysql6.0-cil.installcligac (original)
+++ packages/mysql-connector-net/trunk/debian/libmysql6.1-cil.installcligac Thu Nov  5 23:33:22 2009
@@ -1,1 +1,1 @@
-/usr/lib/cli/mysql-connector-net-6.0/MySql.Data.dll
+/usr/lib/cli/mysql-connector-net-6.1/MySql.Data.dll

Modified: packages/mysql-connector-net/trunk/debian/patches/fix-faulty-DEFINE.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/patches/fix-faulty-DEFINE.patch?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/patches/fix-faulty-DEFINE.patch (original)
+++ packages/mysql-connector-net/trunk/debian/patches/fix-faulty-DEFINE.patch Thu Nov  5 23:33:22 2009
@@ -1,20 +1,20 @@
-Index: mysql-connector-net-6.0-6.0.3/MySql.Data/Provider/MySql.Data.csproj
+Index: mysql-connector-net-6.1.2/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>
+--- mysql-connector-net-6.1.2.orig/MySql.Data/Provider/MySql.Data.csproj	2009-01-01 00:00:00.000000000 +0000
++++ mysql-connector-net-6.1.2/MySql.Data/Provider/MySql.Data.csproj	2009-11-05 23:04:28.000000000 +0000
+@@ -91,7 +91,7 @@
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+     <DebugSymbols>true</DebugSymbols>
+     <OutputPath>bin\x86\Debug\</OutputPath>
 -    <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 @@
+     <BaseAddress>285212672</BaseAddress>
+     <DocumentationFile>doc.xml</DocumentationFile>
+     <PlatformTarget>x86</PlatformTarget>
+@@ -292,4 +292,4 @@
      <PostBuildEvent>
      </PostBuildEvent>
    </PropertyGroup>
 -</Project>
 \ No newline at end of file
-+</Project>
++</Project>

Modified: packages/mysql-connector-net/trunk/debian/patches/use-mono-key-for-signing.patch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/patches/use-mono-key-for-signing.patch?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/patches/use-mono-key-for-signing.patch (original)
+++ packages/mysql-connector-net/trunk/debian/patches/use-mono-key-for-signing.patch Thu Nov  5 23:33:22 2009
@@ -1,7 +1,7 @@
-Index: mysql-connector-net-5.0-6.0.4/MySql.Data/Provider/MySql.Data.csproj
+Index: mysql-connector-net-6.1.2/MySql.Data/Provider/MySql.Data.csproj
 ===================================================================
---- mysql-connector-net-5.0-6.0.4.orig/MySql.Data/Provider/MySql.Data.csproj	2009-07-07 11:20:42.000000000 +0100
-+++ mysql-connector-net-5.0-6.0.4/MySql.Data/Provider/MySql.Data.csproj	2009-07-07 11:21:32.000000000 +0100
+--- mysql-connector-net-6.1.2.orig/MySql.Data/Provider/MySql.Data.csproj	2009-11-05 23:04:54.000000000 +0000
++++ mysql-connector-net-6.1.2/MySql.Data/Provider/MySql.Data.csproj	2009-11-05 23:05:07.000000000 +0000
 @@ -11,12 +11,11 @@
      <AssemblyKeyContainerName>
      </AssemblyKeyContainerName>
@@ -26,16 +26,10 @@
      <OldToolsVersion>3.5</OldToolsVersion>
      <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
      <IsWebBootstrapper>false</IsWebBootstrapper>
-@@ -291,4 +290,4 @@
-     <PostBuildEvent>
-     </PostBuildEvent>
-   </PropertyGroup>
--</Project>
-+</Project>
-Index: mysql-connector-net-5.0-6.0.4/MySql.Data/Provider/Properties/AssemblyInfo.cs
+Index: mysql-connector-net-6.1.2/MySql.Data/Provider/Properties/AssemblyInfo.cs
 ===================================================================
---- mysql-connector-net-5.0-6.0.4.orig/MySql.Data/Provider/Properties/AssemblyInfo.cs	1970-01-01 01:00:00.000000000 +0100
-+++ mysql-connector-net-5.0-6.0.4/MySql.Data/Provider/Properties/AssemblyInfo.cs	2009-07-07 11:20:59.000000000 +0100
+--- mysql-connector-net-6.1.2.orig/MySql.Data/Provider/Properties/AssemblyInfo.cs	2009-01-01 00:00:00.000000000 +0000
++++ mysql-connector-net-6.1.2/MySql.Data/Provider/Properties/AssemblyInfo.cs	2009-11-05 23:05:07.000000000 +0000
 @@ -71,5 +71,4 @@
  //       documentation for more information on this.
  //

Modified: packages/mysql-connector-net/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/rules?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/rules (original)
+++ packages/mysql-connector-net/trunk/debian/rules Thu Nov  5 23:33:22 2009
@@ -6,8 +6,8 @@
 DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers | cut -d\  -f2)
 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 = 6.0
-DEB_CLI_API_VERSION = 6.0.4
+DEB_CLI_ABI_VERSION = 6.1
+DEB_CLI_API_VERSION = 6.1.2
 
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
@@ -43,11 +43,11 @@
 	
 	# pkg-config
 	install -D $(CURDIR)/debian/mysql-connector-net.pc \
-	           $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net-$(DEB_CLI_ABI_VERSION).pc
+	           $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net.pc
 	perl -pe 's/#VERSION#/$(VERSION)/' -i \
-	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net-$(DEB_CLI_ABI_VERSION).pc
+	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net.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
+	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/mysql-connector-net.pc
 	dh $@ --remaining
 
 clean: unpatch

Modified: packages/mysql-connector-net/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/mysql-connector-net/trunk/debian/watch?rev=4263&op=diff
==============================================================================
--- packages/mysql-connector-net/trunk/debian/watch (original)
+++ packages/mysql-connector-net/trunk/debian/watch Thu Nov  5 23:33:22 2009
@@ -1,2 +1,2 @@
 version=3
-http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/Connector-Net/[page=0] .*/mysql-connector-net-(6.0.[\d]+)-src.zip
+http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/Connector-Net/[page=0] .*/mysql-connector-net-(6.1.[\d]+)-src.zip

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