diff -u predict-2.2.3/debian/rules predict-2.2.3/debian/rules
--- predict-2.2.3/debian/rules
+++ predict-2.2.3/debian/rules
@@ -20,11 +20,11 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
 	cc $(CFLAGS) \
-		-I/usr/include/ncurses predict.c -lm -lncurses -lpthread \
-		-o predict	
+		-o predict predict.c -I/usr/include/ncurses \
+		-lm -lncurses -lpthread
 	cc $(CFLAGS) \
-		-I/usr/include/ncurses predict-g1yyh.c -lm -lncurses \
-		-lpthread -lmenu -o predict-g1yyh
+		-o predict-g1yyh predict-g1yyh.c -I/usr/include/ncurses \
+		-lm -lncurses -lpthread -lmenu
 	cc $(CFLAGS) \
 		vocalizer/vocalizer.c -o vocalizer/vocalizer
 
diff -u predict-2.2.3/debian/changelog predict-2.2.3/debian/changelog
--- predict-2.2.3/debian/changelog
+++ predict-2.2.3/debian/changelog
@@ -1,3 +1,22 @@
+predict (2.2.3-3.1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian Unstable (LP: #1012006). Remaining Changes:
+    - debian/patches/fix-R0-conflict.diff:
+      + Some systems define an enumeration containing R0 in sys/ucontext.h. 
+        Changing the name avoids any conflict.(LP: #645036) 
+
+ -- Vibhav Pant <vibhavp@gmail.com>  Tue, 12 Jun 2012 14:22:34 +0530
+
+predict (2.2.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with gold or ld --no-add-needed": add patch from Ubuntu / 
+    John T. Nogatch (move -lm to the end of the lines in debian/rules). 
+    Change the order of some more cc invocations.
+    (Closes: #615766, LP: #770815)
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 06 Dec 2011 18:17:32 +0100
+
 predict (2.2.3-3ubuntu2) oneiric; urgency=low
 
   * debian/rules: move -lm later in cc command to fix geosat, et al.