Control: tags -1 + patch pending

Dear maintainer,

I've uploaded the NMU prepared by Johannes Brandstätter for lttv (versioned as
0.12.38-21032011-1.1) to DELAYED/2. Please feel free to tell me if I should
delay it longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru lttv-0.12.38-21032011/debian/changelog lttv-0.12.38-21032011/debian/changelog
--- lttv-0.12.38-21032011/debian/changelog	2011-06-19 15:41:33.000000000 +0200
+++ lttv-0.12.38-21032011/debian/changelog	2014-04-26 17:15:26.000000000 +0200
@@ -1,3 +1,14 @@
+lttv (0.12.38-21032011-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * link_against_gmodule.patch: Link against gmodule in any case, to fix FTBFS.
+    (Closes: #713656)
+  * add_missing_gtk_header.patch: Add missing Gtk header to fix several type
+    name errors.
+  * Replace autotools-dev with dh-autoreconf to rebuild configure script.
+
+ -- Johannes Brandstätter <jbran...@2ds.eu>  Sat, 26 Apr 2014 17:14:43 +0200
+
 lttv (0.12.38-21032011-1) unstable; urgency=low
 
   * [797ae3a] New upstream version 0.12.38-21032011
diff -Nru lttv-0.12.38-21032011/debian/control lttv-0.12.38-21032011/debian/control
--- lttv-0.12.38-21032011/debian/control	2011-06-19 15:41:33.000000000 +0200
+++ lttv-0.12.38-21032011/debian/control	2014-04-26 16:25:26.000000000 +0200
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Jon Bernard <jbern...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libglib2.0-dev, libgtk2.0-dev, libpopt-dev, gcj-jdk
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, libglib2.0-dev, libgtk2.0-dev, libpopt-dev, gcj-jdk
 Standards-Version: 3.9.2
 Homepage: http://lttng.org
 Vcs-Git: git://git.debian.org/collab-maint/lttv.git
diff -Nru lttv-0.12.38-21032011/debian/patches/add_missing_gtk_header.patch lttv-0.12.38-21032011/debian/patches/add_missing_gtk_header.patch
--- lttv-0.12.38-21032011/debian/patches/add_missing_gtk_header.patch	1970-01-01 01:00:00.000000000 +0100
+++ lttv-0.12.38-21032011/debian/patches/add_missing_gtk_header.patch	2014-04-26 17:09:15.000000000 +0200
@@ -0,0 +1,14 @@
+Description: Add missing Gtk header.
+Author: Johannes Brandstätter <jbran...@2ds.eu>
+Last-Update: 2014-04-26
+
+--- lttv-0.12.38-21032011.orig/lttv/modules/gui/lttvwindow/lttvwindow/timeentry.h
++++ lttv-0.12.38-21032011/lttv/modules/gui/lttvwindow/lttvwindow/timeentry.h
+@@ -24,6 +24,7 @@
+ #include <gtk/gtkhbox.h>
+ #include <gtk/gtkspinbutton.h>
+ #include <gtk/gtklabel.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
diff -Nru lttv-0.12.38-21032011/debian/patches/link_against_gmodule.patch lttv-0.12.38-21032011/debian/patches/link_against_gmodule.patch
--- lttv-0.12.38-21032011/debian/patches/link_against_gmodule.patch	1970-01-01 01:00:00.000000000 +0100
+++ lttv-0.12.38-21032011/debian/patches/link_against_gmodule.patch	2014-04-26 17:07:42.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Link against gmodule in any case.
+Author: Johannes Brandstätter <jbran...@2ds.eu>
+Bug-Debian: http://bugs.debian.org/713656
+Last-Update: 2014-04-26
+
+--- lttv-0.12.38-21032011.orig/configure.ac
++++ lttv-0.12.38-21032011/configure.ac
+@@ -147,13 +147,14 @@ if test "$with_lttv_gui" = "yes" ; then
+ # Else, we still have a dependency on gmodule
+ # We will add flags for gmodule alone
+ else
+-        pkg_modules="gmodule-2.0 >= 2.0.0"
+-        PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
+         PACKAGE_CFLAGS="-Wall -Wformat"
+         AC_SUBST(PACKAGE_CFLAGS)
+         AC_SUBST(PACKAGE_LIBS)
+ fi
+ 
++pkg_modules="gmodule-2.0 >= 2.0.0"
++PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
++
+ pkg_modules="gobject-2.0 >= 2.0.0"
+ PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
+ 
diff -Nru lttv-0.12.38-21032011/debian/patches/series lttv-0.12.38-21032011/debian/patches/series
--- lttv-0.12.38-21032011/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ lttv-0.12.38-21032011/debian/patches/series	2014-04-26 17:09:29.000000000 +0200
@@ -0,0 +1,2 @@
+link_against_gmodule.patch
+add_missing_gtk_header.patch
diff -Nru lttv-0.12.38-21032011/debian/rules lttv-0.12.38-21032011/debian/rules
--- lttv-0.12.38-21032011/debian/rules	2011-06-19 15:41:33.000000000 +0200
+++ lttv-0.12.38-21032011/debian/rules	2014-04-26 16:25:08.000000000 +0200
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- -with-jni-interface

Attachment: signature.asc
Description: Digital signature

Reply via email to