Hello!

Attaching NMU diff to fix build with default valac.

Regards,
Andreas Henriksson
diff -Nru steadyflow-0.2.0/debian/changelog steadyflow-0.2.0/debian/changelog
--- steadyflow-0.2.0/debian/changelog	2012-06-30 06:01:55.000000000 -0700
+++ steadyflow-0.2.0/debian/changelog	2014-09-06 15:48:38.000000000 -0700
@@ -1,3 +1,14 @@
+steadyflow (0.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Make package build with default valac (Closes: #709703)
+    - Add debian/patches/fix-ambiguous-reference.patch
+    - Use valac build-dependency instead of valac-0.16
+  * Fix broken Homepage url
+  * Drop obsolete DM-Upload-Allowed control field.
+
+ -- Andreas Henriksson <andr...@fatal.se>  Sat, 06 Sep 2014 15:45:26 -0700
+
 steadyflow (0.2.0-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru steadyflow-0.2.0/debian/control steadyflow-0.2.0/debian/control
--- steadyflow-0.2.0/debian/control	2012-06-30 06:02:02.000000000 -0700
+++ steadyflow-0.2.0/debian/control	2014-09-06 15:47:49.000000000 -0700
@@ -4,14 +4,13 @@
 Maintainer: Maia Kozheva <si...@ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50~),
  cmake (>= 2.6),
- valac-0.16,
+ valac,
  libgtk-3-dev,
  libglib2.0-dev (>= 2.30),
  libgee-dev,
  libnotify-dev
 Standards-Version: 3.9.3
-Homepage: https://launchpad.net/~steadyflow
-DM-Upload-Allowed: yes
+Homepage: https://launchpad.net/steadyflow
 
 Package: steadyflow
 Architecture: any
diff -Nru steadyflow-0.2.0/debian/patches/fix-ambiguous-reference.patch steadyflow-0.2.0/debian/patches/fix-ambiguous-reference.patch
--- steadyflow-0.2.0/debian/patches/fix-ambiguous-reference.patch	1969-12-31 16:00:00.000000000 -0800
+++ steadyflow-0.2.0/debian/patches/fix-ambiguous-reference.patch	2014-09-06 15:44:29.000000000 -0700
@@ -0,0 +1,29 @@
+From: Andreas Henriksson <andr...@fatal.se>
+Subject: Fix ambiguous reference to build with newer valac
+
+Building with valac 0.24 (without this patch) gives the following error:
+
+/tmp/buildd/steadyflow-0.2.0/Steadyflow/Services.vala:64.3-64.6: error: `exit' is an ambiguous reference between `GLib.Process.exit' and `Gtk.exit'
+		exit(1);
+		^^^^
+
+
+--- a/Steadyflow/Services.vala
++++ b/Steadyflow/Services.vala
+@@ -16,7 +16,6 @@
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-using GLib.Process;
+ using Gtk;
+ using Steadyflow.Core;
+ using Steadyflow.UI;
+@@ -61,7 +60,7 @@
+ 				 "information to the developer:\n\nError Code %d:\n\n%s").printf (e.code, message));
+ 			
+ 		md.run ();
+-		exit(1);
++		Process.exit(1);
+ 	}
+ }
+ 
diff -Nru steadyflow-0.2.0/debian/patches/series steadyflow-0.2.0/debian/patches/series
--- steadyflow-0.2.0/debian/patches/series	1969-12-31 16:00:00.000000000 -0800
+++ steadyflow-0.2.0/debian/patches/series	2014-09-06 15:42:26.000000000 -0700
@@ -0,0 +1 @@
+fix-ambiguous-reference.patch

Reply via email to