[Pkg-cli-libs-commits] [SCM] gdata-sharp branch, master, updated. debian/1.9.0.0-2-14-g97316af
Chow Loong Jin
hyperair at debian.org
Sat Jun 2 21:30:49 UTC 2012
The following commit has been merged in the master branch:
commit 9b246392bd3d6f6cfebce0a55c5429e6c1b28cb8
Author: Chow Loong Jin <hyperair at debian.org>
Date: Mon May 21 18:19:07 2012 +0800
Refresh patches
diff --git a/debian/patches/00_build-system.patch b/debian/patches/00_build-system.patch
index 3264007..34d6d6d 100644
--- a/debian/patches/00_build-system.patch
+++ b/debian/patches/00_build-system.patch
@@ -1,8 +1,8 @@
Index: gdata-sharp/Makefile
===================================================================
---- gdata-sharp.orig/Makefile 2011-11-25 09:25:35.973972223 +0800
-+++ gdata-sharp/Makefile 2011-11-25 09:25:39.387328697 +0800
-@@ -131,7 +131,7 @@
+--- gdata-sharp.orig/Makefile 2012-05-20 18:56:58.949100787 +0800
++++ gdata-sharp/Makefile 2012-05-21 17:45:51.156365714 +0800
+@@ -119,7 +119,7 @@
for i in $(PKGCONFIG_FILES) ; do rm "$(DESTDIR)$(PKGCONFIGDIR)/$$i" ; done
tests: $(ALLLIBS)
diff --git a/debian/patches/01_pkgconfig-paths.patch b/debian/patches/01_pkgconfig-paths.patch
index bd7f91c..98ce022 100644
--- a/debian/patches/01_pkgconfig-paths.patch
+++ b/debian/patches/01_pkgconfig-paths.patch
@@ -1,130 +1,110 @@
Index: gdata-sharp/misc/gdata-sharp-acl.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-acl.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-acl.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-acl.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-acl.pc.in 2012-05-21 17:47:43.657052001 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.AccessControl.dll
-+Libs: -r:${libdir}/cli/Google.GData.AccessControl-1.9/Google.GData.AccessControl.dll
++Libs: -r:${libdir}/cli/Google.GData.AccessControl-2.0/Google.GData.AccessControl.dll
Index: gdata-sharp/misc/gdata-sharp-apps.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-apps.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-apps.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-apps.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-apps.pc.in 2012-05-21 17:47:43.657052001 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Apps.dll
-+Libs: -r:${libdir}/cli/Google.GData.Apps-1.9/Google.GData.Apps.dll
++Libs: -r:${libdir}/cli/Google.GData.Apps-2.0/Google.GData.Apps.dll
Index: gdata-sharp/misc/gdata-sharp-blogger.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-blogger.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-blogger.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-blogger.pc.in 2011-11-25 19:51:10.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-blogger.pc.in 2012-05-21 17:47:43.657052001 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Blogger.dll
-+Libs: -r:${libdir}/cli/Google.GData.Blogger-1.9/Google.GData.Blogger.dll
++Libs: -r:${libdir}/cli/Google.GData.Blogger-2.0/Google.GData.Blogger.dll
Index: gdata-sharp/misc/gdata-sharp-calendar.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-calendar.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-calendar.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-calendar.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-calendar.pc.in 2012-05-21 17:47:43.657052001 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core gdata-sharp-acl
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Calendar.dll
-+Libs: -r:${libdir}/cli/Google.GData.Calendar-1.9/Google.GData.Calendar.dll
-Index: gdata-sharp/misc/gdata-sharp-codesearch.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-codesearch.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-codesearch.pc.in 2011-11-25 09:18:26.191040944 +0800
-@@ -6,4 +6,4 @@
- Version: @VERSION@
-
- Requires: gdata-sharp-core
--Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.CodeSearch.dll
-+Libs: -r:${libdir}/cli/Google.GData.CodeSearch-1.9/Google.GData.CodeSearch.dll
++Libs: -r:${libdir}/cli/Google.GData.Calendar-2.0/Google.GData.Calendar.dll
Index: gdata-sharp/misc/gdata-sharp-contacts.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-contacts.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-contacts.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-contacts.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-contacts.pc.in 2012-05-21 17:47:43.657052001 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Contacts.dll
-+Libs: -r:${libdir}/cli/Google.GData.Contacts-1.9/Google.GData.Contacts.dll
++Libs: -r:${libdir}/cli/Google.GData.Contacts-2.0/Google.GData.Contacts.dll
Index: gdata-sharp/misc/gdata-sharp-core.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-core.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-core.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-core.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-core.pc.in 2012-05-21 17:47:43.657052001 +0800
@@ -5,4 +5,4 @@
Description: CLI bindings to Google's online services (Core libraries)
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-1.9/Google.GData.Client.dll -r:${libdir}/cli/Google.GData.Extensions-1.9/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
Index: gdata-sharp/misc/gdata-sharp-documents.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-documents.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-documents.pc.in 2011-11-25 09:18:26.191040944 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-documents.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-documents.pc.in 2012-05-21 17:47:43.660385354 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Documents.dll
-+Libs: -r:${libdir}/cli/Google.GData.Documents-1.9/Google.GData.Documents.dll
-Index: gdata-sharp/misc/gdata-sharp-health.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-health.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-health.pc.in 2011-11-25 09:18:26.194374300 +0800
-@@ -6,4 +6,4 @@
- Version: @VERSION@
-
- Requires: gdata-sharp-core
--Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Health.dll
-+Libs: -r:${libdir}/cli/Google.GData.Health-1.9/Google.GData.Health.dll
++Libs: -r:${libdir}/cli/Google.GData.Documents-2.0/Google.GData.Documents.dll
Index: gdata-sharp/misc/gdata-sharp-photos.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-photos.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-photos.pc.in 2011-11-25 09:18:26.194374300 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-photos.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-photos.pc.in 2012-05-21 17:47:43.660385354 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Photos.dll
-+Libs: -r:${libdir}/cli/Google.GData.Photos-1.9/Google.GData.Photos.dll
++Libs: -r:${libdir}/cli/Google.GData.Photos-2.0/Google.GData.Photos.dll
Index: gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-spreadsheets.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in 2011-11-25 09:18:26.194374300 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-spreadsheets.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in 2012-05-21 17:47:43.660385354 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Spreadsheets.dll
-+Libs: -r:${libdir}/cli/Google.GData.Spreadsheets-1.9/Google.GData.Spreadsheets.dll
++Libs: -r:${libdir}/cli/Google.GData.Spreadsheets-2.0/Google.GData.Spreadsheets.dll
Index: gdata-sharp/misc/gdata-sharp-youtube.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-youtube.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-youtube.pc.in 2011-11-25 09:18:26.194374300 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-youtube.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-youtube.pc.in 2012-05-21 17:47:43.660385354 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.YouTube.dll
-+Libs: -r:${libdir}/cli/Google.GData.YouTube-1.9/Google.GData.YouTube.dll
++Libs: -r:${libdir}/cli/Google.GData.YouTube-2.0/Google.GData.YouTube.dll
Index: gdata-sharp/misc/gdata-sharp-analytics.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-analytics.pc.in 2011-08-13 01:09:59.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-analytics.pc.in 2011-11-25 09:18:26.194374300 +0800
+--- gdata-sharp.orig/misc/gdata-sharp-analytics.pc.in 2011-11-25 19:51:11.000000000 +0800
++++ gdata-sharp/misc/gdata-sharp-analytics.pc.in 2012-05-21 17:50:21.371360554 +0800
@@ -6,4 +6,4 @@
Version: @VERSION@
Requires: gdata-sharp-core
-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Analytics.dll
-+Libs: -r:${libdir}/cli/Google.GData.Analytics.dll
++Libs: -r:${libdir}/cli/Google.GData.Analytics-2.0/Google.GData.Analytics.dll
diff --git a/debian/patches/assemblyversion.patch b/debian/patches/assemblyversion.patch
index 2fd4a4b..89d05bb 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 2011-11-25 09:22:12.000000000 +0800
-+++ gdata-sharp/version/AssemblyVersion.cs 2011-11-25 09:22:47.442826970 +0800
-@@ -54,7 +54,7 @@
+--- 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
+@@ -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("1.9.0.*")]
-+[assembly: AssemblyVersion("1.9.0.0")]
+-[assembly: AssemblyVersion("2.0.1.*")]
++[assembly: AssemblyVersion("2.0.1.0")]
diff --git a/debian/patches/series b/debian/patches/series
index 0d042a7..b90b04e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
00_build-system.patch
01_pkgconfig-paths.patch
assemblyversion.patch
-drop-gbase.patch
--
gdata-sharp
More information about the Pkg-cli-libs-commits
mailing list