Merge lp:~gilir/zeitgeist-datasources/debian into lp:~zeitgeist-dataproviders/zeitgeist-datasources/debian

[Julien Lavergne]

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

I checked the deb given by ~mhr3 in this link[1] which is built using this branch. Works fine

[1] - https://launchpad.net/~gilir/+archive/unstable/+files/xul-ext-zeitgeist-datasource_0.1.0%7Ebzr20110210-0%7Eppa1_amd64.deb

review: Approve (build install)

[Siegfried Gevatter (rainct)]

Thank you for working on this. A couple comments:

a) I don't like uploading any new CDBS packages. According to http://wiki.debian.org/mozilla-devscripts it seems like dh7 should work too.

b) This is failing to build on my system (Debian unstable):
-------------------------------------------------------
make[4]: Entering directory `/home/rainct/Desenvolupament/Packaging_Debian/zeitgeist-datasources/build-area/zeitgeist-datasources-0.1.0~bzr20110307/firefox-libzg/extension/components'
ln -s "`/usr/bin/pkg-config --variable includedir zeitgeist-1.0`/zeitgeist-1.0/zeitgeist.h" zeitgeist-library.h
/usr/lib/xulrunner-devel-1.9.1/bin/xpidl -m header -I /usr/share/idl/xulrunner-1.9.1 -o zeitgeist zeitgeist.idl
./zeitgeist.idl:25: can't open included file nsISupports.idl for reading

input callback returned failure
make[4]: *** [zeitgeist.h] Error 2
-------------------------------------------------------

review: Needs Fixing

[Michal Hruby (mhr3)]

As for > b) This is failing to build on my system (Debian unstable):

This would be a build system issue, but looking that you're using xul 1.9.1, that's for FF 3.5 which is quite old now, let's say we only support FF 3.6 and therefore xul 1.9.2. :)

[Julien Lavergne (gilir)]

Cool ! I wasn't aware dh7 have support for xul extension. I'll try to update the branch later with the fix.

[Siegfried Gevatter (rainct)]

Awesome, thanks for working on this.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-07 14:11:29 +0000
+++ debian/changelog	2011-03-09 21:58:58 +0000
@@ -1,4 +1,23 @@
+<<<<<<< TREE
 zeitgeist-datasources (0.1.0~bzr20110307-1) unstable; urgency=low
+=======
+zeitgeist-datasources (0.1.0~bzr20110210-0~ppa1) UNRELEASED; urgency=low
+
+  * debian/rules:
+   - Update to use --with xul-ext.
+  * debian/control:
+   - Enable xul-ext-zeitgeist-datasource
+   - Add ${xpi:Depends}, ${xpi:Recommends}, Provides: ${xpi:Provides} and
+     ${xpi:Enhances} to xul-ext-zeitgeist-datasource.
+   - Build-depends on mozilla-devscripts to use xpi rules.
+   - Set build-depends xulrunner-dev (>= 1.9.2)
+  * debian/xul-ext-zeitgeist-datasource.install
+   - Remove
+
+ -- Julien Lavergne <[e-mail]>  Sun, 06 Mar 2011 17:47:28 +0100
+
+zeitgeist-datasources (0.1.0~bzr20101102-0~ppa1) experimental; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * Initial packaging (Closes: #617247).
     Thanks to Frederic Brin for the initial work on this package.

=== modified file 'debian/control'
--- debian/control	2010-11-03 10:43:13 +0000
+++ debian/control	2011-03-09 21:58:58 +0000
@@ -3,10 +3,11 @@
 Priority: optional
 Maintainer: Siegfried-Angel Gevatter Pujals <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
+ mozilla-devscripts (>= 0.22~),
  libzeitgeist-dev,
  libgtk2.0-dev,
  valac (>= 0.7.10),
- xulrunner-dev,
+ xulrunner-dev (>= 1.9.2),
  libtotem-plparser-dev,
  geany,
  emacs
@@ -46,20 +47,22 @@
 # This package contains an extension for the Chromium browser that will
 # log events such as page visits into Zeitgeist.
 
-#Package: xul-ext-zeitgeist-datasource
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, zeitgeist-core, libzeitgeist-1.0-0, iceweasel | firefox
-#Enhances: zeitgeist-core, iceweasel, firefox
-#Description: Zeitgeist Dataprovider for Firefox
-# Zeitgeist is a service which logs the user's activities and events (files
-# opened, websites visited, conversations hold with other people, etc.) and
-# makes the relevant information available to other applications.
-# .
-# It serves as a comprehensive activity log and also makes it possible to
-# determine relationships between items based on usage patterns.
-# .
-# This package contains an extension for Firefox/Iceweasel that will log events
-# such as page visits into Zeitgeist.
+Package: xul-ext-zeitgeist-datasource
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xpi:Depends}, zeitgeist-core, libzeitgeist-1.0-0, iceweasel | firefox
+Recommends: ${xpi:Recommends}
+Provides: ${xpi:Provides}
+Enhances: zeitgeist-core, iceweasel, firefox, ${xpi:Enhances}
+Description: Zeitgeist Dataprovider for Firefox
+ Zeitgeist is a service which logs the user's activities and events (files
+ opened, websites visited, conversations hold with other people, etc.) and
+ makes the relevant information available to other applications.
+ .
+ It serves as a comprehensive activity log and also makes it possible to
+ determine relationships between items based on usage patterns.
+ .
+ This package contains an extension for Firefox/Iceweasel that will log events
+ such as page visits into Zeitgeist.
 
 Package: zeitgeist-datasource-emacs
 Architecture: all

=== modified file 'debian/rules'
--- debian/rules	2010-10-30 15:08:50 +0000
+++ debian/rules	2011-03-09 21:58:58 +0000
@@ -1,4 +1,16 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with xul-ext
+
+override_dh_auto_build:
+	dh_auto_build
+	xpi-pack $(CURDIR)/firefox-libzg/extension/ xul-ext-zeitgeist-datasource.xpi
+
+override_dh_auto_install:
+	dh_auto_install
+	install-xpi -pxul-ext-zeitgeist-datasource xul-ext-zeitgeist-datasource.xpi
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f *.xpi 

=== removed file 'debian/zeitgeist-datasource-firefox.install'
--- debian/zeitgeist-datasource-firefox.install	2010-11-02 22:58:46 +0000
+++ debian/zeitgeist-datasource-firefox.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/mozilla/extensions
-usr/share/xul-ext-zeitgeist