diff -Nru oregano-0.70/debian/changelog oregano-0.70/debian/changelog
--- oregano-0.70/debian/changelog	2013-04-19 20:28:24.000000000 +0000
+++ oregano-0.70/debian/changelog	2013-07-20 16:13:56.000000000 +0000
@@ -1,3 +1,24 @@
+oregano (0.70-1.1ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/fix-ftbfs-with-binutils-gold.patch: Reorder libs to fix
+      FTBFS with binutils-gold.
+  * debian/patches/fix-ftbfs-from-lib-underlinkage.patch: Drop, as it has been
+    superseded by a patch from Debian.
+  * debian/patches/fix-ftbfs-with-binutils-gold.patch: Refresh.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 20 Jul 2013 12:10:55 -0400
+
+oregano (0.70-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Petter Reinholdtsen ]
+  * New patch math-library.patch to make sure to link with -lm and
+    fix build failure (Closes: #713450).
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 13 Jul 2013 15:54:33 +0200
+
 oregano (0.70-1ubuntu2) raring; urgency=low
 
   * Added missing math lib to link, fixing FTBFS.
@@ -290,6 +311,3 @@
 
  -- Hugo van der Merwe <hugo@mailroom.com>  Mon, 16 Oct 2000 17:54:48 +0200
 
-Local variables:
-mode: debian-changelog
-End:
diff -Nru oregano-0.70/debian/patches/fix-ftbfs-from-lib-underlinkage.patch oregano-0.70/debian/patches/fix-ftbfs-from-lib-underlinkage.patch
--- oregano-0.70/debian/patches/fix-ftbfs-from-lib-underlinkage.patch	2013-04-19 20:27:58.000000000 +0000
+++ oregano-0.70/debian/patches/fix-ftbfs-from-lib-underlinkage.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Index: oregano-0.70/src/Makefile.am
-===================================================================
---- oregano-0.70.orig/src/Makefile.am	2013-04-19 16:26:58.000000000 -0400
-+++ oregano-0.70/src/Makefile.am	2013-04-19 16:27:55.171054014 -0400
-@@ -32,7 +32,7 @@
- OREGANO_LDADD = gplot/libgplot.a \
- 		engines/libengines.a \
- 		model/libmodel.a \
--		sheet/libsheet.a
-+		sheet/libsheet.a -lm
- 
- oregano_PIXMAPS = \
- 	plot.xpm 	\
diff -Nru oregano-0.70/debian/patches/fix-ftbfs-with-binutils-gold.patch oregano-0.70/debian/patches/fix-ftbfs-with-binutils-gold.patch
--- oregano-0.70/debian/patches/fix-ftbfs-with-binutils-gold.patch	2012-06-27 10:43:42.000000000 +0000
+++ oregano-0.70/debian/patches/fix-ftbfs-with-binutils-gold.patch	2013-07-20 16:13:40.000000000 +0000
@@ -17,4 +17,4 @@
  
  oregano_LDADD = \
 +	$(OREGANO_LDADD) \
- 	$(OREGANO_LIBS) 
+ 	$(OREGANO_LIBS) -lm
diff -Nru oregano-0.70/debian/patches/math-library.patch oregano-0.70/debian/patches/math-library.patch
--- oregano-0.70/debian/patches/math-library.patch	1970-01-01 00:00:00.000000000 +0000
+++ oregano-0.70/debian/patches/math-library.patch	2013-07-20 16:10:00.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Make sure to link with -lm
+ Fix FTBFS with newer gcc version.
+Author: Petter Reinholdtsen <pere@hungry.com>
+Bug-Debian: http://bugs.debian.org/713450
+Forwarded: no
+Last-Update: 2013-07-13
+
+--- oregano-0.70.orig/src/Makefile.am
++++ oregano-0.70/src/Makefile.am
+@@ -99,4 +99,4 @@ oregano_SOURCES = 	\
+ 	xml-helper.h
+ 
+ oregano_LDADD = \
+-	$(OREGANO_LIBS) 
++	$(OREGANO_LIBS) -lm
diff -Nru oregano-0.70/debian/patches/series oregano-0.70/debian/patches/series
--- oregano-0.70/debian/patches/series	2013-04-19 20:27:35.000000000 +0000
+++ oregano-0.70/debian/patches/series	2013-07-20 16:10:37.000000000 +0000
@@ -2,5 +2,5 @@
 format-security.patch
 missing.potfiles.patch
 remove.unneded.docs.patch
+math-library.patch
 fix-ftbfs-with-binutils-gold.patch
-fix-ftbfs-from-lib-underlinkage.patch