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.