[Pkg-cli-libs-commits] [SCM] gdata-sharp branch, master, updated. debian/2.0.1.0-1-4-g766ed8e

Chow Loong Jin hyperair at debian.org
Sun Jun 3 03:19:52 UTC 2012


The following commit has been merged in the master branch:
commit a411836535db7e20e9c359c6b825ef2d309f496c
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jun 3 06:35:52 2012 +0800

    Handle ABI bump (2.0 -> 2.1)

diff --git a/debian/control b/debian/control
index 04f1a81..d81627d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/gdata-sharp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/gdata-sharp.git
 Homepage: http://code.google.com/p/google-gdata/
 
-Package: libgdata2.0-cil
+Package: libgdata2.1-cil
 Architecture: all
 Depends: ${misc:Depends}, ${cli:Depends}
 Description: Google GData CLI client library
@@ -41,7 +41,7 @@ Description: Google GData CLI client library
 
 Package: libgdata-cil-dev
 Architecture: all
-Depends: libgdata2.0-cil (= ${binary:Version}), ${misc:Depends}
+Depends: libgdata2.1-cil (= ${binary:Version}), ${misc:Depends}
 Description: Google GData CLI client library
  GData (Google data) is a set of Application Programming Interfaces (APIs) for
  the Common Language Infrastructure (CLI) which provide a simple protocol for
diff --git a/debian/libgdata2.0-cil.installcligac b/debian/libgdata2.0-cil.installcligac
deleted file mode 100644
index f5f0230..0000000
--- a/debian/libgdata2.0-cil.installcligac
+++ /dev/null
@@ -1,11 +0,0 @@
-/usr/lib/cli/Google.GData.AccessControl-2.0/Google.GData.AccessControl.dll
-/usr/lib/cli/Google.GData.Apps-2.0/Google.GData.Apps.dll
-/usr/lib/cli/Google.GData.Blogger-2.0/Google.GData.Blogger.dll
-/usr/lib/cli/Google.GData.Calendar-2.0/Google.GData.Calendar.dll
-/usr/lib/cli/Google.GData.Client-2.0/Google.GData.Client.dll
-/usr/lib/cli/Google.GData.Contacts-2.0/Google.GData.Contacts.dll
-/usr/lib/cli/Google.GData.Documents-2.0/Google.GData.Documents.dll
-/usr/lib/cli/Google.GData.Extensions-2.0/Google.GData.Extensions.dll
-/usr/lib/cli/Google.GData.Photos-2.0/Google.GData.Photos.dll
-/usr/lib/cli/Google.GData.Spreadsheets-2.0/Google.GData.Spreadsheets.dll
-/usr/lib/cli/Google.GData.YouTube-2.0/Google.GData.YouTube.dll
diff --git a/debian/libgdata2.0-cil.install b/debian/libgdata2.1-cil.install
similarity index 67%
rename from debian/libgdata2.0-cil.install
rename to debian/libgdata2.1-cil.install
index 347f2ed..c268f43 100644
--- a/debian/libgdata2.0-cil.install
+++ b/debian/libgdata2.1-cil.install
@@ -1,12 +1,12 @@
-debian/tmp/usr/lib/mono/gac/Google.GData.AccessControl/*/* /usr/lib/cli/Google.GData.AccessControl-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Analytics/*/* /usr/lib/cli/Google.GData.Analytics-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Apps/*/* /usr/lib/cli/Google.GData.Apps-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Blogger/*/* /usr/lib/cli/Google.GData.Blogger-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Calendar/*/* /usr/lib/cli/Google.GData.Calendar-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Client/*/* /usr/lib/cli/Google.GData.Client-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Contacts/*/* /usr/lib/cli/Google.GData.Contacts-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Documents/*/* /usr/lib/cli/Google.GData.Documents-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Extensions/*/* /usr/lib/cli/Google.GData.Extensions-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Photos/*/* /usr/lib/cli/Google.GData.Photos-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.Spreadsheets/*/* /usr/lib/cli/Google.GData.Spreadsheets-2.0/
-debian/tmp/usr/lib/mono/gac/Google.GData.YouTube/*/* /usr/lib/cli/Google.GData.YouTube-2.0/
+debian/tmp/usr/lib/mono/gac/Google.GData.AccessControl/*/* /usr/lib/cli/Google.GData.AccessControl-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Analytics/*/* /usr/lib/cli/Google.GData.Analytics-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Apps/*/* /usr/lib/cli/Google.GData.Apps-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Blogger/*/* /usr/lib/cli/Google.GData.Blogger-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Calendar/*/* /usr/lib/cli/Google.GData.Calendar-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Client/*/* /usr/lib/cli/Google.GData.Client-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Contacts/*/* /usr/lib/cli/Google.GData.Contacts-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Documents/*/* /usr/lib/cli/Google.GData.Documents-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Extensions/*/* /usr/lib/cli/Google.GData.Extensions-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Photos/*/* /usr/lib/cli/Google.GData.Photos-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.Spreadsheets/*/* /usr/lib/cli/Google.GData.Spreadsheets-2.1/
+debian/tmp/usr/lib/mono/gac/Google.GData.YouTube/*/* /usr/lib/cli/Google.GData.YouTube-2.1/
diff --git a/debian/libgdata2.1-cil.installcligac b/debian/libgdata2.1-cil.installcligac
new file mode 100644
index 0000000..fde9765
--- /dev/null
+++ b/debian/libgdata2.1-cil.installcligac
@@ -0,0 +1,11 @@
+/usr/lib/cli/Google.GData.AccessControl-2.1/Google.GData.AccessControl.dll
+/usr/lib/cli/Google.GData.Apps-2.1/Google.GData.Apps.dll
+/usr/lib/cli/Google.GData.Blogger-2.1/Google.GData.Blogger.dll
+/usr/lib/cli/Google.GData.Calendar-2.1/Google.GData.Calendar.dll
+/usr/lib/cli/Google.GData.Client-2.1/Google.GData.Client.dll
+/usr/lib/cli/Google.GData.Contacts-2.1/Google.GData.Contacts.dll
+/usr/lib/cli/Google.GData.Documents-2.1/Google.GData.Documents.dll
+/usr/lib/cli/Google.GData.Extensions-2.1/Google.GData.Extensions.dll
+/usr/lib/cli/Google.GData.Photos-2.1/Google.GData.Photos.dll
+/usr/lib/cli/Google.GData.Spreadsheets-2.1/Google.GData.Spreadsheets.dll
+/usr/lib/cli/Google.GData.YouTube-2.1/Google.GData.YouTube.dll
diff --git a/debian/patches/01_pkgconfig-paths.patch b/debian/patches/01_pkgconfig-paths.patch
index 98ce022..4538b5d 100644
--- a/debian/patches/01_pkgconfig-paths.patch
+++ b/debian/patches/01_pkgconfig-paths.patch
@@ -7,7 +7,7 @@ Index: gdata-sharp/misc/gdata-sharp-acl.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.AccessControl.dll
-+Libs: -r:${libdir}/cli/Google.GData.AccessControl-2.0/Google.GData.AccessControl.dll
++Libs: -r:${libdir}/cli/Google.GData.AccessControl-2.1/Google.GData.AccessControl.dll
 Index: gdata-sharp/misc/gdata-sharp-apps.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-apps.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -17,7 +17,7 @@ Index: gdata-sharp/misc/gdata-sharp-apps.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Apps.dll
-+Libs: -r:${libdir}/cli/Google.GData.Apps-2.0/Google.GData.Apps.dll
++Libs: -r:${libdir}/cli/Google.GData.Apps-2.1/Google.GData.Apps.dll
 Index: gdata-sharp/misc/gdata-sharp-blogger.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-blogger.pc.in	2011-11-25 19:51:10.000000000 +0800
@@ -27,7 +27,7 @@ Index: gdata-sharp/misc/gdata-sharp-blogger.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Blogger.dll
-+Libs: -r:${libdir}/cli/Google.GData.Blogger-2.0/Google.GData.Blogger.dll
++Libs: -r:${libdir}/cli/Google.GData.Blogger-2.1/Google.GData.Blogger.dll
 Index: gdata-sharp/misc/gdata-sharp-calendar.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-calendar.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -37,7 +37,7 @@ Index: gdata-sharp/misc/gdata-sharp-calendar.pc.in
  
  Requires: gdata-sharp-core gdata-sharp-acl
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Calendar.dll
-+Libs: -r:${libdir}/cli/Google.GData.Calendar-2.0/Google.GData.Calendar.dll
++Libs: -r:${libdir}/cli/Google.GData.Calendar-2.1/Google.GData.Calendar.dll
 Index: gdata-sharp/misc/gdata-sharp-contacts.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-contacts.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -47,7 +47,7 @@ Index: gdata-sharp/misc/gdata-sharp-contacts.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Contacts.dll
-+Libs: -r:${libdir}/cli/Google.GData.Contacts-2.0/Google.GData.Contacts.dll
++Libs: -r:${libdir}/cli/Google.GData.Contacts-2.1/Google.GData.Contacts.dll
 Index: gdata-sharp/misc/gdata-sharp-core.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-core.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -57,7 +57,7 @@ Index: gdata-sharp/misc/gdata-sharp-core.pc.in
  Version: @VERSION@
  
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Client.dll -r:${libdir}/mono/GData-Sharp/Google.GData.Extensions.dll
-+Libs: -r:${libdir}/cli/Google.GData.Client-2.0/Google.GData.Client.dll -r:${libdir}/cli/Google.GData.Extensions-2.0/Google.GData.Extensions.dll
++Libs: -r:${libdir}/cli/Google.GData.Client-2.1/Google.GData.Client.dll -r:${libdir}/cli/Google.GData.Extensions-2.1/Google.GData.Extensions.dll
 Index: gdata-sharp/misc/gdata-sharp-documents.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-documents.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -67,7 +67,7 @@ Index: gdata-sharp/misc/gdata-sharp-documents.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Documents.dll
-+Libs: -r:${libdir}/cli/Google.GData.Documents-2.0/Google.GData.Documents.dll
++Libs: -r:${libdir}/cli/Google.GData.Documents-2.1/Google.GData.Documents.dll
 Index: gdata-sharp/misc/gdata-sharp-photos.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-photos.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -77,7 +77,7 @@ Index: gdata-sharp/misc/gdata-sharp-photos.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Photos.dll
-+Libs: -r:${libdir}/cli/Google.GData.Photos-2.0/Google.GData.Photos.dll
++Libs: -r:${libdir}/cli/Google.GData.Photos-2.1/Google.GData.Photos.dll
 Index: gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-spreadsheets.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -87,7 +87,7 @@ Index: gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Spreadsheets.dll
-+Libs: -r:${libdir}/cli/Google.GData.Spreadsheets-2.0/Google.GData.Spreadsheets.dll
++Libs: -r:${libdir}/cli/Google.GData.Spreadsheets-2.1/Google.GData.Spreadsheets.dll
 Index: gdata-sharp/misc/gdata-sharp-youtube.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-youtube.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -97,7 +97,7 @@ Index: gdata-sharp/misc/gdata-sharp-youtube.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.YouTube.dll
-+Libs: -r:${libdir}/cli/Google.GData.YouTube-2.0/Google.GData.YouTube.dll
++Libs: -r:${libdir}/cli/Google.GData.YouTube-2.1/Google.GData.YouTube.dll
 Index: gdata-sharp/misc/gdata-sharp-analytics.pc.in
 ===================================================================
 --- gdata-sharp.orig/misc/gdata-sharp-analytics.pc.in	2011-11-25 19:51:11.000000000 +0800
@@ -107,4 +107,4 @@ Index: gdata-sharp/misc/gdata-sharp-analytics.pc.in
  
  Requires: gdata-sharp-core
 -Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Analytics.dll
-+Libs: -r:${libdir}/cli/Google.GData.Analytics-2.0/Google.GData.Analytics.dll
++Libs: -r:${libdir}/cli/Google.GData.Analytics-2.1/Google.GData.Analytics.dll
diff --git a/debian/patches/assemblyversion.patch b/debian/patches/assemblyversion.patch
index 89d05bb..0af5065 100644
--- a/debian/patches/assemblyversion.patch
+++ b/debian/patches/assemblyversion.patch
@@ -3,14 +3,14 @@ Description: Replace * with 0 in AssemblyVersion since we don't like wildcards
  in our assembly versions
 Index: gdata-sharp/version/AssemblyVersion.cs
 ===================================================================
---- gdata-sharp.orig/version/AssemblyVersion.cs	2012-05-20 18:56:59.000000000 +0800
-+++ gdata-sharp/version/AssemblyVersion.cs	2012-05-21 18:17:29.616686145 +0800
+--- gdata-sharp.orig/version/AssemblyVersion.cs	2012-06-03 06:26:21.000000000 +0800
++++ gdata-sharp/version/AssemblyVersion.cs	2012-06-03 06:35:18.346934004 +0800
 @@ -51,7 +51,7 @@
  // You can specify all the values or you can default the Revision and Build Numbers 
  // by using the '*' as shown below:
  
--[assembly: AssemblyVersion("2.0.1.*")]
-+[assembly: AssemblyVersion("2.0.1.0")]
+-[assembly: AssemblyVersion("2.1.0.*")]
++[assembly: AssemblyVersion("2.1.0.0")]
  
  
  
diff --git a/debian/rules b/debian/rules
index 9fa568c..c97b29e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
-DEB_CLI_API_VERSION = 2.0.1.0
-DEB_CLI_ABI_VERSION = 2.0
+DEB_CLI_API_VERSION = 2.1.0.0
+DEB_CLI_ABI_VERSION = 2.1
 
 override_dh_makeclilibs:
 	dh_makeclilibs -m$(DEB_CLI_API_VERSION)

-- 
gdata-sharp



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