Control: tags -1 +patch Hi,
Attached patch would fix this FTBFS, could you check and consider to apply it, please? -- Regards, Hideki Yamane henrich @ debian.or.jp/org http://wiki.debian.org/HidekiYamane
diff -Nru viking-1.4.2/debian/changelog viking-1.4.2/debian/changelog --- viking-1.4.2/debian/changelog 2013-10-23 22:11:55.000000000 +0900 +++ viking-1.4.2/debian/changelog 2013-10-23 22:08:06.000000000 +0900 @@ -1,3 +1,18 @@ +viking (1.4.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules + - add autoreconf to dh to fix FTBFS (Closes: #725529) + - not dh --with quilt but use source format 3.0 + * debian/control + - add "Build-Depends: dh-autoreconf" + * set debian/source/format as "3.0 (quilt)" + * debian/patches + - add set_subdir-objects.patch + - add no_doc-dir.patch + + -- Hideki Yamane <henr...@debian.org> Tue, 22 Oct 2013 22:14:14 +0900 + viking (1.4.2-1) unstable; urgency=low * [953c9042] Imported Upstream version 1.4.2 (Closes: #690981) diff -Nru viking-1.4.2/debian/control viking-1.4.2/debian/control --- viking-1.4.2/debian/control 2013-10-23 22:11:55.000000000 +0900 +++ viking-1.4.2/debian/control 2013-10-23 21:48:21.000000000 +0900 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Bernd Zeimetz <b...@debian.org> Uploaders: Guilhem BONNEFILLE <guilhem.bonnefi...@gmail.com> -Build-Depends: debhelper (>= 7.2.14), automake (>= 1.13), autoconf, autotools-dev (>= 20100122.1~), libcurl4-gnutls-dev, libexpat1-dev, libgtk2.0-dev, libglib2.0-dev (>= 2.12.0), libgps-dev (>= 2.90), xsltproc, docbook-xsl, docbook-xml, intltool, quilt (>= 0.46-8), bc, gnome-doc-utils (>= 0.3.2), rarian-compat | scrollkeeper, libexif-dev +Build-Depends: debhelper (>= 7.2.14), automake (>= 1.13), autoconf, autotools-dev (>= 20100122.1~), libcurl4-gnutls-dev, libexpat1-dev, libgtk2.0-dev, libglib2.0-dev (>= 2.12.0), libgps-dev (>= 2.90), xsltproc, docbook-xsl, docbook-xml, intltool, quilt (>= 0.46-8), bc, gnome-doc-utils (>= 0.3.2), rarian-compat | scrollkeeper, libexif-dev, dh-autoreconf Standards-Version: 3.8.4 Homepage: http://viking.sf.net Vcs-Git: git://git.debian.org/collab-maint/viking.git diff -Nru viking-1.4.2/debian/patches/no_doc-dir.patch viking-1.4.2/debian/patches/no_doc-dir.patch --- viking-1.4.2/debian/patches/no_doc-dir.patch 1970-01-01 09:00:00.000000000 +0900 +++ viking-1.4.2/debian/patches/no_doc-dir.patch 2013-10-23 22:06:53.000000000 +0900 @@ -0,0 +1,55 @@ +Description: don't specify VIKING_DOC + + - don't specify VIKING_DOC since we don't have doc sub directory + - GTK_DOC_CHECK cause parse error + +Forwarded: no +Last-Update: 2013-10-23 + +Index: viking-1.4.2/configure.ac +=================================================================== +--- viking-1.4.2.orig/configure.ac 2013-10-23 21:50:46.822460778 +0900 ++++ viking-1.4.2/configure.ac 2013-10-23 22:03:31.030122042 +0900 +@@ -6,7 +6,6 @@ + AM_INIT_AUTOMAKE([dist-bzip2 dist-zip subdir-objects]) + dnl AC_CONFIG_SRCDIR([src/main.c]) + AC_CONFIG_HEADERS([src/config.h]) +-GTK_DOC_CHECK(1.0) + + # Checks for programs. + AC_PROG_CC +@@ -342,8 +341,6 @@ + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + AC_SUBST(ACLOCAL_AMFLAGS) + +-AM_CONDITIONAL([VIKING_DOC], test x${enable_gtk_doc} = xyes) +- + # Configuration + AC_CONFIG_FILES([ + Makefile +@@ -357,11 +354,6 @@ + win32/installer/Makefile + win32/installer/pixmaps/Makefile + win32/installer/translations/Makefile]) +-AM_COND_IF([VIKING_DOC], +- [AC_CONFIG_FILES([ +- doc/Makefile +- doc/reference/Makefile +- doc/examples/Makefile])]) + + AC_OUTPUT([ + viking.spec +Index: viking-1.4.2/Makefile.am +=================================================================== +--- viking-1.4.2.orig/Makefile.am 2013-06-01 07:01:35.000000000 +0900 ++++ viking-1.4.2/Makefile.am 2013-10-23 21:51:01.934450885 +0900 +@@ -1,8 +1,4 @@ +-# Optionally build documentation bits +-if VIKING_DOC +- DO_DOCS = "doc" +-endif +-SUBDIRS = src test data po win32 help $(DO_DOCS) ++SUBDIRS = src test data po win32 help + + INTLTOOL = \ + intltool-extract.in \ diff -Nru viking-1.4.2/debian/patches/series viking-1.4.2/debian/patches/series --- viking-1.4.2/debian/patches/series 2013-10-23 22:11:55.000000000 +0900 +++ viking-1.4.2/debian/patches/series 2013-10-23 21:48:21.000000000 +0900 @@ -1,2 +1,4 @@ 0001-disable-po-check.patch 0003-Add-missing-lz.patch +set_subdir-objects.patch +no_doc-dir.patch diff -Nru viking-1.4.2/debian/patches/set_subdir-objects.patch viking-1.4.2/debian/patches/set_subdir-objects.patch --- viking-1.4.2/debian/patches/set_subdir-objects.patch 1970-01-01 09:00:00.000000000 +0900 +++ viking-1.4.2/debian/patches/set_subdir-objects.patch 2013-10-23 21:48:21.000000000 +0900 @@ -0,0 +1,15 @@ +Description: exec in subdirectories +Forwarded: no +Last-Update: 2013-10-23 + +--- viking-1.4.2.orig/configure.ac ++++ viking-1.4.2/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ(2.59) + AC_INIT(viking, 1.4.2) +-AM_INIT_AUTOMAKE([dist-bzip2 dist-zip]) ++AM_INIT_AUTOMAKE([dist-bzip2 dist-zip subdir-objects]) + dnl AC_CONFIG_SRCDIR([src/main.c]) + AC_CONFIG_HEADERS([src/config.h]) + GTK_DOC_CHECK(1.0) diff -Nru viking-1.4.2/debian/rules viking-1.4.2/debian/rules --- viking-1.4.2/debian/rules 2013-10-23 22:11:55.000000000 +0900 +++ viking-1.4.2/debian/rules 2013-10-23 22:00:46.000000000 +0900 @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 %: - dh --with quilt,autotools_dev $@ + dh $@ --with autotools_dev,autoreconf override_dh_auto_test: # The test suite is buggy. diff -Nru viking-1.4.2/debian/source/format viking-1.4.2/debian/source/format --- viking-1.4.2/debian/source/format 2013-10-23 22:11:55.000000000 +0900 +++ viking-1.4.2/debian/source/format 2013-10-23 21:48:21.000000000 +0900 @@ -1 +1 @@ -1.0 +3.0 (quilt)
