Merge lp:~frederic-brin/zeitgeist-datasources/debian into lp:zeitgeist-datasources/0.8

[Duckx]

Hello,

This branch implements:
+ a fiew fixes on the build system
+ debian packaging

The packaging needs some improvements but for now builds packages for each modules.
This could help people tests the dataproviders if build through the ppa.

Regards,
Frédéric

[Michal Hruby (mhr3)]

Thanks for the contribution, I merged it up to rev 83, leaving the debian stuff up to RainCT.

[duckx (duckx-mezimail)]

Ok, it sounds fair to me ;)

Quoting Michal Hruby <email address hidden>:

> Thanks for the contribution, I merged it up to rev 83, leaving the
> debian stuff up to RainCT.
> --
> https://code.launchpad.net/~frederic-brin/zeitgeist-dataproviders/debian/+merge/29640
> You are the owner of lp:~frederic-brin/zeitgeist-dataproviders/debian.
>

[Michal Hruby (mhr3)]

According to RainCT, this is no longer necessary, so closing...

Unmerged revisions

87. By fred <fred@BigBoy> on 2010-07-10

Update control file.

Many depedencies were wrong. They are now all corrected.

86. By fred <fred@BigBoy> on 2010-07-10

Add debian packaging missing files

85. By fred <fred@BigBoy> on 2010-07-10

Remove trailing / from install files

84. By fred <fred@BigBoy> on 2010-07-10

First shot to create a debian package for zeitgeist-data providers

Curently builds packages for all actives providers

=== modified file 'chrome/Makefile.am'
--- chrome/Makefile.am	2010-06-08 00:49:06 +0000
+++ chrome/Makefile.am	2010-07-10 19:41:12 +0000
@@ -1,4 +1,4 @@
-chromeresourcedir = $(DESTDIR)/opt/google/chrome/resources/zeitgeist_plugin
+chromeresourcedir = /opt/google/chrome/resources/zeitgeist_plugin
 chromeresource_DATA = \
 	background.html \
 	content_script.js \

=== added directory 'debian'
=== added file 'debian/README.Debian'
--- debian/README.Debian	1970-01-01 00:00:00 +0000
+++ debian/README.Debian	2010-07-10 19:41:12 +0000
@@ -0,0 +1,6 @@
+zeitgeist-dataproviders for Debian
+----------------------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Frederic Brin <[e-mail]>  Sat, 10 Jul 2010 14:27:05 +0200

=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2010-07-10 19:41:12 +0000
@@ -0,0 +1,9 @@
+zeitgeist-dataproviders for Debian
+----------------------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+

=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2010-07-10 19:41:12 +0000
@@ -0,0 +1,6 @@
+zeitgeist-dataproviders (0.1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * 
+
+ -- Frederic Brin <[e-mail]>  Sat, 10 Jul 2010 15:52:57 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2010-07-10 19:41:12 +0000
@@ -0,0 +1,63 @@
+Source: zeitgeist-dataproviders
+Section: unknown
+Priority: extra
+Maintainer: Frederic Brin <[e-mail]>
+Build-Depends: cdbs, debhelper (>= 7.0.50~), libzeitgeist-dev, libgtk2.0-dev, valac (>=0.7.10), xulrunner-dev, libtotem-plparser-dev, geany
+Standards-Version: 3.8.4
+Homepage: http://launchpad.net/zeitgeist-dataproviders
+#Vcs-Git: git://git.debian.org/collab-maint/zeitgeist-dataproviders.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/zeitgeist-dataproviders.git;a=summary
+
+#Package: zeitgeist-dataproviders-bzr
+#Architecture: any
+#Depends: bzr, ${shlibs:Depends}, ${misc:Depends}
+#Description: Zeitgeist Dataprovider for bzr
+# <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-chrome
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for chrome
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-eog
+Architecture: any
+Depends: eog, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for eog
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-firefox
+Architecture: any
+Depends: firefox, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for eog
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-geany
+Architecture: any
+Depends: geany, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for geany
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-gedit
+Architecture: any
+Depends: gedit, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for gedit
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-rhythmbox
+Architecture: any
+Depends: rhythmbox, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for rhythmbox
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-totem
+Architecture: any
+Depends: totem, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for rhythmbox
+ <insert long description, indented with spaces>
+
+Package: zeitgeist-dataproviders-vim
+Architecture: any
+Depends: vim, ${shlibs:Depends}, ${misc:Depends}
+Description: Zeitgeist Dataprovider for vim
+ <insert long description, indented with spaces>

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2010-07-10 19:41:12 +0000
@@ -0,0 +1,50 @@
+This work was packaged for Debian by:
+
+    Frederic Brin <[e-mail]> on Sat, 10 Jul 2010 14:27:05 +0200
+
+It was downloaded from:
+
+    <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Firstname Lastname>
+    <likewise for another author>
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Frederic Brin <[e-mail]>
+
+# Please chose a license for your packaging work. If the program you package
+# uses a mainstream license, using the same license is the safest choice.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+# If you just want it to be GPL version 3, leave the following line in.
+
+and is licensed under the GPL version 3, see above.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2010-07-10 19:41:12 +0000
@@ -0,0 +1,2 @@
+README
+TODO

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2010-07-10 19:41:12 +0000
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+
+# Add here any variable or target overrides you need.

=== added file 'debian/zeitgeist-dataproviders-bzr.install'
--- debian/zeitgeist-dataproviders-bzr.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-bzr.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+usr/share/pyshared/bzrlib/plugins/zeitgeist

=== added file 'debian/zeitgeist-dataproviders-chrome.install'
--- debian/zeitgeist-dataproviders-chrome.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-chrome.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+opt/google/chrome/resources/zeitgeist_plugin

=== added file 'debian/zeitgeist-dataproviders-eog.install'
--- debian/zeitgeist-dataproviders-eog.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-eog.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+usr/lib/eog/plugins

=== added file 'debian/zeitgeist-dataproviders-firefox.install'
--- debian/zeitgeist-dataproviders-firefox.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-firefox.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,2 @@
+usr/share/mozilla/extensions
+usr/share/xul-ext-zeitgeist

=== added file 'debian/zeitgeist-dataproviders-gedit.install'
--- debian/zeitgeist-dataproviders-gedit.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-gedit.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+usr/lib/gedit-2/plugins

=== added file 'debian/zeitgeist-dataproviders-rhythmbox.install'
--- debian/zeitgeist-dataproviders-rhythmbox.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-rhythmbox.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+usr/lib/rhythmbox/plugins/zeitgeist-plugin

=== added file 'debian/zeitgeist-dataproviders-vim.install'
--- debian/zeitgeist-dataproviders-vim.install	1970-01-01 00:00:00 +0000
+++ debian/zeitgeist-dataproviders-vim.install	2010-07-10 19:41:12 +0000
@@ -0,0 +1,1 @@
+usr/share/vim/vim72/plugin

=== modified file 'firefox-libzg/extension/Makefile.am'
--- firefox-libzg/extension/Makefile.am	2010-06-27 18:36:12 +0000
+++ firefox-libzg/extension/Makefile.am	2010-07-10 19:41:12 +0000
@@ -22,8 +22,8 @@
 	$(NULL)
 
 install-exec-hook:
-	$(MKDIR_P) $(extensiondir)
-	test -h "$(EXTENSIONS_SYMLINK)" || $(LN_S) -f "$(xul_extdir)" "$(EXTENSIONS_SYMLINK)"
+	$(MKDIR_P) $(DESTDIR)$(extensiondir)
+	test -h "$(DESTDIR)$(EXTENSIONS_SYMLINK)" || $(LN_S) -f "$(DESTDIR)$(xul_extdir)" "$(DESTDIR)$(EXTENSIONS_SYMLINK)"
 
 # we want to allow also local install
 EXTENSION_CONTENT = \

=== modified file 'firefox-libzg/extension/components/Makefile.am'
--- firefox-libzg/extension/components/Makefile.am	2010-06-27 18:36:12 +0000
+++ firefox-libzg/extension/components/Makefile.am	2010-07-10 19:41:12 +0000
@@ -40,7 +40,8 @@
 	$(AM_V_GEN)$(LN_S) "`$(PKG_CONFIG) --variable includedir zeitgeist-1.0`/zeitgeist-1.0/zeitgeist.h" $@
 
 install-exec-hook:
-	test -h $(xul_extdir)/components || $(LN_S) -f $(zeitgeistmoduledir) $(xul_extdir)/components
+	test -d $(DESTDIR)$(xul_extdir) || $(MKDIR_P) $(DESTDIR)$(xul_extdir)
+	test -h $(DESTDIR)$(xul_extdir)/components || $(LN_S) -f $(DESTDIR)$(zeitgeistmoduledir) $(DESTDIR)$(xul_extdir)/components
 
 # small helper with local install
 local-install: all