diff -Nru rubber-1.1+20100306/debian/changelog rubber-1.1+20100306/debian/changelog
--- rubber-1.1+20100306/debian/changelog	2012-08-10 09:40:55.000000000 +0000
+++ rubber-1.1+20100306/debian/changelog	2014-03-27 09:52:39.000000000 +0000
@@ -1,3 +1,13 @@
+rubber (1.1+20100306-3) unstable; urgency=low
+
+  * Add patch 04_borken_image_conversion.diff
+    (Closes: #684731)
+  * Add patch 05_rubber-push_vars-bug.diff
+    (Closes: #701898)
+  * Update to Standards-Version 3.9.5 (co changes needed).
+
+ -- Hilmar Preuße <hille42@web.de>  Thu, 27 Mar 2014 10:50:03 +0200
+
 rubber (1.1+20100306-2) unstable; urgency=medium
 
   * do not call bibtex with absolute paths, thanks to Benjamin Mako Hill
diff -Nru rubber-1.1+20100306/debian/control rubber-1.1+20100306/debian/control
--- rubber-1.1+20100306/debian/control	2012-06-22 07:44:28.000000000 +0000
+++ rubber-1.1+20100306/debian/control	2014-03-27 09:49:44.000000000 +0000
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: python, texinfo, python-support (>=0.5.3)
 XB-Python-Version: all
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: https://launchpad.net/rubber
 
 Package: rubber
diff -Nru rubber-1.1+20100306/debian/patches/04_borken_image_conversion.diff rubber-1.1+20100306/debian/patches/04_borken_image_conversion.diff
--- rubber-1.1+20100306/debian/patches/04_borken_image_conversion.diff	1970-01-01 00:00:00.000000000 +0000
+++ rubber-1.1+20100306/debian/patches/04_borken_image_conversion.diff	2013-05-02 12:38:58.000000000 +0000
@@ -0,0 +1,12 @@
+--- rubber-1.1+20100306.orig/src/convert.py	2011-02-17 15:49:27 +0000
++++ rubber-1.1+20100306/src/convert.py	2013-05-02 11:50:38 +0000
+@@ -215,7 +215,7 @@
+ 
+ 		candidates.sort()
+ 		for cost, source, target, rule in candidates:
+-			instance = Variables(context, rule)
++			instance = Variables(context, dict(rule))
+ 			instance['source'] = source
+ 			instance['target'] = target
+ 			if check is not None and not check(instance):
+
diff -Nru rubber-1.1+20100306/debian/patches/05_rubber-push_vars-bug.diff rubber-1.1+20100306/debian/patches/05_rubber-push_vars-bug.diff
--- rubber-1.1+20100306/debian/patches/05_rubber-push_vars-bug.diff	1970-01-01 00:00:00.000000000 +0000
+++ rubber-1.1+20100306/debian/patches/05_rubber-push_vars-bug.diff	2013-05-02 13:21:02.000000000 +0000
@@ -0,0 +1,33 @@
+diff -u rubber-1.1+20100306/src/converters/latex.py rubber-1.1+fix/src/converters/latex.py
+--- rubber-1.1+20100306/src/converters/latex.py	2010-08-12 15:46:10.000000000 +0200
++++ rubber-1.1+fix/src/converters/latex.py	2013-02-28 16:45:49.984374543 +0100
+@@ -562,7 +562,6 @@
+ 			"ext": None,
+ 			"job": None,
+ 			"graphics_suffixes" : [] })
+-		self.vars_stack = []
+ 
+ 		self.cmdline = ["\\nonstopmode", "\\input{%s}"]
+ 
+@@ -884,8 +883,10 @@
+ 
+ 	def do_read (self, name):
+ 		path = self.abspath(name)
+-		self.push_vars(file=path, line=None)
++		saved_vars = self.vars
+ 		try:
++			self.vars = Variables(self.vars,
++					{'file':path, 'line':None})
+ 			file = open(path)
+ 			lineno = 0
+ 			for line in file.readlines():
+@@ -899,7 +900,8 @@
+ 			file.close()
+ 		except IOError:
+ 			msg.warn(_("cannot read option file %s") % name, **self.vars)
+-		self.pop_vars()
++		finally:
++			self.vars = saved_vars
+ 
+ 	def do_rules (self, file):
+ 		name = self.env.find_file(file)
diff -Nru rubber-1.1+20100306/debian/patches/series rubber-1.1+20100306/debian/patches/series
--- rubber-1.1+20100306/debian/patches/series	2012-08-09 15:45:41.000000000 +0000
+++ rubber-1.1+20100306/debian/patches/series	2013-05-02 13:22:37.000000000 +0000
@@ -1,3 +1,5 @@
 01_fix_category_of_info_page.diff
 02_rubber_bibtext_20120807.diff
 03_rubber_makeindex_20120808.diff
+04_borken_image_conversion.diff
+05_rubber-push_vars-bug.diff
\ No newline at end of file
diff -Nru rubber-1.1+20100306/debian/rules rubber-1.1+20100306/debian/rules
--- rubber-1.1+20100306/debian/rules	2012-05-09 17:16:29.000000000 +0000
+++ rubber-1.1+20100306/debian/rules	2014-03-27 09:49:28.000000000 +0000
@@ -19,9 +19,10 @@
 clean:
 	dh_testdir
 	dh_testroot
-	# [ ! -f Makefile ] || $(MAKE) distclean
+	# upstream tar ball carries no Makefile in root, hence clean target
+	# in debian/rules returns exit code != 0, if package was never built.
+	# Ignoring this here.
 	-$(MAKE) distclean
-	# cd doc; make clean; cd ..
 	dh_clean
 
 install: build