------------------------------------------------------------
revno: 94
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: xiphos
timestamp: Sun 2012-03-11 18:36:12 +0000
message:
- Remove patch
- Update to latest tarball release version
removed:
debian/patches/wscript-fixes.diff
modified:
debian/patches/series
wscript
--
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/patches/series'
--- debian/patches/series 2012-02-26 22:55:08 +0000
+++ debian/patches/series 2012-03-11 18:36:12 +0000
@@ -1,1 +1,1 @@
-wscript-fixes.diff
+
=== removed file 'debian/patches/wscript-fixes.diff'
--- debian/patches/wscript-fixes.diff 2012-02-26 22:55:08 +0000
+++ debian/patches/wscript-fixes.diff 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-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 'wscript'
--- wscript 2012-02-22 23:40:53 +0000
+++ wscript 2012-03-11 18:36:12 +0000
@@ -506,7 +506,7 @@
for h in _headers:
conf.check(header_name=h)
- if not conf.check(header_name='osisxhtml.h'):
+ if not conf.check(header_name='osisxhtml.h', uselib='SWORD'):
Utils.pprint('RED', "Old libsword is used, please upgrade to gain engine support for notes/xrefs.")
dfn('NO_SWORD_SET_RENDER_NOTE_NUMBERS', 1)
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
