[Pkg-cli-libs-commits] [SCM] gdata-sharp branch, master, updated. upstream/1.4.0.2-15-g93f0627

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 93f06272e59cea44e24e4258bd8101260d58e907
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Mar 19 05:21:40 2009 +0800

    Organize patches, drop .dll.config
    
    * debian/rules:
      + Documented 02_cli-2.0-port.patch
      + Dropped documentation on 02_zlib-soname.patch and
        03_nunit-console.patch
    * debian/patches/02_zlib-soname.patch,
      debian/patches/03_nunit-console.patch:
      + Dropped
    * debian/install:
      + Drop .dll.config file from being installed since we're not using
        libz anymore

diff --git a/debian/changelog b/debian/changelog
index f2ea039..03aeed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,9 @@ gdata-sharp (1.4.0.2-1) UNRELEASED; urgency=low
     + Fix Makefile searching for nunit
   * debian/patches/01_pkgconfig-paths.patch:
     + Update the locations of the libraries
-  * debian/patches/02_zlib-soname.patch:
-    + Only use SONAME for versioning
-  * debian/patches/03_nunit-console.patch:
-    + Patch Makefile to use nunit-console instead of nunit-console2
+  * debian/patches/02_cli-2.0-port.patch:
+    + Patch to use System.IO.Compression.GZipStream instead of shipped
+      GZipStream
 
- -- Chow Loong Jin <hyperair at gmail.com>  Wed, 18 Mar 2009 14:26:46 +0800
+ -- Chow Loong Jin <hyperair at gmail.com>  Thu, 19 Mar 2009 05:20:24 +0800
 
diff --git a/debian/install b/debian/install
index 009c9f0..acfc8fb 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/mono/gac/*/*/* /usr/lib/cli/gdata-sharp-1.4/
 debian/tmp/usr/lib/pkgconfig
-misc/Google.GData.Client.dll.config /usr/lib/cli/gdata-sharp-1.4/
diff --git a/debian/patches/04_cli-2.0-port.patch b/debian/patches/02_cli-2.0-port.patch
similarity index 100%
rename from debian/patches/04_cli-2.0-port.patch
rename to debian/patches/02_cli-2.0-port.patch
diff --git a/debian/patches/02_zlib-soname.patch b/debian/patches/02_zlib-soname.patch
deleted file mode 100644
index d04170f..0000000
--- a/debian/patches/02_zlib-soname.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: gdata-sharp/misc/Google.GData.Client.dll.config
-===================================================================
---- gdata-sharp.orig/misc/Google.GData.Client.dll.config	2009-03-18 14:26:31.000000000 +0800
-+++ gdata-sharp/misc/Google.GData.Client.dll.config	2009-03-19 04:22:43.000000000 +0800
-@@ -1,4 +1,4 @@
- <configuration>
-     <!-- Map to libz.so.1.2.3 on everything but windows, as we ship it for windows. -->
--    <dllmap os="linux,osx,solaris,freebsd,openbsd,netbsd,aix,hpux" dll="zlib.x86.dll" target="libz.so.1.2.3"/>
-+    <dllmap os="linux,osx,solaris,freebsd,openbsd,netbsd,aix,hpux" dll="zlib.x86.dll" target="libz.so.1"/>
- </configuration>
diff --git a/debian/patches/03_nunit-console.patch b/debian/patches/03_nunit-console.patch
deleted file mode 100644
index a4c9e41..0000000
--- a/debian/patches/03_nunit-console.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gdata-sharp/Makefile
-===================================================================
---- gdata-sharp.orig/Makefile	2009-03-18 14:25:54.000000000 +0800
-+++ gdata-sharp/Makefile	2009-03-18 14:26:23.000000000 +0800
-@@ -176,7 +176,7 @@
- 
- 
- test:
--	nunit-console2 unittests.dll
-+	nunit-console unittests.dll
- 
- %.pc : %.pc.in
- 	sed "s,\@VERSION\@,$(VERSION),g; s,\@prefix\@,$(PREFIX),g" < $< > $@
diff --git a/debian/patches/series b/debian/patches/series
index 82bce19..9bae80c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 00_build-system.patch
 01_pkgconfig-paths.patch
-02_zlib-soname.patch
-03_nunit-console.patch
-04_cli-2.0-port.patch
+02_cli-2.0-port.patch

-- 
gdata-sharp