[Pkg-cli-libs-commits] r3898 - in /packages/libgoogle-data-mono/trunk/debian: control install installcligac libgoogle-data-core1.2-cil.install patches/ patches/00list patches/01_makefile_respect_destdir.dpatch rules
raof-guest at users.alioth.debian.org
raof-guest at users.alioth.debian.org
Fri Nov 21 05:29:12 UTC 2008
Author: raof-guest
Date: Fri Nov 21 05:29:12 2008
New Revision: 3898
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3898
Log:
Don't break the lib into multiple binaries; the whole is self-contained and small
Actually install the libraries to the deb.
Add patch to make Makefile respect DESTDIR
Added:
packages/libgoogle-data-mono/trunk/debian/install (contents, props changed)
- copied, changed from r3892, packages/libgoogle-data-mono/trunk/debian/libgoogle-data-core1.2-cil.install
packages/libgoogle-data-mono/trunk/debian/installcligac
packages/libgoogle-data-mono/trunk/debian/patches/
packages/libgoogle-data-mono/trunk/debian/patches/00list
packages/libgoogle-data-mono/trunk/debian/patches/01_makefile_respect_destdir.dpatch (with props)
Removed:
packages/libgoogle-data-mono/trunk/debian/libgoogle-data-core1.2-cil.install
Modified:
packages/libgoogle-data-mono/trunk/debian/control
packages/libgoogle-data-mono/trunk/debian/rules
Modified: packages/libgoogle-data-mono/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libgoogle-data-mono/trunk/debian/control?rev=3898&op=diff
==============================================================================
--- packages/libgoogle-data-mono/trunk/debian/control (original)
+++ packages/libgoogle-data-mono/trunk/debian/control Fri Nov 21 05:29:12 2008
@@ -8,13 +8,12 @@
Section: libs
Homepage: http://code.google.com/p/google-gdata/
-Package: libgoogle-data-core1.2-cil
+Package: libgoogle-data1.2-cil
Section: libs
Architecture: all
Depends: ${cli:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Description: CLI libraries for access to Google services (Core libraries)
+ ${shlibs:Depends}
+Description: CLI libraries for access to Google services
Provides a set of CLI libraries to access Google services which
export a GData interface. These services include Blogger, Google
Calendar, Picasa, GMail contacts, and YouTube.
Copied: packages/libgoogle-data-mono/trunk/debian/install (from r3892, packages/libgoogle-data-mono/trunk/debian/libgoogle-data-core1.2-cil.install)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libgoogle-data-mono/trunk/debian/install?rev=3898&op=diff
==============================================================================
--- packages/libgoogle-data-mono/trunk/debian/libgoogle-data-core1.2-cil.install (original)
+++ packages/libgoogle-data-mono/trunk/debian/install Fri Nov 21 05:29:12 2008
@@ -1,1 +1,14 @@
-Sources/Library/VS2005/gdata/bin/Debug/*.dll usr/lib/cli/google-gdata-1.2/
+usr/lib/mono/gac/Google.GData.AccessControl/1.2*/* usr/lib/cli/Google.GData.AccessControl/
+usr/lib/mono/gac/Google.GData.Apps/1.2*/* usr/lib/cli/Google.GData.Apps/
+usr/lib/mono/gac/Google.GData.Blogger/1.2*/* usr/lib/cli/Google.GData.Blogger/
+usr/lib/mono/gac/Google.GData.Calendar/1.2*/* usr/lib/cli/Google.GData.Calendar/
+usr/lib/mono/gac/Google.GData.Client/1.2*/* usr/lib/cli/Google.GData.Client/
+usr/lib/mono/gac/Google.GData.CodeSearch/1.2*/* usr/lib/cli/Google.GData.CodeSearch/
+usr/lib/mono/gac/Google.GData.Contacts/1.2*/* usr/lib/cli/Google.GData.Contacts/
+usr/lib/mono/gac/Google.GData.Documents/1.2*/* usr/lib/cli/Google.GData.Documents/
+usr/lib/mono/gac/Google.GData.Extensions/1.2*/* usr/lib/cli/Google.GData.Extensions/
+usr/lib/mono/gac/Google.GData.GoogleBase/1.2*/* usr/lib/cli/Google.GData.GoogleBase/
+usr/lib/mono/gac/Google.GData.Health/1.2*/* usr/lib/cli/Google.GData.Health/
+usr/lib/mono/gac/Google.GData.Photos/1.2*/* usr/lib/cli/Google.GData.Photos/
+usr/lib/mono/gac/Google.GData.Spreadsheets/1.2*/* usr/lib/cli/Google.GData.Spreadsheets/
+usr/lib/mono/gac/Google.GData.YouTube/1.2*/* usr/lib/cli/Google.GData.YouTube/
Propchange: packages/libgoogle-data-mono/trunk/debian/install
------------------------------------------------------------------------------
svn:mergeinfo =
Added: packages/libgoogle-data-mono/trunk/debian/installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libgoogle-data-mono/trunk/debian/installcligac?rev=3898&op=file
==============================================================================
--- packages/libgoogle-data-mono/trunk/debian/installcligac (added)
+++ packages/libgoogle-data-mono/trunk/debian/installcligac Fri Nov 21 05:29:12 2008
@@ -1,0 +1,14 @@
+/usr/lib/cli/Google.GData.AccessControl/Google.GData.AccessControl.dll
+/usr/lib/cli/Google.GData.Apps/Google.GData.Apps.dll
+/usr/lib/cli/Google.GData.Blogger/Google.GData.Blogger.dll
+/usr/lib/cli/Google.GData.Calendar/Google.GData.Calendar.dll
+/usr/lib/cli/Google.GData.Client/Google.GData.Client.dll
+/usr/lib/cli/Google.GData.CodeSearch/Google.GData.CodeSearch.dll
+/usr/lib/cli/Google.GData.Contacts/Google.GData.Contacts.dll
+/usr/lib/cli/Google.GData.Documents/Google.GData.Documents.dll
+/usr/lib/cli/Google.GData.Extensions/Google.GData.Extensions.dll
+/usr/lib/cli/Google.GData.GoogleBase/Google.GData.GoogleBase.dll
+/usr/lib/cli/Google.GData.Health/Google.GData.Health.dll
+/usr/lib/cli/Google.GData.Photos/Google.GData.Photos.dll
+/usr/lib/cli/Google.GData.Spreadsheets/Google.GData.Spreadsheets.dll
+/usr/lib/cli/Google.GData.YouTube/Google.GData.YouTube.dll
Added: packages/libgoogle-data-mono/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libgoogle-data-mono/trunk/debian/patches/00list?rev=3898&op=file
==============================================================================
--- packages/libgoogle-data-mono/trunk/debian/patches/00list (added)
+++ packages/libgoogle-data-mono/trunk/debian/patches/00list Fri Nov 21 05:29:12 2008
@@ -1,0 +1,1 @@
+01_makefile_respect_destdir
Added: packages/libgoogle-data-mono/trunk/debian/patches/01_makefile_respect_destdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libgoogle-data-mono/trunk/debian/patches/01_makefile_respect_destdir.dpatch?rev=3898&op=file
==============================================================================
--- packages/libgoogle-data-mono/trunk/debian/patches/01_makefile_respect_destdir.dpatch (added)
+++ packages/libgoogle-data-mono/trunk/debian/patches/01_makefile_respect_destdir.dpatch Fri Nov 21 05:29:12 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_makefile_respect_destdir.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libgoogle-data-mono-1.2.3.0~/Makefile libgoogle-data-mono-1.2.3.0/Makefile
+--- libgoogle-data-mono-1.2.3.0~/Makefile 2008-10-06 22:25:01.000000000 +1100
++++ libgoogle-data-mono-1.2.3.0/Makefile 2008-11-20 17:50:40.000000000 +1100
+@@ -114,7 +114,7 @@
+ -rm *.sn *.dll *exe
+
+ install: all
+- for i in $(ALLLIBS); do gacutil -i $$i; done
++ for i in $(ALLLIBS); do gacutil -i -root "$(DESTDIR)/usr/lib" $$i; done
+
+ uninstall:
+ for i in $(ALLLIBS); do gacutil -u $$i; done
Propchange: packages/libgoogle-data-mono/trunk/debian/patches/01_makefile_respect_destdir.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/libgoogle-data-mono/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/libgoogle-data-mono/trunk/debian/rules?rev=3898&op=diff
==============================================================================
--- packages/libgoogle-data-mono/trunk/debian/rules (original)
+++ packages/libgoogle-data-mono/trunk/debian/rules Fri Nov 21 05:29:12 2008
@@ -3,19 +3,31 @@
include /usr/share/cli-common/cli.make
include /usr/share/dpatch/dpatch.make
-build: patch
+build: build-stamp
+
+build-stamp: patch
# The testsuite has tests which require an internet connection
# Don't run the tests until I can work out how to only run the
# non-internet requiring ones
dh build --before dh_auto_test
dh build --after dh_auto_test
+ touch $@
clean: unpatch
dh $@
+install: build
+ dh install --before dh_auto_install
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
+ dh install --after dh_auto_install
+ # Let's make sure we install _all_ the libs
+ dh install --before dh_install
+ dh_install --fail-missing
+ dh install --after dh_install
+
binary: binary-indep
binary-arch:
-binary-indep: build
+binary-indep: build install
dh $@
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean install binary-indep binary-arch binary
More information about the Pkg-cli-libs-commits
mailing list