tags 697863 + pending tags 701732 + pending tags 718100 + patch tags 718100 + pending tags 734159 + patch tags 734159 + pending thanks
Dear maintainer, I've prepared an NMU for ftgl (versioned as 2.1.3~rc5-4+nmu1) and uploaded it to DELAYED/8. Please feel free to tell me if I should delay it longer. Note: a collab-maint repo would have allowed me to independently commit diffs for all changes. Regards.
diff -Nru ftgl-2.1.3~rc5/debian/changelog ftgl-2.1.3~rc5/debian/changelog --- ftgl-2.1.3~rc5/debian/changelog 2011-11-26 11:15:46.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/changelog 2014-01-05 17:20:22.000000000 +0100 @@ -1,3 +1,15 @@ +ftgl (2.1.3~rc5-4+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS at generation of pdf doc (Closes: #718100). + * Switch to multiarch (Closes: #734159), but don't mark the -dev package + as such, as it was not tested as such. + * Include debian/watch from Nick Black (Closes: #697863). + * Update libtool at build time using dh-autoreconf, in order to fix a + build failure on x32 (Daniel Schepler, Closes: #701732). + + -- Yann Dirson <dir...@debian.org> Sun, 05 Jan 2014 17:20:22 +0100 + ftgl (2.1.3~rc5-4) unstable; urgency=low * drop doxygen and texlive-* (except texlive-fonts-recommended) and diff -Nru ftgl-2.1.3~rc5/debian/control ftgl-2.1.3~rc5/debian/control --- ftgl-2.1.3~rc5/debian/control 2011-11-26 11:09:37.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/control 2014-01-05 17:17:32.000000000 +0100 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Sam Hocevar <s...@debian.org> -Build-Depends: debhelper (>= 5.0), quilt, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev (>> 2.0.9), doxygen-latex, freeglut3-dev, libcppunit-dev, imagemagick, texlive-fonts-recommended, ghostscript +Build-Depends: debhelper (>= 8.1.3), quilt, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev (>> 2.0.9), doxygen-latex, freeglut3-dev, libcppunit-dev, imagemagick, texlive-fonts-recommended, ghostscript, dh-autoreconf Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/sam-hocevar/pkg-misc/unstable/ftgl Vcs-Browser: http://svn.debian.org/wsvn/sam-hocevar/pkg-misc/unstable/ftgl/ @@ -24,7 +24,9 @@ Package: libftgl2 Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: library to render text in OpenGL using FreeType FTGL binds OpenGL and FreeType together in order to offer and easy to use and flexible text rendering library. It offers several rendering modes: diff -Nru ftgl-2.1.3~rc5/debian/libftgl-dev.install ftgl-2.1.3~rc5/debian/libftgl-dev.install --- ftgl-2.1.3~rc5/debian/libftgl-dev.install 2008-06-15 17:28:51.000000000 +0200 +++ ftgl-2.1.3~rc5/debian/libftgl-dev.install 2014-01-04 14:30:54.000000000 +0100 @@ -1,7 +1,7 @@ usr/include -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/*.pc +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/*.pc usr/share/doc/libftgl-dev/html usr/share/doc/libftgl-dev/ftgl.pdf usr/share/doc/libftgl-dev/*.txt diff -Nru ftgl-2.1.3~rc5/debian/libftgl2.install ftgl-2.1.3~rc5/debian/libftgl2.install --- ftgl-2.1.3~rc5/debian/libftgl2.install 2008-06-15 17:28:51.000000000 +0200 +++ ftgl-2.1.3~rc5/debian/libftgl2.install 2014-01-04 14:29:45.000000000 +0100 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru ftgl-2.1.3~rc5/debian/patches/fix-pdf-generation ftgl-2.1.3~rc5/debian/patches/fix-pdf-generation --- ftgl-2.1.3~rc5/debian/patches/fix-pdf-generation 1970-01-01 01:00:00.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/patches/fix-pdf-generation 2014-01-04 16:25:45.000000000 +0100 @@ -0,0 +1,33 @@ +Description: Fix PDF refman generation + This just remove a pre-latex-processing hack that just breaks nowadays. + The Makefile.in was updated by hand, since autostuff is way old and + apparently more work is needed to make regeneration work properly. +Author: Yann Dirson <dir...@debian.org> +Bug-Debian: http://bugs.debian.org/718100 + +--- ftgl-2.1.3~rc5.orig/docs/Makefile.am ++++ ftgl-2.1.3~rc5/docs/Makefile.am +@@ -33,9 +33,7 @@ stamp-doxygen: doxygen.cfg stamp-eps + + latex/ftgl.pdf: stamp-latex + stamp-latex: stamp-doxygen +- rm -f latex/ftgl.tex latex/ftgl.pdf +- mv latex/refman.tex latex/ftgl.tex +- sed 's/setlength{/renewcommand{/' latex/ftgl.tex > latex/refman.tex ++ rm -f latex/ftgl.pdf + cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1) + mv latex/refman.pdf latex/ftgl.pdf + touch stamp-latex +--- ftgl-2.1.3~rc5.orig/docs/Makefile.in ++++ ftgl-2.1.3~rc5/docs/Makefile.in +@@ -460,9 +460,7 @@ stamp-doxygen: doxygen.cfg stamp-eps + + latex/ftgl.pdf: stamp-latex + stamp-latex: stamp-doxygen +- rm -f latex/ftgl.tex latex/ftgl.pdf +- mv latex/refman.tex latex/ftgl.tex +- sed 's/setlength{/renewcommand{/' latex/ftgl.tex > latex/refman.tex ++ rm -f latex/ftgl.pdf + cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1) + mv latex/refman.pdf latex/ftgl.pdf + touch stamp-latex diff -Nru ftgl-2.1.3~rc5/debian/patches/patch-relibtoolize-prep.diff ftgl-2.1.3~rc5/debian/patches/patch-relibtoolize-prep.diff --- ftgl-2.1.3~rc5/debian/patches/patch-relibtoolize-prep.diff 1970-01-01 01:00:00.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/patches/patch-relibtoolize-prep.diff 2014-01-05 17:19:18.000000000 +0100 @@ -0,0 +1,23 @@ +Index: ftgl-2.1.3~rc5/Makefile.am +=================================================================== +--- ftgl-2.1.3~rc5.orig/Makefile.am 2008-05-12 11:04:08.000000000 -0700 ++++ ftgl-2.1.3~rc5/Makefile.am 2013-02-26 08:38:09.000000000 -0800 +@@ -26,13 +26,13 @@ + + # Print out an informative summary. + all-local: +- @$(ECHO) "Done." +- @$(ECHO) ++ @echo "Done." ++ @echo + @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ +- $(ECHO) "---" ;\ +- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ ++ echo "---" ;\ ++ echo "Run 'make install' to begin installation into $(prefix)" ;\ + fi +- @$(ECHO) ++ echo + + # Upload documentation + DOC = docs/html docs/latex/ftgl.pdf diff -Nru ftgl-2.1.3~rc5/debian/patches/series ftgl-2.1.3~rc5/debian/patches/series --- ftgl-2.1.3~rc5/debian/patches/series 2011-11-26 11:07:51.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/patches/series 2014-01-05 17:18:47.000000000 +0100 @@ -1,2 +1,4 @@ patch-ftglgetlayoutbbox-typo.diff # This comment line intentionally here. +fix-pdf-generation +patch-relibtoolize-prep.diff diff -Nru ftgl-2.1.3~rc5/debian/rules ftgl-2.1.3~rc5/debian/rules --- ftgl-2.1.3~rc5/debian/rules 2011-11-26 10:59:43.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/rules 2014-01-05 17:18:34.000000000 +0100 @@ -5,6 +5,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + CFLAGS = -Wall -g DTMPDIR = $(CURDIR)/debian/tmp @@ -22,7 +24,10 @@ configure-stamp: dh_testdir QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + dh_autoreconf + ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) touch $@ build: build-stamp @@ -37,6 +42,7 @@ rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) distclean QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + dh_autoreconf_clean dh_clean install: build diff -Nru ftgl-2.1.3~rc5/debian/watch ftgl-2.1.3~rc5/debian/watch --- ftgl-2.1.3~rc5/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ ftgl-2.1.3~rc5/debian/watch 2014-01-05 16:34:48.000000000 +0100 @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/-/~/ \ +http://sf.net/ftgl/ftgl-([-\d\.rc]+)\.tar\.gz
