diff -Nru valatoys-0.12.1/debian/changelog valatoys-0.12.1/debian/changelog --- valatoys-0.12.1/debian/changelog 2012-01-09 22:25:16.000000000 +0000 +++ valatoys-0.12.1/debian/changelog 2012-02-05 11:07:17.000000000 +0000 @@ -1,19 +1,9 @@ -valatoys (0.12.1-1ubuntu2) precise; urgency=low +valatoys (0.12.1-2) unstable; urgency=low - * debian/patches/use-valac-0.14.patch: oops, don't switch the - PACKAGE_SUFFIX variable in configure.ac to 0.14. + * Fix build with vala 0.14 (Closes: #650233) + * Don't install .la file anymore (Closes: #633216) - -- Mathieu Trudel-Lapierre Mon, 09 Jan 2012 23:23:33 +0100 - -valatoys (0.12.1-1ubuntu1) precise; urgency=low - - * debian/patches/use-valac-0.14.patch: build using valac-0.14 to fix the - build failure when compiling against GModule-2.0 and Peas-1.0. - * debian/control: - - now Build-Depends on valac-0.14 and libvala-0.14-dev. - - also update Recommends to valac-0.14 for binary packages. - - -- Mathieu Trudel-Lapierre Wed, 16 Nov 2011 16:53:20 -0500 + -- David Paleino Sun, 05 Feb 2012 12:07:07 +0100 valatoys (0.12.1-1) unstable; urgency=low diff -Nru valatoys-0.12.1/debian/control valatoys-0.12.1/debian/control --- valatoys-0.12.1/debian/control 2011-11-16 22:03:33.000000000 +0000 +++ valatoys-0.12.1/debian/control 2012-02-05 11:07:17.000000000 +0000 @@ -1,8 +1,7 @@ Source: valatoys Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: David Paleino +Maintainer: David Paleino Build-Depends: debhelper (>= 8~) , dh-autoreconf diff -Nru valatoys-0.12.1/debian/libafrodite-0.12-dev.install valatoys-0.12.1/debian/libafrodite-0.12-dev.install --- valatoys-0.12.1/debian/libafrodite-0.12-dev.install 2011-11-16 02:12:12.000000000 +0000 +++ valatoys-0.12.1/debian/libafrodite-0.12-dev.install 2012-02-05 11:07:17.000000000 +0000 @@ -1,5 +1,4 @@ usr/include/afrodite-*/ -usr/lib/libafrodite-*.la usr/lib/libafrodite-*.so -afrodite/afrodite-*.vapi usr/share/vala-0.12/vapi/ +afrodite/afrodite-*.vapi usr/share/vala-0.14/vapi/ diff -Nru valatoys-0.12.1/debian/patches/07-build_with_0.14.patch valatoys-0.12.1/debian/patches/07-build_with_0.14.patch --- valatoys-0.12.1/debian/patches/07-build_with_0.14.patch 1970-01-01 00:00:00.000000000 +0000 +++ valatoys-0.12.1/debian/patches/07-build_with_0.14.patch 2012-02-05 11:07:17.000000000 +0000 @@ -0,0 +1,70 @@ +From: Andrea Del Signore +Subject: Fix build with vala 0.14 +Origin: upstream + +--- + configure.ac | 10 +++++----- + vtg/vtgprojectmanagerui.vala | 2 +- + vtg/vtgprojectview.vala | 2 +- + vtg/vtgsourceoutlinerview.vala | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +--- valatoys.orig/configure.ac ++++ valatoys/configure.ac +@@ -12,7 +12,7 @@ AM_PROG_CC_C_O + AC_DISABLE_STATIC + AC_PROG_LIBTOOL + +-AC_PATH_PROG(VALAC, valac-0.12, valac-0.12) ++AC_PATH_PROG(VALAC, valac-0.14, valac-0.14) + AC_SUBST(VALAC) + + GLIB_GSETTINGS +@@ -31,10 +31,10 @@ AC_SUBST(LDFLAGS) + GLIB_REQUIRED=2.28.0 + GTHREAD_REQUIRED=2.28.0 + GTK_REQUIRED=3.0.0 +-GEDIT_REQUIRED=2.91.0 +-GTKSOURCEVIEW_REQUIRED=2.91.0 +-VALA_REQUIRED=0.11.0 +-VALA_VERSION=0.12 ++GEDIT_REQUIRED=3.0.0 ++GTKSOURCEVIEW_REQUIRED=3.0.0 ++VALA_REQUIRED=0.14.0 ++VALA_VERSION=0.14 + PEAS_REQUIRED=0.7.4 + AFRODITE_REQUIRED= + +--- valatoys.orig/vtg/vtgprojectmanagerui.vala ++++ valatoys/vtg/vtgprojectmanagerui.vala +@@ -131,7 +131,7 @@ namespace Vtg + """; + private uint _ui_id; + +- const ActionEntry[] _action_entries = { ++ const Gtk.ActionEntry[] _action_entries = { + {"ProjectNew", null, N_("_New Project..."), null, N_("Create a new project"), on_project_new}, + {"ProjectOpen", null, N_("Op_en Project..."), "O", N_("Open an existing project"), on_project_open}, + {"ProjectSaveAll", null, N_("Save All"), null, N_("Save all project files"), on_project_save_all}, +--- valatoys.orig/vtg/vtgprojectview.vala ++++ valatoys/vtg/vtgprojectview.vala +@@ -56,7 +56,7 @@ namespace Vtg + """; + + +- const ActionEntry[] _action_entries = { ++ const Gtk.ActionEntry[] _action_entries = { + {"packages-open-configure", Gtk.Stock.OPEN, N_("Open configure file..."), "C", N_("Open configure.ac file"), on_packages_open_configure}, + {"target-open-makefile", Gtk.Stock.OPEN, N_("Open makefile"), "M", N_("Open makefile.am file"), on_target_open_makefile} + }; +--- valatoys.orig/vtg/vtgsourceoutlinerview.vala ++++ valatoys/vtg/vtgsourceoutlinerview.vala +@@ -74,7 +74,7 @@ namespace Vtg + + """; + +- const ActionEntry[] _action_entries = { ++ const Gtk.ActionEntry[] _action_entries = { + {"source-outliner-goto", Gtk.Stock.OPEN, N_("Goto definition..."), null, N_("Goto symbol definition"), on_source_outliner_goto} + }; + diff -Nru valatoys-0.12.1/debian/patches/series valatoys-0.12.1/debian/patches/series --- valatoys-0.12.1/debian/patches/series 2011-11-16 21:25:27.000000000 +0000 +++ valatoys-0.12.1/debian/patches/series 2012-02-05 11:07:17.000000000 +0000 @@ -6,5 +6,5 @@ 05-fix_plugin_path.patch 06-disable_versioned_header.patch #07-remove_versioned_headers.patch +07-build_with_0.14.patch 08-dont_generate_version_number.patch -use-valac-0.14.patch diff -Nru valatoys-0.12.1/debian/patches/use-valac-0.14.patch valatoys-0.12.1/debian/patches/use-valac-0.14.patch --- valatoys-0.12.1/debian/patches/use-valac-0.14.patch 2012-01-09 22:24:13.000000000 +0000 +++ valatoys-0.12.1/debian/patches/use-valac-0.14.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -From 349daee3b22647c84a549648694728611621477a Mon Sep 17 00:00:00 2001 -From: Andrea Del Signore -Date: Fri, 21 Oct 2011 09:29:06 +0200 -Subject: [PATCH] Fix build with vala 0.14 - -Index: valatoys/configure.ac -=================================================================== ---- valatoys.orig/configure.ac 2011-11-16 23:18:57.544488657 +0100 -+++ valatoys/configure.ac 2012-01-09 23:24:09.785484499 +0100 -@@ -12,7 +12,7 @@ - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - --AC_PATH_PROG(VALAC, valac-0.12, valac-0.12) -+AC_PATH_PROG(VALAC, valac-0.14, valac-0.14) - AC_SUBST(VALAC) - - GLIB_GSETTINGS -@@ -31,10 +31,10 @@ - GLIB_REQUIRED=2.28.0 - GTHREAD_REQUIRED=2.28.0 - GTK_REQUIRED=3.0.0 --GEDIT_REQUIRED=2.91.0 --GTKSOURCEVIEW_REQUIRED=2.91.0 --VALA_REQUIRED=0.11.0 --VALA_VERSION=0.12 -+GEDIT_REQUIRED=3.0.0 -+GTKSOURCEVIEW_REQUIRED=3.0.0 -+VALA_REQUIRED=0.14.0 -+VALA_VERSION=0.14 - PEAS_REQUIRED=0.7.4 - AFRODITE_REQUIRED= - -Index: valatoys/vtg/vtgprojectmanagerui.vala -=================================================================== ---- valatoys.orig/vtg/vtgprojectmanagerui.vala 2011-11-16 23:18:57.520488659 +0100 -+++ valatoys/vtg/vtgprojectmanagerui.vala 2012-01-09 23:23:39.381485855 +0100 -@@ -131,7 +131,7 @@ - """; - private uint _ui_id; - -- const ActionEntry[] _action_entries = { -+ const Gtk.ActionEntry[] _action_entries = { - {"ProjectNew", null, N_("_New Project..."), null, N_("Create a new project"), on_project_new}, - {"ProjectOpen", null, N_("Op_en Project..."), "O", N_("Open an existing project"), on_project_open}, - {"ProjectSaveAll", null, N_("Save All"), null, N_("Save all project files"), on_project_save_all}, -Index: valatoys/vtg/vtgprojectview.vala -=================================================================== ---- valatoys.orig/vtg/vtgprojectview.vala 2011-11-16 23:18:57.508488658 +0100 -+++ valatoys/vtg/vtgprojectview.vala 2012-01-09 23:23:39.381485855 +0100 -@@ -56,7 +56,7 @@ - """; - - -- const ActionEntry[] _action_entries = { -+ const Gtk.ActionEntry[] _action_entries = { - {"packages-open-configure", Gtk.Stock.OPEN, N_("Open configure file..."), "C", N_("Open configure.ac file"), on_packages_open_configure}, - {"target-open-makefile", Gtk.Stock.OPEN, N_("Open makefile"), "M", N_("Open makefile.am file"), on_target_open_makefile} - }; -Index: valatoys/vtg/vtgsourceoutlinerview.vala -=================================================================== ---- valatoys.orig/vtg/vtgsourceoutlinerview.vala 2011-11-16 23:18:57.500488657 +0100 -+++ valatoys/vtg/vtgsourceoutlinerview.vala 2012-01-09 23:23:39.381485855 +0100 -@@ -74,7 +74,7 @@ - - """; - -- const ActionEntry[] _action_entries = { -+ const Gtk.ActionEntry[] _action_entries = { - {"source-outliner-goto", Gtk.Stock.OPEN, N_("Goto definition..."), null, N_("Goto symbol definition"), on_source_outliner_goto} - }; -