tags 667284 + patch tags 667284 + pending thanks Dear maintainer,
I've prepared an NMU for mm3d (versioned as 1.3.7-1.4) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Arlo Guthrie: Coming Into Los Angeles
diff -u mm3d-1.3.7/debian/control mm3d-1.3.7/debian/control --- mm3d-1.3.7/debian/control +++ mm3d-1.3.7/debian/control @@ -2,7 +2,7 @@ Section: graphics Priority: optional Maintainer: Gürkan Sengün <gur...@phys.ethz.ch> -Build-Depends: debhelper (>= 5), autotools-dev, libqt4-dev, libqt4-opengl-dev +Build-Depends: debhelper (>= 5), autotools-dev, libqt4-dev, libqt4-opengl-dev, pkg-config Standards-Version: 3.8.0 Homepage: http://www.misfitcode.com/misfitmodel3d/ diff -u mm3d-1.3.7/debian/changelog mm3d-1.3.7/debian/changelog --- mm3d-1.3.7/debian/changelog +++ mm3d-1.3.7/debian/changelog @@ -1,3 +1,16 @@ +mm3d (1.3.7-1.4) unstable; urgency=low + + * Non-maintainer upload. + * Fix unreported FTBFS due to multi-arched Qt: + - build depend on pkg-config + - use it to set Qt's libdir in debian/rules + * Fix "ftbfs with GCC-4.7": + - src/libmm3d/misc.cc: add missing include + - src/libmm3d/sorted_list.h: add this-> qualifiers + (Closes: #667284) + + -- gregor herrmann <gre...@debian.org> Wed, 09 May 2012 17:28:22 +0200 + mm3d (1.3.7-1.3) unstable; urgency=low * Non-maintainer upload. diff -u mm3d-1.3.7/debian/rules mm3d-1.3.7/debian/rules --- mm3d-1.3.7/debian/rules +++ mm3d-1.3.7/debian/rules @@ -9,6 +9,8 @@ CFLAGS = -Wall -g +QtDir=$(shell pkg-config --variable=libdir QtCore) + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -24,7 +26,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --with-Qt-lib-dir=$(QtDir) build: build-stamp diff -u mm3d-1.3.7/src/libmm3d/misc.cc mm3d-1.3.7/src/libmm3d/misc.cc --- mm3d-1.3.7/src/libmm3d/misc.cc +++ mm3d-1.3.7/src/libmm3d/misc.cc @@ -39,6 +39,7 @@ #include <sys/stat.h> #include <ctype.h> #include <errno.h> +#include <unistd.h> using std::string; only in patch2: unchanged: --- mm3d-1.3.7.orig/src/libmm3d/sorted_list.h +++ mm3d-1.3.7/src/libmm3d/sorted_list.h @@ -55,7 +55,7 @@ unsigned len = this->size(); if ( len == 0 || (*this)[len-1] < val ) { - push_back( val ); + this->push_back( val ); } else { @@ -128,7 +128,7 @@ unsigned len = this->size(); if ( len == 0 || *((*this)[len-1]) < *val ) { - push_back( val ); + this->push_back( val ); } else {
signature.asc
Description: Digital signature
