Dear Maintainer,

The attached patch fix the line separator issue (thx to Juhani) and also replaces autotools-dev with dh-autoreconf (to follow this recommandation[1]).

Thanks for considering the patch.

Erwan Prioul.


[1] https://wiki.debian.org/qa.debian.org/FTBFS#A2014-01-21_using_dh-autoreconf_during_the_build
diff -Naur a/debian/control b/debian/control
--- a/debian/control    2014-09-11 15:19:25.432629600 +0200
+++ b/debian/control    2014-09-11 15:58:31.768504894 +0200
@@ -4,7 +4,7 @@
 Maintainer: Mohammed Sameer <msam...@debian.org>
 Build-Depends: autoconf,
                automake1.11,
-               autotools-dev,
+               dh-autoreconf,
                debhelper (>= 7.1),
                iso-codes,
                libbz2-dev,
diff -Naur a/debian/patches/fix_tooltip_crash.patch 
b/debian/patches/fix_tooltip_crash.patch
--- a/debian/patches/fix_tooltip_crash.patch    2014-09-11 15:19:25.456629598 
+0200
+++ b/debian/patches/fix_tooltip_crash.patch    2014-09-11 15:34:16.460582242 
+0200
@@ -1,4 +1,5 @@
-Use the new Gtk::Tooltip API instead of the old Gtk::Tooltips API--- 
a/src/toolbar.cc
+Use the new Gtk::Tooltip API instead of the old Gtk::Tooltips API
+--- a/src/toolbar.cc
 +++ b/src/toolbar.cc
 @@ -94,26 +94,21 @@
  #endif
diff -Naur a/debian/patches/replace_fribidi-config_pkg-config.patch 
b/debian/patches/replace_fribidi-config_pkg-config.patch
--- a/debian/patches/replace_fribidi-config_pkg-config.patch    2014-09-11 
15:19:25.456629598 +0200
+++ b/debian/patches/replace_fribidi-config_pkg-config.patch    2014-09-11 
15:34:16.460582242 +0200
@@ -1,4 +1,5 @@
-fribidi only ships fribidi.pc now. Patched configure.in--- a/configure.in
+fribidi only ships fribidi.pc now. Patched configure.in
+--- a/configure.in
 +++ b/configure.in
 @@ -145,14 +145,8 @@
  fi
diff -Naur a/debian/rules b/debian/rules
--- a/debian/rules      2014-09-11 15:19:25.444629599 +0200
+++ b/debian/rules      2014-09-11 15:42:45.264555200 +0200
@@ -4,9 +4,10 @@
 #export DH_VERBOSE=1
 
 export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
 
 %:
-       dh $@ --with quilt,autotools_dev
+       dh $@ --with quilt,autoreconf
 
 override_dh_auto_configure:
        autoreconf -i

Reply via email to