r26345 - in /desktop/experimental/epiphany-browser/debian: changelog epiphany-browser-data.install epiphany-browser-dev.install rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Jan 18 21:13:58 2011
New Revision: 26345

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26345
Log:
* debian/rules:
  - Re-enable introspection support, it works fine with latest libseed.
  - Include utils.mk.
* debian/epiphany-browser-data.install,
  debian/epiphany-browser-dev.install:
  - Move the gir file to the -dev package where it belongs.
  - Install the gsettings schemas, the gconf ones are gone.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install
    desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.install
    desktop/experimental/epiphany-browser/debian/rules

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=26345&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Tue Jan 18 21:13:58 2011
@@ -29,6 +29,13 @@
     - Bump the gobject-introspection build dependencies.
   * debian/copyright:
     - Stop mentioning flashblock.tar, we no longer ship it.
+  * debian/rules:
+    - Re-enable introspection support, it works fine with latest libseed.
+    - Include utils.mk.
+  * debian/epiphany-browser-data.install,
+    debian/epiphany-browser-dev.install:
+    - Move the gir file to the -dev package where it belongs.
+    - Install the gsettings schemas, the gconf ones are gone.
 
  -- Laurent Bigonville <bigon at debian.org>  Sun, 16 Jan 2011 16:57:01 +0100
 

Modified: desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install?rev=26345&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install [utf-8] Tue Jan 18 21:13:58 2011
@@ -1,9 +1,9 @@
-debian/tmp/etc
 debian/tmp/usr/share/applications
 debian/tmp/usr/share/dbus-1
 debian/tmp/usr/share/epiphany-browser/[!m]*
 debian/tmp/usr/share/epiphany-browser/mime-types-permissions.xml etc/gnome/epiphany
-debian/tmp/usr/share/gir-1.0
+debian/tmp/usr/share/GConf
+debian/tmp/usr/share/glib-2.0
 debian/tmp/usr/share/gnome
 debian/tmp/usr/share/icons
 debian/tmp/usr/share/locale

Modified: desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.install?rev=26345&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.install [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser-dev.install [utf-8] Tue Jan 18 21:13:58 2011
@@ -1,4 +1,5 @@
 debian/tmp/usr/include
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/share/aclocal
+debian/tmp/usr/share/gir-1.0
 debian/tmp/usr/share/gtk-doc

Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=26345&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Tue Jan 18 21:13:58 2011
@@ -2,10 +2,11 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := epiphany
 
@@ -17,7 +18,7 @@
 		--enable-zeroconf \
 		--libexecdir=\$${prefix}/lib/epiphany-browser \
 		--enable-gtk-doc \
-		--disable-introspection \
+		--enable-introspection \
 		--enable-spell-checker \
 		--with-ca-file=/etc/ssl/certs/ca-certificates.crt