[Pkg-cli-libs-commits] [SCM] gdata-sharp branch, master, updated. debian/1.8.0.0-1-7-g297a953
Chow Loong Jin
hyperair at ubuntu.com
Fri Nov 25 01:55:34 UTC 2011
The following commit has been merged in the master branch:
commit ce3466ee8ed557ec48b422f2eb8ee14e571cf2cd
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Fri Nov 25 09:23:16 2011 +0800
Refresh patches
diff --git a/debian/patches/00_build-system.patch b/debian/patches/00_build-system.patch
index 6a1007c..3264007 100644
--- a/debian/patches/00_build-system.patch
+++ b/debian/patches/00_build-system.patch
@@ -1,13 +1,13 @@
Index: gdata-sharp/Makefile
===================================================================
---- gdata-sharp.orig/Makefile 2011-02-10 10:31:46.295372901 +0800
-+++ gdata-sharp/Makefile 2011-02-10 10:31:47.572670311 +0800
-@@ -137,7 +137,7 @@
+--- 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 @@
for i in $(PKGCONFIG_FILES) ; do rm "$(DESTDIR)$(PKGCONFIGDIR)/$$i" ; done
tests: $(ALLLIBS)
- $(CSC) $(DEFINES) -target:library -out:unittests.dll $(ALLREFS) -r:nunit.framework.dll $(test_sources)
+ $(CSC) $(DEFINES) -target:library -out:unittests.dll $(ALLREFS) -pkg:nunit $(test_sources)
- gbase_customertool_sources = samples/gbase/example.cs \
- samples/gbase/customertool.cs \
+ gapps_sample_sources = samples/appsforyourdomain/appsdemo.cs
+ gapps_appsdemo.exe: $(ALLLIBS) $(gapps_sample_sources)
diff --git a/debian/patches/01_pkgconfig-paths.patch b/debian/patches/01_pkgconfig-paths.patch
index d879697..e90c260 100644
--- a/debian/patches/01_pkgconfig-paths.patch
+++ b/debian/patches/01_pkgconfig-paths.patch
@@ -1,7 +1,7 @@
Index: gdata-sharp/misc/gdata-sharp-acl.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-acl.pc.in 2011-02-10 10:32:08.446311299 +0800
-+++ gdata-sharp/misc/gdata-sharp-acl.pc.in 2011-02-11 02:19:49.650791230 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -10,28 +10,18 @@ Index: gdata-sharp/misc/gdata-sharp-acl.pc.in
+Libs: -r:${libdir}/cli/Google.GData.AccessControl-1.8/Google.GData.AccessControl.dll
Index: gdata-sharp/misc/gdata-sharp-apps.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-apps.pc.in 2011-02-10 10:32:08.506340944 +0800
-+++ gdata-sharp/misc/gdata-sharp-apps.pc.in 2011-02-11 02:19:49.650791230 +0800
+--- 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
@@ -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.8/Google.GData.Apps.dll
-Index: gdata-sharp/misc/gdata-sharp-base.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-base.pc.in 2011-02-10 10:32:08.482996082 +0800
-+++ gdata-sharp/misc/gdata-sharp-base.pc.in 2011-02-11 02:19:49.650791230 +0800
-@@ -6,4 +6,4 @@
- Version: @VERSION@
-
- Requires: gdata-sharp-core
--Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.GoogleBase.dll
-+Libs: -r:${libdir}/cli/Google.GData.GoogleBase-1.8/Google.GData.GoogleBase.dll
Index: gdata-sharp/misc/gdata-sharp-blogger.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-blogger.pc.in 2011-02-10 10:32:08.513010905 +0800
-+++ gdata-sharp/misc/gdata-sharp-blogger.pc.in 2011-02-11 02:19:49.650791230 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -40,8 +30,8 @@ Index: gdata-sharp/misc/gdata-sharp-blogger.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Blogger-1.8/Google.GData.Blogger.dll
Index: gdata-sharp/misc/gdata-sharp-calendar.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-calendar.pc.in 2011-02-10 10:32:08.452981261 +0800
-+++ gdata-sharp/misc/gdata-sharp-calendar.pc.in 2011-02-11 02:19:49.650791230 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -50,8 +40,8 @@ Index: gdata-sharp/misc/gdata-sharp-calendar.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Calendar-1.8/Google.GData.Calendar.dll
Index: gdata-sharp/misc/gdata-sharp-codesearch.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-codesearch.pc.in 2011-02-10 10:32:08.526350825 +0800
-+++ gdata-sharp/misc/gdata-sharp-codesearch.pc.in 2011-02-11 02:19:49.650791230 +0800
+--- 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@
@@ -60,8 +50,8 @@ Index: gdata-sharp/misc/gdata-sharp-codesearch.pc.in
+Libs: -r:${libdir}/cli/Google.GData.CodeSearch-1.8/Google.GData.CodeSearch.dll
Index: gdata-sharp/misc/gdata-sharp-contacts.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-contacts.pc.in 2011-02-10 10:32:08.466321182 +0800
-+++ gdata-sharp/misc/gdata-sharp-contacts.pc.in 2011-02-11 02:19:49.650791230 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -70,8 +60,8 @@ Index: gdata-sharp/misc/gdata-sharp-contacts.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Contacts-1.8/Google.GData.Contacts.dll
Index: gdata-sharp/misc/gdata-sharp-core.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-core.pc.in 2011-02-10 10:32:08.496336002 +0800
-+++ gdata-sharp/misc/gdata-sharp-core.pc.in 2011-02-11 02:22:37.516571682 +0800
+--- 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
@@ -5,4 +5,4 @@
Description: CLI bindings to Google's online services (Core libraries)
Version: @VERSION@
@@ -80,8 +70,8 @@ Index: gdata-sharp/misc/gdata-sharp-core.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Client-1.8/Google.GData.Client.dll -r:${libdir}/cli/Google.GData.Extensions-1.8/Google.GData.Extensions.dll
Index: gdata-sharp/misc/gdata-sharp-documents.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-documents.pc.in 2011-02-10 10:32:08.406291539 +0800
-+++ gdata-sharp/misc/gdata-sharp-documents.pc.in 2011-02-11 02:19:49.654124543 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -90,8 +80,8 @@ Index: gdata-sharp/misc/gdata-sharp-documents.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Documents-1.8/Google.GData.Documents.dll
Index: gdata-sharp/misc/gdata-sharp-health.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-health.pc.in 2011-02-10 10:32:08.436306359 +0800
-+++ gdata-sharp/misc/gdata-sharp-health.pc.in 2011-02-11 02:19:49.654124543 +0800
+--- 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@
@@ -100,8 +90,8 @@ Index: gdata-sharp/misc/gdata-sharp-health.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Health-1.8/Google.GData.Health.dll
Index: gdata-sharp/misc/gdata-sharp-photos.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-photos.pc.in 2011-02-10 10:32:08.422966439 +0800
-+++ gdata-sharp/misc/gdata-sharp-photos.pc.in 2011-02-11 02:19:49.654124543 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -110,8 +100,8 @@ Index: gdata-sharp/misc/gdata-sharp-photos.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Photos-1.8/Google.GData.Photos.dll
Index: gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-spreadsheets.pc.in 2011-02-10 10:32:08.476326122 +0800
-+++ gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in 2011-02-11 02:19:49.654124543 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -120,8 +110,8 @@ Index: gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in
+Libs: -r:${libdir}/cli/Google.GData.Spreadsheets-1.8/Google.GData.Spreadsheets.dll
Index: gdata-sharp/misc/gdata-sharp-youtube.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-youtube.pc.in 2011-02-10 10:32:08.416296479 +0800
-+++ gdata-sharp/misc/gdata-sharp-youtube.pc.in 2011-02-11 02:19:49.654124543 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
@@ -130,8 +120,8 @@ Index: gdata-sharp/misc/gdata-sharp-youtube.pc.in
+Libs: -r:${libdir}/cli/Google.GData.YouTube-1.8/Google.GData.YouTube.dll
Index: gdata-sharp/misc/gdata-sharp-analytics.pc.in
===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-analytics.pc.in 2011-02-11 02:21:44.810105798 +0800
-+++ gdata-sharp/misc/gdata-sharp-analytics.pc.in 2011-02-11 02:22:01.066711564 +0800
+--- 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
@@ -6,4 +6,4 @@
Version: @VERSION@
diff --git a/debian/patches/assemblyversion.patch b/debian/patches/assemblyversion.patch
index 3213c3e..2fd4a4b 100644
--- a/debian/patches/assemblyversion.patch
+++ b/debian/patches/assemblyversion.patch
@@ -3,11 +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-08-13 01:07:48.928660308 +0800
-+++ gdata-sharp/version/AssemblyVersion.cs 2011-08-13 01:08:10.878738556 +0800
-@@ -54,4 +54,4 @@
- // You can specify all the values or you can default the Revision and Build Numbers
+--- 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 @@
+ // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
--[assembly: AssemblyVersion("1.8.0.*")]
-+[assembly: AssemblyVersion("1.8.0.0")]
+-[assembly: AssemblyVersion("1.9.0.*")]
++[assembly: AssemblyVersion("1.9.0.0")]
+
+
+
--
gdata-sharp
More information about the Pkg-cli-libs-commits
mailing list