Merge lp:~jtaylor/ubuntu/oneiric/semantik/fix-837429 into lp:ubuntu/oneiric/semantik

[Julian Taylor]

fix ftbs + minor package cleanups

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-19 13:43:50 +0000
+++ debian/changelog	2011-08-31 10:40:24 +0000
@@ -1,3 +1,13 @@
+semantik (0.7.3-0ubuntu4) oneiric; urgency=low
+
+  * add build dependency on libqtwebkit4 (LP: #837429)
+  * remove unneeded link against libstr.a not present in ocaml-nox anymore
+  * remove dpatch b-d 
+  * bump standard version to 3.9.2, no changes necessary 
+  * replace dh_clean -k with dh_prep 
+
+ -- Julian Taylor <[e-mail]>  Wed, 31 Aug 2011 12:17:53 +0200
+
 semantik (0.7.3-0ubuntu3) oneiric; urgency=low
 
   * Rebuild to pick up armel ocaml fixes.

=== modified file 'debian/control'
--- debian/control	2010-11-01 19:59:12 +0000
+++ debian/control	2011-08-31 10:40:24 +0000
@@ -4,9 +4,9 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Jonathan Patrick Davies <[e-mail]>
 Build-Depends: debhelper (>= 7.3.16), libqt4-dev (>= 4:4.5), kdelibs5-dev,
-  python (>= 2.3), python-dev (>= 2.3), ocaml-nox, docbook2x, dpatch,
-  pkg-config, libxrender-dev
-Standards-Version: 3.9.1
+  python (>= 2.3), python-dev (>= 2.3), ocaml-nox, docbook2x,
+  pkg-config, libxrender-dev, libqtwebkit-dev
+Standards-Version: 3.9.2
 Homepage: http://freehackers.org/~tnagy/semantik.html
 
 Package: semantik

=== added file 'debian/patches/ocaml-link-str.diff'
--- debian/patches/ocaml-link-str.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/ocaml-link-str.diff	2011-08-31 10:40:24 +0000
@@ -0,0 +1,17 @@
+Description: remove unneeded link against nonexistant libstr.a
+ libstr.a does not exist in ocaml-nox 3.12.0-7 anymore. A str.a does
+ still exists, but it is not required.
+Author: Julian Taylor <[e-mail]>
+Index: semantik/wscript
+===================================================================
+--- semantik.orig/wscript	2011-08-31 12:10:37.979872237 +0200
++++ semantik/wscript	2011-08-31 12:10:45.989872138 +0200
+@@ -208,7 +208,7 @@
+ 		conf.fatal('Compiling Semantik requires kde4 -devel')
+ 
+ 	conf.env.OCALINKFLAGS_OPT_PP = 'str.cmxa'
+-	conf.env.LINKFLAGS_CAML = '-lasmrun -lstr -lnums'.split()
++	conf.env.LINKFLAGS_CAML = '-lasmrun -lnums'.split()
+ 	conf.env.LIBPATH_CAML = conf.env.OCAMLLIB
+ 	conf.env.LIB_CAML = "m".split()
+ 	conf.env.OCAMLFLAGS_TWT = '-pp default/util/ocamltwt'.split() #-unsafe -noassert -inline 10'

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-01 19:59:12 +0000
+++ debian/patches/series	2011-08-31 10:40:24 +0000
@@ -1,2 +1,3 @@
 kubuntu_01_wscript_log.diff
 kubuntu_02_menu_entry_fix.diff
+ocaml-link-str.diff

=== modified file 'debian/rules'
--- debian/rules	2010-11-01 19:59:12 +0000
+++ debian/rules	2011-08-31 10:40:24 +0000
@@ -26,7 +26,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	DESTDIR=$(CURDIR)/debian/semantik ./waf -f install