[Pkg-cli-libs-commits] [SCM] gdata-sharp branch, master, updated. debian/1.4.0.2-2-7-g74548f7

Jo Shields jms at apebox.org
Mon Nov 23 13:06:21 UTC 2009


The following commit has been merged in the master branch:
commit ec9cfa529a3ade57368f195a0eecaf03a93c991e
Author: Jo Shields <jms at apebox.org>
Date:   Mon Nov 23 12:44:46 2009 +0000

    Try again, with DOS line-endings

diff --git a/debian/patches/01_pkgconfig-paths.patch b/debian/patches/01_pkgconfig-paths.patch
index 397f4df..5184246 100644
--- a/debian/patches/01_pkgconfig-paths.patch
+++ b/debian/patches/01_pkgconfig-paths.patch
@@ -1,130 +1,117 @@
-Index: gdata-sharp/misc/gdata-sharp-acl.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-acl.pc.in	2009-03-16 23:07:37.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-acl.pc.in	2009-03-16 23:08:41.000000000 +0800
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-acl.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-acl.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-acl.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-acl.pc.in	2009-11-23 12:42:07.481115990 +0000
 @@ -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.4/Google.GData.AccessControl.dll
-Index: gdata-sharp/misc/gdata-sharp-apps.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-apps.pc.in	2009-03-16 23:07:37.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-apps.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.AccessControl.dll
++Libs: -r:${libdir}/cli/Google.GData.AccessControl-1.4/Google.GData.AccessControl.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-apps.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-apps.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-apps.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-apps.pc.in	2009-11-23 12:42:21.451114755 +0000
 @@ -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.4/Google.GData.Apps.dll
-Index: gdata-sharp/misc/gdata-sharp-base.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-base.pc.in	2009-03-16 23:07:37.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-base.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Apps.dll
++Libs: -r:${libdir}/cli/Google.GData.Apps-1.4/Google.GData.Apps.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-base.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-base.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-base.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-base.pc.in	2009-11-23 12:42:28.031114243 +0000
 @@ -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.4/Google.GData.GoogleBase.dll
-Index: gdata-sharp/misc/gdata-sharp-blogger.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-blogger.pc.in	2009-03-16 23:07:37.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-blogger.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.GoogleBase.dll
++Libs: -r:${libdir}/cli/Google.GData.GoogleBase-1.4/Google.GData.GoogleBase.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-blogger.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-blogger.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-blogger.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-blogger.pc.in	2009-11-23 12:42:34.741102937 +0000
 @@ -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.4/Google.GData.Blogger.dll
-Index: gdata-sharp/misc/gdata-sharp-calendar.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-calendar.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-calendar.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Blogger.dll
++Libs: -r:${libdir}/cli/Google.GData.Blogger-1.4/Google.GData.Blogger.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-calendar.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-calendar.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-calendar.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-calendar.pc.in	2009-11-23 12:42:40.441115727 +0000
 @@ -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.4/Google.GData.Calendar.dll
-Index: gdata-sharp/misc/gdata-sharp-codesearch.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-codesearch.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-codesearch.pc.in	2009-03-16 23:08:41.000000000 +0800
+ 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.4/Google.GData.Calendar.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-codesearch.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-codesearch.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-codesearch.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-codesearch.pc.in	2009-11-23 12:42:46.981103280 +0000
 @@ -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.4/Google.GData.CodeSearch.dll
-Index: gdata-sharp/misc/gdata-sharp-contacts.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-contacts.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-contacts.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.CodeSearch.dll
++Libs: -r:${libdir}/cli/Google.GData.CodeSearch-1.4/Google.GData.CodeSearch.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-contacts.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-contacts.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-contacts.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-contacts.pc.in	2009-11-23 12:42:53.703637215 +0000
 @@ -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.4/Google.GData.Contacts.dll
-Index: gdata-sharp/misc/gdata-sharp-core.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-core.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-core.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Contacts.dll
++Libs: -r:${libdir}/cli/Google.GData.Contacts-1.4/Google.GData.Contacts.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-core.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-core.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-core.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-core.pc.in	2009-11-23 12:42:59.623636542 +0000
 @@ -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.4/Google.GData.Client.dll -r:${libdir}/cli/Google.GData.Extensions-1.4/Google.GData.Extensions.dll
-Index: gdata-sharp/misc/gdata-sharp-documents.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-documents.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-documents.pc.in	2009-03-16 23:08:41.000000000 +0800
+ 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.4/Google.GData.Client.dll -r${libdir}/cli/Google.GData.Extensions-1.4/Google.GData.Extensions.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-documents.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-documents.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-documents.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-documents.pc.in	2009-11-23 12:43:07.191115088 +0000
 @@ -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.4/Google.GData.Documents.dll
-Index: gdata-sharp/misc/gdata-sharp-health.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-health.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-health.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Documents.dll
++Libs: -r:${libdir}/cli/Google.GData.Documents-1.4/Google.GData.Documents.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-health.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-health.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-health.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-health.pc.in	2009-11-23 12:43:13.531113482 +0000
 @@ -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.4/Google.GData.Health.dll
-Index: gdata-sharp/misc/gdata-sharp-photos.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-photos.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-photos.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Health.dll
++Libs: -r:${libdir}/cli/Google.GData.Health-1.4/Google.GData.Health.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-photos.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-photos.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-photos.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-photos.pc.in	2009-11-23 12:43:20.241110909 +0000
 @@ -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.4/Google.GData.Photos.dll
-Index: gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-spreadsheets.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-spreadsheets.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Photos.dll
++Libs: -r:${libdir}/cli/Google.GData.Photos-1.4/Google.GData.Photos.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-spreadsheets.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-spreadsheets.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-spreadsheets.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-spreadsheets.pc.in	2009-11-23 12:43:24.551114412 +0000
 @@ -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.4/Google.GData.Spreadsheets.dll
-Index: gdata-sharp/misc/gdata-sharp-youtube.pc.in
-===================================================================
---- gdata-sharp.orig/misc/gdata-sharp-youtube.pc.in	2009-03-16 23:07:38.000000000 +0800
-+++ gdata-sharp/misc/gdata-sharp-youtube.pc.in	2009-03-16 23:08:41.000000000 +0800
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.Spreadsheets.dll
++Libs: -r:${libdir}/cli/Google.GData.Spreadsheets-1.4/Google.GData.Spreadsheets.dll
+diff -urNad gdata-sharp-1.4.0.2~/misc/gdata-sharp-youtube.pc.in gdata-sharp-1.4.0.2/misc/gdata-sharp-youtube.pc.in
+--- gdata-sharp-1.4.0.2~/misc/gdata-sharp-youtube.pc.in	2009-11-23 12:39:02.243604592 +0000
++++ gdata-sharp-1.4.0.2/misc/gdata-sharp-youtube.pc.in	2009-11-23 12:43:29.981112567 +0000
 @@ -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.4/Google.GData.YouTube.dll
+ Version: @VERSION@
+ 
+ Requires: gdata-sharp-core
+-Libs: -r:${libdir}/mono/GData-Sharp/Google.GData.YouTube.dll
++Libs: -r:${libdir}/cli/Google.GData.YouTube-1.4/Google.GData.YouTube.dll

-- 
gdata-sharp



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