Bug#698997: marked as done (unblock: italc/1:1.0.13-1.4)

To: "Adam D. Barratt" <adam@adam-barratt.org.uk>
Subject: Bug#698997: marked as done (unblock: italc/1:1.0.13-1.4)
From: owner@bugs.debian.org (Debian Bug Tracking System)
Date: Sun, 27 Jan 2013 16:30:14 +0000
Message-id: <handler.698997.D698997.135930402725243.ackdone@bugs.debian.org>
References: <1359304020.28246.54.camel@jacala.jungle.funky-badger.org> <201301261213.03307.onlyjob@member.fsf.org>

Your message dated Sun, 27 Jan 2013 16:27:00 +0000
with message-id <1359304020.28246.54.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#698997: unblock: italc/1:1.0.13-1.4
has caused the Debian Bug report #698997,
regarding unblock: italc/1:1.0.13-1.4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
698997: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698997
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems

--- Begin Message ---

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: unblock: italc/1:1.0.13-1.4
From: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Sat, 26 Jan 2013 12:12:58 +1100
Message-id: <201301261213.03307.onlyjob@member.fsf.org>

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-CC: glaubitz@physik.fu-berlin.de

Please unblock package 'italc'

        unblock italc/1:1.0.13-1.4

This version fixes two FTBFS bugs:

	"italc: FTBFS: Couldn't find any Qt4 libraries" (#671489)

	"FTBFS with GCC-4.7" (wrong bug number in previous NMU)

Diff is attached, new changelog entries as below:

##############################################
italc (1:1.0.13-1.4) unstable; urgency=medium

  * Non-maintainer upload.
  * fixed FTBFS (Closes: #671489).
    + added new "qtpath.patch" to avoid fatal error for wrong path
      to libraries.
    + introduced dh-autoreconf to regenerate "configure" script using
      corrected "acinclude.m4" file.

 -- Dmitry Smirnov <onlyjob@member.fsf.org>  Thu, 08 Nov 2012 15:08:19 +1100

italc (1:1.0.13-1.3) unstable; urgency=low

  * Non maintainer upload.
  * Fix build failure with GCC 4.7. Closes: #667203.

 -- Matthias Klose <doko@debian.org>  Fri, 04 May 2012 08:37:15 +0200
##############################################

I've just realized that #667203 is incorrect bug number; I verified the 
corresponding patch to build with GCC-4.7 and found that the patch is 
necessary and it works.

Thank you.

-- 
Cheers,
 Dmitry Smirnov

---

Every decent man is ashamed of the government he lives under.
        -- H. L. Mencken

diff --git a/italc-1.0.13/debian/changelog b/italc-1.0.13/debian/changelog
index 92d6f38..9a12d7b 100644
--- a/italc-1.0.13/debian/changelog
+++ b/italc-1.0.13/debian/changelog
@@ -1,3 +1,21 @@
+italc (1:1.0.13-1.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * fixed FTBFS (Closes: #671489).
+    + added new "qtpath.patch" to avoid fatal error for wrong path
+      to libraries.
+    + introduced dh-autoreconf to regenerate "configure" script using
+      corrected "acinclude.m4" file.
+
+ -- Dmitry Smirnov <onlyjob@member.fsf.org>  Thu, 08 Nov 2012 15:08:19 +1100
+
+italc (1:1.0.13-1.3) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #667203.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 04 May 2012 08:37:15 +0200
+
 italc (1:1.0.13-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/italc-1.0.13/debian/control b/italc-1.0.13/debian/control
index fdd63ce..8ad39b6 100644
--- a/italc-1.0.13/debian/control
+++ b/italc-1.0.13/debian/control
@@ -2,7 +2,7 @@ Source: italc
 Section: x11
 Priority: optional
 Maintainer: Patrick Winnertz <winnie@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0), libqt4-dev, zlib1g-dev, libjpeg-dev, libssl-dev, imagemagick, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 5.0), dh-autoreconf, libqt4-dev, zlib1g-dev, libjpeg-dev, libssl-dev, imagemagick, libxtst-dev
 Standards-Version: 3.9.1
 Homepage: http://italc.sourceforge.net/home.php
 
diff --git a/italc-1.0.13/debian/patches/ftbfs-gcc-4.7.diff b/italc-1.0.13/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..0d0f24d
--- /dev/null
+++ b/italc-1.0.13/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,78 @@
+Index: italc-1.0.13/ica/Makefile.am
+===================================================================
+--- italc-1.0.13.orig/ica/Makefile.am	2010-12-14 14:51:19.000000000 +0000
++++ italc-1.0.13/ica/Makefile.am	2012-05-04 06:40:07.019771287 +0000
+@@ -97,7 +97,7 @@
+ endif
+ 
+ ica_LDADD = $(QT_LDADD) $(QT_LIB_GUI) -lz -ljpeg $(LIBSSL_LDADD) $(IVSLDADD) $(WIN32_RES_LDADD) -L../lib -litalc_core
+-ica_LDFLAGS = $(LDFLAGS) -mwindows -rpath $(pkglibdir)
++ica_LDFLAGS = $(LDFLAGS) -rpath $(pkglibdir)
+ 
+ AM_CXXFLAGS = $(QT_CXXFLAGS) -O2 -DBUILD_ICA $(CXXFLAGS_ADD)
+ AM_CFLAGS = -O2 -DBUILD_ICA -DVNCSHARED -DFOREVER -DNOREPEAT=0 -DNOPW=1 -DREMOTE_CONTROL=0 -DEXTERNAL_COMMANDS=0 -DFILEXFER=0 -DNOGUI -DSMALL_FOOTPRINT=1 -w
+Index: italc-1.0.13/ica/Makefile.in
+===================================================================
+--- italc-1.0.13.orig/ica/Makefile.in	2011-01-06 10:46:18.000000000 +0000
++++ italc-1.0.13/ica/Makefile.in	2012-05-04 06:40:07.023771287 +0000
+@@ -377,7 +377,7 @@
+ @HAVE_LIBSSL_TRUE@LIBSSL_LDADD = -lssl -lcrypto
+ @BUILD_WIN32_TRUE@WIN32_RES_LDADD = ica_win_resources.o -L. -lvnchooks
+ ica_LDADD = $(QT_LDADD) $(QT_LIB_GUI) -lz -ljpeg $(LIBSSL_LDADD) $(IVSLDADD) $(WIN32_RES_LDADD) -L../lib -litalc_core
+-ica_LDFLAGS = $(LDFLAGS) -mwindows -rpath $(pkglibdir)
++ica_LDFLAGS = $(LDFLAGS) -rpath $(pkglibdir)
+ AM_CXXFLAGS = $(QT_CXXFLAGS) -O2 -DBUILD_ICA $(CXXFLAGS_ADD)
+ AM_CFLAGS = -O2 -DBUILD_ICA -DVNCSHARED -DFOREVER -DNOREPEAT=0 -DNOPW=1 -DREMOTE_CONTROL=0 -DEXTERNAL_COMMANDS=0 -DFILEXFER=0 -DNOGUI -DSMALL_FOOTPRINT=1 -w
+ INCLUDES = $(IVS_INCLUDES) -I$(srcdir)/../lib/include -I$(srcdir)/../lib/include/rfb -I$(srcdir)/src -I$(top_srcdir)
+Index: italc-1.0.13/ima/Makefile.am
+===================================================================
+--- italc-1.0.13.orig/ima/Makefile.am	2010-12-14 14:51:19.000000000 +0000
++++ italc-1.0.13/ima/Makefile.am	2012-05-04 06:40:07.023771287 +0000
+@@ -123,7 +123,7 @@
+ 
+ 
+ italc_LDADD = $(QT_LDADD) $(QT_LIB_GUI) $(LIBZ_LDADD) -ljpeg $(LIBSSL_LDADD) $(WIN32_RES_LDADD) -L../lib -litalc_core
+-italc_LDFLAGS = $(LDFLAGS) -mwindows -rpath $(pkglibdir)
++italc_LDFLAGS = $(LDFLAGS) -rpath $(pkglibdir)
+ 
+ AM_CXXFLAGS = $(QT_CXXFLAGS)
+ 
+Index: italc-1.0.13/ima/Makefile.in
+===================================================================
+--- italc-1.0.13.orig/ima/Makefile.in	2011-01-06 10:46:18.000000000 +0000
++++ italc-1.0.13/ima/Makefile.in	2012-05-04 06:40:07.027771285 +0000
+@@ -340,7 +340,7 @@
+ @HAVE_LIBEAY32_TRUE@LIBSSL_LDADD = -leay32
+ @HAVE_LIBSSL_TRUE@LIBSSL_LDADD = -lssl -lcrypto
+ italc_LDADD = $(QT_LDADD) $(QT_LIB_GUI) $(LIBZ_LDADD) -ljpeg $(LIBSSL_LDADD) $(WIN32_RES_LDADD) -L../lib -litalc_core
+-italc_LDFLAGS = $(LDFLAGS) -mwindows -rpath $(pkglibdir)
++italc_LDFLAGS = $(LDFLAGS) -rpath $(pkglibdir)
+ AM_CXXFLAGS = $(QT_CXXFLAGS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+Index: italc-1.0.13/setup/Makefile.am
+===================================================================
+--- italc-1.0.13.orig/setup/Makefile.am	2010-12-14 14:51:19.000000000 +0000
++++ italc-1.0.13/setup/Makefile.am	2012-05-04 06:40:07.027771285 +0000
+@@ -54,7 +54,7 @@
+ endif
+ 
+ setup_LDADD = $(PLATFORM_LDADD) -L../lib/ -litalc_core $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg
+-setup_LDFLAGS = $(LDFLAGS) -mwindows
++setup_LDFLAGS = $(LDFLAGS)
+ 
+ AM_CXXFLAGS = $(QT_CXXFLAGS)
+ 
+Index: italc-1.0.13/setup/Makefile.in
+===================================================================
+--- italc-1.0.13.orig/setup/Makefile.in	2011-01-06 10:46:18.000000000 +0000
++++ italc-1.0.13/setup/Makefile.in	2012-05-04 06:40:07.027771285 +0000
+@@ -243,7 +243,7 @@
+ @HAVE_LIBSSL_TRUE@LIBSSL_LDADD = -lssl -lcrypto
+ @BUILD_WIN32_TRUE@PLATFORM_LDADD = setup_win_resources.o
+ setup_LDADD = $(PLATFORM_LDADD) -L../lib/ -litalc_core $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg
+-setup_LDFLAGS = $(LDFLAGS) -mwindows
++setup_LDFLAGS = $(LDFLAGS)
+ AM_CXXFLAGS = $(QT_CXXFLAGS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/italc-1.0.13/debian/patches/qtpath.patch b/italc-1.0.13/debian/patches/qtpath.patch
new file mode 100644
index 0000000..9b61bff
--- /dev/null
+++ b/italc-1.0.13/debian/patches/qtpath.patch
@@ -0,0 +1,20 @@
+Last-Update: 2012-11-08
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671489
+Description: fix FTBFS due to incorrect location of QT libraries
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -129,11 +129,8 @@
+     *)
+        	QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null` 
+         if test "x$QT_LIBS" = x;  then
+         	QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null` 
+-            	if test "x$QT_LIBS" = x;  then
+-			AC_MSG_ERROR([*** Couldn't find any Qt4 libraries])
+-            	fi
+ 		QT_LIB="-L$QTDIR/lib -L$QTDIR/lib/qt4"
+ 	else
+ 		QT_LIB="-L$QTDIR/lib64 -L$QTDIR/lib64/qt4"
+         fi
diff --git a/italc-1.0.13/debian/rules b/italc-1.0.13/debian/rules
index d2f7894..1ee127a 100755
--- a/italc-1.0.13/debian/rules
+++ b/italc-1.0.13/debian/rules
@@ -2,6 +2,7 @@
   
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp

Attachment: signature.asc
Description: This is a digitally signed message part.

--- End Message ---

--- Begin Message ---

To: Dmitry Smirnov <onlyjob@member.fsf.org>, 698997-done@bugs.debian.org

Subject: Re: Bug#698997: unblock: italc/1:1.0.13-1.4

From: "Adam D. Barratt" <adam@adam-barratt.org.uk>

Date: Sun, 27 Jan 2013 16:27:00 +0000

Message-id: <1359304020.28246.54.camel@jacala.jungle.funky-badger.org>

In-reply-to: <201301262249.51582.onlyjob@member.fsf.org>

References: <201301261213.03307.onlyjob@member.fsf.org> <1359197414.28246.22.camel@jacala.jungle.funky-badger.org> <201301262249.51582.onlyjob@member.fsf.org>
On Sat, 2013-01-26 at 22:49 +1100, Dmitry Smirnov wrote:
> On Sat, 26 Jan 2013 21:50:14 Adam D. Barratt wrote:
> > 
> > >     + added new "qtpath.patch" to avoid fatal error for wrong path
> > >       to libraries.
> > 
> > I may be missing something here, but the patch simply removes the error
> > message. Presumably the fact that the error is being raised in the first
> > place indicates an actual problem? If not then the test seems somewhat
> > redundant in the first place.
[...]
> In other words I'm removing failure point: unnecessary check for library in 
> wrong  location. "Simply removing the error message" is enough to fix the 
> problem.
> 
> I hope it makes sense.

Well, yes, but it would have been better to fix the test to properly
detect the libraries in the face of multi-arch, imho. However, on the
basis that it does appear to resolve the issue in this case; unblocked.

Regards,

Adam
--- End Message ---

Reply to:

References:
- Bug#698997: unblock: italc/1:1.0.13-1.4
  - From: Dmitry Smirnov <onlyjob@member.fsf.org>

Prev by Date: Bug#697639: release.debian.org: please upgrade cairo in wheezy
Next by Date: Bug#687583: title "unblock" to "rm altos/wheezy"
Previous by thread: Bug#698997: unblock: italc/1:1.0.13-1.4
Next by thread: Reproduced 669878 - Could not perform immediate configuration on 'phonon-backend-vlc'
Index(es):
- Date
- Thread