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

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 802e3d97917f63ca7d5831567266530c97070765
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Tue Mar 17 07:59:18 2009 +0800

    zlib depends and update changelog
    
    * debian/control:
      + Drop manual zlib1g depends, should be taken care by cli:Depends
    * debian/changelog:
      + Update patches descriptions
    * debian/patches/02_zlib-soname.patch:
      + Use .1 instead of .1.2.3.3

diff --git a/debian/changelog b/debian/changelog
index f2e0a83..c46372c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ gdata-sharp (1.4.0.2-1) unstable; urgency=low
   * Initial release (Closes: #519844)
   * debian/patches/00_build-system.patch:
     + Fix Makefile searching for nunit
+  * debian/patches/01_pkgconfig-paths.patch:
+    + Update the locations of the libraries
+  * debina/patches/02_zlib-soname.patch:
+    + Only use SONAME for versioning
 
- -- Chow Loong Jin <hyperair at gmail.com>  Mon, 16 Mar 2009 19:50:49 +0800
+ -- Chow Loong Jin <hyperair at gmail.com>  Tue, 17 Mar 2009 07:57:43 +0800
 
diff --git a/debian/control b/debian/control
index 3fb7ae8..40e6c10 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Homepage: http://code.google.com/p/google-gdata/
 
 Package: libgdata1.4-cil
 Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, zlib1g (>= 1:1.2.3)
+Depends: ${misc:Depends}, ${cli:Depends}
 Description: Google GData CLI client library
  The GData (Google data) APIs provide a simple protocol for reading and writing
  data on the web.
diff --git a/debian/patches/02_zlib-soname.patch b/debian/patches/02_zlib-soname.patch
index d81b1ef..a1d3e11 100644
--- a/debian/patches/02_zlib-soname.patch
+++ b/debian/patches/02_zlib-soname.patch
@@ -6,5 +6,5 @@ Index: gdata-sharp/misc/Google.GData.Client.dll.config
  <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.2.3.3"/>
++    <dllmap os="linux,osx,solaris,freebsd,openbsd,netbsd,aix,hpux" dll="zlib.x86.dll" target="libz.so.1"/>
  </configuration>

-- 
gdata-sharp