[Merge] lp:~bilalakhtar/ubuntu/maverick/skim/merge-609679 into lp:ubuntu/skim

[Bilal Akhtar]

So the conflict markers will come as a result of the merge :(.
Stefano, I am sure the diff at the bottom of the page will confuse you. So, the diff contents right below is the diff from the ubuntu version right before the fakesync:

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-21 16:44:47 +0000
+++ debian/changelog	2010-08-02 02:32:18 +0000
@@ -1,3 +1,27 @@
+skim (1.4.5-4.1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #609679), remaining changes:
+    - Change icon destination
+    - Remove the autostart file in rules, avoids ftbfs due to dh_install -
+      -list-missing
+    - Disable autostart entry from skim.install
+
+ -- Bilal Akhtar <bilalakhtar96 at yahoo.com>  Mon, 02 Aug 2010 08:02:05 +0530
+
+skim (1.4.5-4.1fakesync1) maverick; urgency=low
+
+  * Fake sync due to mismatching orig tarball (LP: #609679).
+
+ -- Bilal Akhtar <bilalakhtar96 at yahoo.com>  Sun, 01 Aug 2010 19:36:18 +0200
+
+skim (1.4.5-4.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Add patch from Michael Schutte <michi at uiae.at> to fix FTBFS. Closes:
+    bug#534040, bug#550214.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 Jan 2010 18:20:36 +0100
+
 skim (1.4.5-4ubuntu5) lucid; urgency=low
 
   * Change icon destination (LP: #290304)

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-10-08 12:13:58 +0000
+++ debian/patches/00list	2010-07-25 08:06:27 +0000
@@ -4,5 +4,4 @@
 05_fix_desktop_file.dpatch
 06_skim_config.dpatch
 07_fix_FTBFS.dpatch
-kubuntu_01_scons_fix.dpatch
-
+08_scons_FTBFS.dpatch

=== added file 'debian/patches/08_scons_FTBFS.dpatch'
--- debian/patches/08_scons_FTBFS.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/08_scons_FTBFS.dpatch	2010-07-25 08:05:10 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_scons_FTBFS.dpatch by Michael Schutte <michi at uiae.at> 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix to prevent FTBS from latest scons.
+
+ at 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

=== removed file 'debian/patches/kubuntu_01_scons_fix.dpatch'
--- debian/patches/kubuntu_01_scons_fix.dpatch	2009-10-08 12:13:58 +0000
+++ debian/patches/kubuntu_01_scons_fix.dpatch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kubuntu_01_scons_fix.dpatch by  <jriddell at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix to prevent FTBS from latest scons.
-
- at DPATCH@
---- skim-1.4.5/bksys/generic.py.orig	2009-02-08 21:27:24.000000000 +0100
-+++ skim-1.4.5/bksys/generic.py	2009-02-08 21:27:35.000000000 +0100
-@@ -550,7 +550,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

-- 
https://code.launchpad.net/~bilalakhtar/ubuntu/maverick/skim/merge-609679/+merge/31506
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~bilalakhtar/ubuntu/maverick/skim/merge-609679 into lp:ubuntu/skim.