[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#534040: skim: diff for NMU version 1.4.5-4.1



tags 550214 + patch
thanks

Dear maintainer,

I've prepared an NMU for skim (versioned as 1.4.5-4.1). The diff
is attached to this message.

Regards.

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net
diff -u skim-1.4.5/debian/patches/00list skim-1.4.5/debian/patches/00list
--- skim-1.4.5/debian/patches/00list
+++ skim-1.4.5/debian/patches/00list
@@ -6,0 +7 @@
+08_scons_FTBFS.dpatch
diff -u skim-1.4.5/debian/changelog skim-1.4.5/debian/changelog
--- skim-1.4.5/debian/changelog
+++ skim-1.4.5/debian/changelog
@@ -1,3 +1,11 @@
+skim (1.4.5-4.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Add patch from Michael Schutte <michi@uiae.at> to fix FTBFS. Closes:
+    bug#534040, bug#550214.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 31 Jan 2010 18:20:36 +0100
+
 skim (1.4.5-4) unstable; urgency=low
 
   [ Zhengpeng Hou ]
only in patch2:
unchanged:
--- skim-1.4.5.orig/debian/patches/08_scons_FTBFS.dpatch
+++ skim-1.4.5/debian/patches/08_scons_FTBFS.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_scons_FTBFS.dpatch by Michael Schutte <michi@uiae.at> 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix to prevent FTBS from latest scons.
+
+@DPATCH@
+--- a/bksys/generic.py
++++ b/bksys/generic.py
+@@ -492,7 +492,7 @@
+ 
+ 	def string_la_file(target, source, env):
+ 		print "building '%s' from '%s'" % (target[0].name, source[0].name)
+-	la_file = env.Action(build_la_file, string_la_file, ['BKSYS_VNUM', 'BKSYS_DESTDIR'])
++	la_file = env.Action(build_la_file, string_la_file, 'BKSYS_VNUM', 'BKSYS_DESTDIR')
+ 	env['BUILDERS']['LaFile'] = env.Builder(action=la_file,suffix='.la',src_suffix=env['SHLIBSUFFIX'])
+ 
+ 	## Function for building shared libraries

Reply to: