tags 552851 + patch thanks Hi,
This problem occurs because the function (log2) declared with the same name twice: in the file mfsk.h and in the file misk.h. Changing the name of one of their - problem disappears. But since the function log2 declared in header file misk.h is not used at all in this source, I suggest it simply to comment out. Attached is the diff for my gmfsk-0.6+0.7pre1-2.2 NMU. If you intent to upload yourself, please notify me within 7 days, so that I interrupt the process on my side. -- Kęstutis Biliūnas <ke...@kaunas.init.lt> http://kebil.ghost.lt | GnuPG-Key ID: F6E7A452
diff -u gmfsk-0.6+0.7pre1/debian/patches/00list gmfsk-0.6+0.7pre1/debian/patches/00list --- gmfsk-0.6+0.7pre1/debian/patches/00list +++ gmfsk-0.6+0.7pre1/debian/patches/00list @@ -4,0 +5 @@ +13_log2_fix.dpatch diff -u gmfsk-0.6+0.7pre1/debian/rules gmfsk-0.6+0.7pre1/debian/rules --- gmfsk-0.6+0.7pre1/debian/rules +++ gmfsk-0.6+0.7pre1/debian/rules @@ -6,6 +6,14 @@ build: build-stamp build-stamp: patch-stamp dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + ./configure --prefix=/usr --sysconfdir=/etc --enable-hamlib $(MAKE) @@ -14,7 +22,7 @@ clean: clean1 unpatch clean1: dh_testdir - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean -rm build-stamp config.log dh_clean @@ -43,10 +51,10 @@ dh_strip dh_compress dh_fixperms + dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol - dh_makeshlibs dh_md5sums dh_builddeb diff -u gmfsk-0.6+0.7pre1/debian/control gmfsk-0.6+0.7pre1/debian/control --- gmfsk-0.6+0.7pre1/debian/control +++ gmfsk-0.6+0.7pre1/debian/control @@ -3,7 +3,8 @@ Priority: optional Maintainer: Hamish Moffatt <ham...@debian.org> Standards-Version: 3.6.2 -Build-Depends: debhelper (>= 4), fftw-dev, libgnomeui-dev, libhamlib-dev | hamlib-dev (>= 1.2.4), scrollkeeper, gconf2, dpatch +Build-Depends: debhelper (>= 4), fftw-dev, libgnomeui-dev, libhamlib-dev | hamlib-dev (>= 1.2.4), scrollkeeper, gconf2, dpatch, + autotools-dev Package: gmfsk Architecture: any diff -u gmfsk-0.6+0.7pre1/debian/changelog gmfsk-0.6+0.7pre1/debian/changelog --- gmfsk-0.6+0.7pre1/debian/changelog +++ gmfsk-0.6+0.7pre1/debian/changelog @@ -1,3 +1,17 @@ +gmfsk (0.6+0.7pre1-2.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches: added the patch 13_log2_fix.dpatch for fix FTBFS + (Closes: #552851). + * debian/control: added autotools-dev to Build-Depends; + * debian/rules: + - update files config.sub and config.guess, as lintian complains + that these files are ancient; + - fixed the order of calling debhelper programs dh_; + - fixed the clean target. + + -- Kęstutis Bilūnas <kes...@kaunas.init.lt> Sun, 29 Nov 2009 19:55:06 +0200 + gmfsk (0.6+0.7pre1-2.1) unstable; urgency=low * Non-maintainer upload. diff -u gmfsk-0.6+0.7pre1/help/gmfsk/C/gmfsk-C.omf.out gmfsk-0.6+0.7pre1/help/gmfsk/C/gmfsk-C.omf.out --- gmfsk-0.6+0.7pre1/help/gmfsk/C/gmfsk-C.omf.out +++ gmfsk-0.6+0.7pre1/help/gmfsk/C/gmfsk-C.omf.out @@ -1,32 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd";> <omf> - <resource> - <creator> - oh2...@sral.fi (Tomi Manninen) - </creator> - <maintainer> - oh2...@sral.fi (Tomi Manninen) - </maintainer> - <title> - gMFSK Manual V0.2 - </title> - <date> - 2003-05-05 - </date> - <version identifier="0.1" date="2003-05-05" description="First release, program version 0.6"/> - <version identifier="0.2" date="2004-02-17" description="Updated, program version 0.6"/> - <subject category="GNOME|Applications"/> - <description> - User manual for the gMFSK HF terminal program. - </description> - <type> - User's guide - </type> - <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/> - <identifier url="file:/usr/share/gnome/help/gmfsk/C/gmfsk.xml"/> - <language code="C"/> - <relation seriesid="752f51ec-7eed-11d7-8f1f-fbed39709854"/> - <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"; holder="Tomi Manninen"/> - </resource> + <resource> + <creator>oh2...@sral.fi (Tomi Manninen)</creator> + <maintainer>oh2...@sral.fi (Tomi Manninen)</maintainer> + <title>gMFSK Manual V0.2</title> + <date>2003-05-05</date> + <version identifier="0.1" date="2003-05-05" description="First release, program version 0.6" /> + <version identifier="0.2" date="2004-02-17" description="Updated, program version 0.6" /> + <subject category="GNOME|Applications" /> + <description>User manual for the gMFSK HF terminal program.</description> + <type>User's guide</type> + <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN" /> + <identifier url="" /> + <language code="C" /> + <relation seriesid="752f51ec-7eed-11d7-8f1f-fbed39709854" /> + <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"; holder="Tomi Manninen" /> + </resource> </omf> only in patch2: unchanged: --- gmfsk-0.6+0.7pre1.orig/debian/patches/13_log2_fix.dpatch +++ gmfsk-0.6+0.7pre1/debian/patches/13_log2_fix.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 13_log2_fix.dpatch by <kes...@kebil-home> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad gmfsk-0.6+0.7pre1~/src/misc/misc.c gmfsk-0.6+0.7pre1/src/misc/misc.c +--- gmfsk-0.6+0.7pre1~/src/misc/misc.c 2005-01-04 23:07:42.000000000 +0200 ++++ gmfsk-0.6+0.7pre1/src/misc/misc.c 2009-11-29 01:16:37.000000000 +0200 +@@ -105,6 +105,7 @@ + /* + * Integer base-2 logarithm + */ ++/* + guint log2(guint x) + { + int y = 0; +@@ -118,6 +119,7 @@ + + return y; + } ++*/ + + /* ---------------------------------------------------------------------- */ + +diff -urNad gmfsk-0.6+0.7pre1~/src/misc/misc.h gmfsk-0.6+0.7pre1/src/misc/misc.h +--- gmfsk-0.6+0.7pre1~/src/misc/misc.h 2009-11-29 01:11:49.000000000 +0200 ++++ gmfsk-0.6+0.7pre1/src/misc/misc.h 2009-11-29 01:17:12.000000000 +0200 +@@ -107,6 +107,7 @@ + /* + * Integer base-2 logarithm + */ ++/* + extern inline guint log2(guint x) + { + int y = 0; +@@ -121,6 +121,7 @@ + + return y; + } ++*/ + + /* ---------------------------------------------------------------------- */ +
