[Pkg-haskell-commits] darcs: gtk2hs: Fix "mozembed component not packaged" reincluding libghc6-mozembed-dev. (Closes: #578043)

[Marco Túlio Gontijo e Silva]

Fri Apr 16 19:16:44 UTC 2010  Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at debian.org>
  * Fix "mozembed component not packaged" reincluding libghc6-mozembed-dev.  (Closes: #578043)
  Ignore-this: 50494c878cff41c99f71fda1630680fd

    M ./changelog +2
    M ./control +24
    A ./patches/mozembed-libdir.patch
    M ./patches/series +1
    M ./rules -1 +2

Fri Apr 16 19:16:44 UTC 2010  Marco Túlio Gontijo e Silva <marcot at debian.org>
  * Fix "mozembed component not packaged" reincluding libghc6-mozembed-dev.  (Closes: #578043)
  Ignore-this: 50494c878cff41c99f71fda1630680fd
diff -rN -u old-gtk2hs/changelog new-gtk2hs/changelog
--- old-gtk2hs/changelog	2010-04-20 16:27:56.946406638 +0000
+++ new-gtk2hs/changelog	2010-04-20 16:27:56.962407494 +0000
@@ -2,6 +2,8 @@
 
   * debian/copyright: Use DEP-5 format.
   * Use debian/compat 7.
+  * Fix "mozembed component not packaged" reincluding
+    libghc6-mozembed-dev.  (Closes: #578043)
 
  -- Marco Túlio Gontijo e Silva <marcot at debian.org>  Tue, 16 Feb 2010 23:24:12 -0200
 
diff -rN -u old-gtk2hs/control new-gtk2hs/control
--- old-gtk2hs/control	2010-04-20 16:27:56.946406638 +0000
+++ new-gtk2hs/control	2010-04-20 16:27:56.962407494 +0000
@@ -20,6 +20,7 @@
   , libglade2-dev
   , libgtkglext1-dev
   , libgtksourceview2.0-dev
+  , xulrunner-dev
   , dctrl-tools
 Standards-Version: 3.8.4
 Homepage: http://haskell.org/gtk2hs/
@@ -282,6 +283,29 @@
  This package provides bindings for GtkSourceView, a widget implementing
  syntax highlighting and other features typical of a source editor.
 
+Package: libghc6-mozembed-dev
+Architecture: any
+Depends: xulrunner-dev
+  , libghc6-gtk-dev (= ${binary:Version})
+  , ${haskell:Depends}
+  , ${shlibs:Depends}
+  , ${misc:Depends}
+Suggests: gtk2hs-doc
+  , ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: A GUI library for Haskell (Gtk2Hs) -- GtkMozEmbed bindings
+ Gtk2Hs is a GUI library for Haskell based on GTK+, an extensive and
+ mature multi-platform GUI toolkit featuring:
+ .
+  - Automatic memory management.
+  - Near complete coverage of the GTK+ API.
+  - Unicode support.
+  - Extensive reference documentation.
+  - Support for Linux, Windows, Mac OS X and other Unix platforms.
+ .
+ This package provides bindings for GtkMozEmbed, a widget allowing you to
+ embed a Mozilla browser window into your GTK+ application.
+
 Package: libghc6-soegtk-dev
 Architecture: any
 Depends: libghc6-cairo-dev (= ${binary:Version})
diff -rN -u old-gtk2hs/patches/mozembed-libdir.patch new-gtk2hs/patches/mozembed-libdir.patch
--- old-gtk2hs/patches/mozembed-libdir.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-gtk2hs/patches/mozembed-libdir.patch	2010-04-20 16:27:56.950406852 +0000
@@ -0,0 +1,12 @@
+diff -Nudar gtk2hs-0.10.1.orig//configure.ac gtk2hs-0.10.1/configure.ac
+--- gtk2hs-0.10.1.orig//configure.ac	2010-04-16 16:14:22.000000000 -0300
++++ gtk2hs-0.10.1/configure.ac	2010-04-16 16:14:51.000000000 -0300
+@@ -361,7 +361,7 @@
+ GTKHS_PKG_CHECK(mozilla, mozembed, MOZILLA_MOZEMBED, [mozilla-gtkmozembed >= 1.4], [GLIB GTK],
+ 	[build bindings for the Mozilla display widget (default=auto)],
+ 	[Mozilla requirement not met. Perhaps you need to install mozilla or mozilla-devel])
+-MOZILLA_MOZEMBED_LIBDIR=$(${PKG_CONFIG} --variable=libdir mozilla-gtkmozembed)
++MOZILLA_MOZEMBED_LIBDIR=$(${PKG_CONFIG} --variable=libdir mozilla-gtkmozembed)/lib
+ 
+ GTKHS_PKG_CHECK(seamonkey, mozembed, SEAMONKEY_MOZEMBED, [seamonkey-gtkmozembed >= 1.0], [GLIB GTK],
+         [build bindings for the Mozilla display widget using the Seamonkey libs (default=auto)],
diff -rN -u old-gtk2hs/patches/series new-gtk2hs/patches/series
--- old-gtk2hs/patches/series	2010-04-20 16:27:56.946406638 +0000
+++ new-gtk2hs/patches/series	2010-04-20 16:27:56.950406852 +0000
@@ -1,3 +1,4 @@
 ghc6-6.12.1.patch
 response.patch
 rec.patch
+mozembed-libdir.patch
diff -rN -u old-gtk2hs/rules new-gtk2hs/rules
--- old-gtk2hs/rules	2010-04-20 16:27:56.946406638 +0000
+++ new-gtk2hs/rules	2010-04-20 16:27:56.954407066 +0000
@@ -28,7 +28,7 @@
 configure_flags += --enable-libglade
 configure_flags += --enable-opengl
 configure_flags += --enable-gtksourceview2
-#configure_flags += --enable-mozilla   # not compatible with new xulrunner-dev yet
+configure_flags += --enable-mozilla
 configure_flags += --enable-docs
 
 # To build with ghc 6.12, --disable-split-objs is needed in all arches.
@@ -75,6 +75,7 @@
   glade \
   gtkglext \
   gtksourceview2 \
+  mozembed \
   soegtk
 VERSION := $(shell sed -ne '/([0-9.]\+-.*)/ { s/^.*(\([0-9.]\+\)-.*).*$$/\1/p; q }' < debian/changelog)