------------------------------------------------------------
revno: 91
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: xiphos
timestamp: Sun 2012-02-26 22:55:08 +0000
message:
Fix old release, add config wrapper
added:
debian/patches/wscript-fixes.diff
modified:
debian/control
debian/patches/series
debian/rules
--
lp:xiphos/debian
https://code.launchpad.net/~pkgcrosswire/xiphos/main
Your team CrossWire Packaging Team is subscribed to branch lp:xiphos/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/xiphos/main/+edit-subscription
=== modified file 'debian/control'
--- debian/control 2012-02-23 01:09:26 +0000
+++ debian/control 2012-02-26 22:55:08 +0000
@@ -6,6 +6,7 @@
libgtkhtml-4.0-dev | libgtkhtml3.14-dev,
libgtkhtml-editor-4.0-dev | libgtkhtml-editor-3.14-dev | libgtkhtml-editor-dev | gtkhtml3.14,
libwebkitgtk-3.0-dev | libwebkitgtk-dev,
+ libgtkhtml-4.0-0 | libglade2-dev,
gnome-doc-utils,
intltool,
libdbus-glib-1-dev,
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-06-25 14:17:06 +0000
+++ debian/patches/series 2012-02-26 22:55:08 +0000
@@ -0,0 +1,1 @@
+wscript-fixes.diff
=== added file 'debian/patches/wscript-fixes.diff'
--- debian/patches/wscript-fixes.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/wscript-fixes.diff 2012-02-26 22:55:08 +0000
@@ -0,0 +1,32 @@
+Index: xiphos/wscript
+===================================================================
+--- xiphos.orig/wscript 2012-02-26 20:49:47.145118980 +0000
++++ xiphos/wscript 2012-02-26 21:18:02.877200229 +0000
+@@ -8,6 +8,7 @@
+ import Options
+ import ccroot
+ import preproc
++from wafadmin.Configure import ConfigurationError
+ preproc.go_absolute=1
+ preproc.strict_quotes=0
+
+@@ -151,6 +152,19 @@
+ action='store_const', const='2', dest='gtkver',
+ help='Use gtk2 API [deprecated by --gtk=2]')
+
++
++def printconfig(fn):
++ def wrapped(*args):
++ try:
++ fn(*args)
++ except Exception,e:
++ args[0].log.flush()
++ with open('build/config.log') as f:
++ for line in f: print line[:-1]
++ raise e
++ return wrapped
++
++@printconfig
+ def configure(conf):
+
+ opt = Options.options
=== modified file 'debian/rules'
--- debian/rules 2012-02-22 23:59:46 +0000
+++ debian/rules 2012-02-26 22:55:08 +0000
@@ -9,6 +9,8 @@
./waf build --nocache
override_dh_auto_install:
./waf install --nocache --destdir=debian/tmp
+override_dh_install:
+ dh_install --list-missing
override_dh_strip:
dh_strip --dbg-package=xiphos-dbg
override_dh_auto_clean:
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
