[Pkg-haskell-commits] darcs: haskell-dbus: New patch to remove hard-coded configure args

[Rafael Cunha de Almeida]

Thu Dec 30 06:17:28 UTC 2010  Rafael Cunha de Almeida <rafael at kontesti.me>
  * New patch to remove hard-coded configure args
  Ignore-this: b8bf22fe635ce2941639dafcc402fbd

    A ./patches/main-with-hooks.patch
    M ./patches/series +1
    M ./rules -2

Thu Dec 30 06:17:28 UTC 2010  Rafael Cunha de Almeida <rafael at kontesti.me>
  * New patch to remove hard-coded configure args
  Ignore-this: b8bf22fe635ce2941639dafcc402fbd
diff -rN -u old-haskell-dbus/patches/main-with-hooks.patch new-haskell-dbus/patches/main-with-hooks.patch
--- old-haskell-dbus/patches/main-with-hooks.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-dbus/patches/main-with-hooks.patch	2010-12-30 07:13:24.928679401 +0000
@@ -0,0 +1,15 @@
+From: Rafael Cunha de Almeida <rafael at kontesti.me>
+Last-Update: 2010-12-30
+Description: Using defaultMainWithHooks instead of defaultMain
+ The package needs to run a configure file and use the generated
+ DBus.buildinfo file. In order for that to happen defaultMainWithHooks
+ must be used instead of defaultMain.
+
+diff --git a/Setup.hs b/Setup.hs
+index 9a994af..f598ab7 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,2 +1,2 @@
+ import Distribution.Simple
+-main = defaultMain
++main = defaultMainWithHooks autoconfUserHooks
diff -rN -u old-haskell-dbus/patches/series new-haskell-dbus/patches/series
--- old-haskell-dbus/patches/series	2010-12-30 07:13:24.924679191 +0000
+++ new-haskell-dbus/patches/series	2010-12-30 07:13:24.928679401 +0000
@@ -1 +1,2 @@
 base-version.patch
+main-with-hooks.patch
diff -rN -u old-haskell-dbus/rules new-haskell-dbus/rules
--- old-haskell-dbus/rules	2010-12-30 07:13:24.924679191 +0000
+++ new-haskell-dbus/rules	2010-12-30 07:13:24.928679401 +0000
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
 
-DEB_SETUP_GHC6_CONFIGURE_ARGS = --extra-include-dirs=/usr/include/dbus-1.0/\
-                                --extra-include-dirs=/usr/lib/dbus-1.0/include/
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk