diff -Nru glide-2002.04.10ds1/debian/changelog glide-2002.04.10ds1/debian/changelog --- glide-2002.04.10ds1/debian/changelog 2017-09-29 07:05:32.000000000 +0000 +++ glide-2002.04.10ds1/debian/changelog 2018-09-19 07:34:51.000000000 +0000 @@ -1,3 +1,24 @@ +glide (2002.04.10ds1-14) unstable; urgency=medium + + * Sort fields in debian/control and debian/copyright. + * Do not consider dollar signs as part of the symbol names in assembler + code, thus getting rid of non-existing unresolvable inserted symbols. + (Closes: #908955) + - debian/patches/glide3x-link-unresolved: Update patch. + - debian/patches/z12-local-libtool: Likewise. + * Fix installation permissions to always set write rights for the owner, so + that we can build without root, as fakeroot was shadowing these issues. + - debian/patches/z13-install-perms: New patch. + * Set R³ to no. + * Bump Standards-Version to 4.2.1 (no changes needed). + * Bump debhelper compatibility level to 11. + * Update copyright years. + * Add Comment field in debian/copyright describing why the source tarball + was repackaged. + * Fix building twice in a row by removing autoconf cruft via debian/clean. + + -- Guillem Jover Wed, 19 Sep 2018 09:34:51 +0200 + glide (2002.04.10ds1-13) unstable; urgency=medium * Do not pass inexistent packages via -N to debhelper. (Closes: #876705) @@ -284,7 +305,7 @@ - debian/patches/glide2x-link-libm: New file. - debian/patches/glide3x-link-libm: Likewise. * Do not consider dollar signs as part of the symbol names in assembler - code, thus getting rid of non-existing unresolvable insterted symbols. + code, thus getting rid of non-existing unresolvable inserted symbols. (Closes: #329920, #326099) - debian/patches/glide3x-link-unresolved: New file. * Enable C based cpu detection code on !i386 instead of only on alpha. diff -Nru glide-2002.04.10ds1/debian/clean glide-2002.04.10ds1/debian/clean --- glide-2002.04.10ds1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ glide-2002.04.10ds1/debian/clean 2018-09-19 07:34:51.000000000 +0000 @@ -0,0 +1,17 @@ +glide3x/compile +glide3x/config.guess +glide3x/config.sub +glide3x/depcomp +glide3x/install-sh +glide3x/ltmain.sh +glide3x/missing +glide3x/mkinstalldirs +swlibs/fxmisc/makefile.autoconf.in +swlibs/makefile.autoconf.in +swlibs/newpci/makefile.autoconf.in +swlibs/newpci/pcilib/makefile.autoconf.in +swlibs/texus/lib/makefile.autoconf.in +swlibs/texus/makefile.autoconf.in +swlibs/texus2/cmd/makefile.autoconf.in +swlibs/texus2/lib/makefile.autoconf.in +swlibs/texus2/makefile.autoconf.in diff -Nru glide-2002.04.10ds1/debian/compat glide-2002.04.10ds1/debian/compat --- glide-2002.04.10ds1/debian/compat 2017-09-29 07:02:19.000000000 +0000 +++ glide-2002.04.10ds1/debian/compat 2018-09-19 07:34:51.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru glide-2002.04.10ds1/debian/control glide-2002.04.10ds1/debian/control --- glide-2002.04.10ds1/debian/control 2017-09-29 07:03:14.000000000 +0000 +++ glide-2002.04.10ds1/debian/control 2018-09-19 07:34:51.000000000 +0000 @@ -1,8 +1,14 @@ Source: glide Section: libs Priority: optional +Maintainer: Guillem Jover +Homepage: http://glide.sf.net/ +Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/glide.git +Vcs-Git: https://git.hadrons.org/git/debian/pkgs/glide.git +Standards-Version: 4.2.1 +Rules-Requires-Root: no Build-Depends: - debhelper (>= 10), + debhelper (>= 11), autoconf, automake, libtool (>= 1.5), @@ -10,18 +16,13 @@ libxext-dev, libxxf86dga-dev, libxxf86vm-dev, -Maintainer: Guillem Jover -Homepage: http://glide.sf.net/ -Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/glide.git -Vcs-Git: https://git.hadrons.org/git/debian/pkgs/glide.git -Standards-Version: 4.1.1 Package: glide2-bin Section: graphics Architecture: i386 Depends: - ${shlibs:Depends}, ${misc:Depends}, + ${shlibs:Depends}, Suggests: device3dfx-module, device3dfx-source, @@ -32,8 +33,8 @@ Package: libglide2 Architecture: i386 Depends: - ${shlibs:Depends}, ${misc:Depends}, + ${shlibs:Depends}, pciutils, Suggests: device3dfx-module, @@ -54,8 +55,8 @@ Section: libdevel Architecture: i386 Depends: - libglide2 (= ${binary:Version}), ${misc:Depends}, + libglide2 (= ${binary:Version}), Description: graphics library for 3Dfx Voodoo 2 based cards - development files This package contains the header files, example programs, and documentation necessary to develop software using libglide2. @@ -63,8 +64,8 @@ Package: libglide3 Architecture: i386 alpha ia64 amd64 Depends: - ${shlibs:Depends}, ${misc:Depends}, + ${shlibs:Depends}, pciutils, Description: graphics library for 3Dfx Voodoo 3+ based cards - shared libraries This package allows you to use the 3D functions of cards based on @@ -78,8 +79,8 @@ Section: libdevel Architecture: i386 alpha ia64 amd64 Depends: - libglide3 (= ${binary:Version}), ${misc:Depends}, + libglide3 (= ${binary:Version}), Description: graphics library for 3Dfx Voodoo 3+ based cards - development files This package contains the header files, example programs, and documentation necessary to develop software using libglide3. diff -Nru glide-2002.04.10ds1/debian/copyright glide-2002.04.10ds1/debian/copyright --- glide-2002.04.10ds1/debian/copyright 2017-09-29 07:05:13.000000000 +0000 +++ glide-2002.04.10ds1/debian/copyright 2018-09-19 07:34:51.000000000 +0000 @@ -1,7 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://sourceforge.net/p/glide/code/ branch glide-devel-branch Upstream-Name: glide Upstream-Contact: Guillem Jover -Source: https://sourceforge.net/p/glide/code/ branch glide-devel-branch +Comment: The upstream source tarball was constructed by merging the three + split upstream tarballs into one. Files: * Copyright: @@ -11,7 +13,7 @@ Files: debian/* Copyright: Copyright © 2000-2001 Zephaniah E. Hull - Copyright © 2003-2015, 2017 Guillem Jover + Copyright © 2003-2015, 2017-2018 Guillem Jover License: LGPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License diff -Nru glide-2002.04.10ds1/debian/libglide2.lintian-overrides glide-2002.04.10ds1/debian/libglide2.lintian-overrides --- glide-2002.04.10ds1/debian/libglide2.lintian-overrides 2010-04-27 00:09:35.000000000 +0000 +++ glide-2002.04.10ds1/debian/libglide2.lintian-overrides 2017-11-05 14:22:24.000000000 +0000 @@ -1,3 +1,3 @@ -# There's several backends, one of which gets symlinked at install time. +# There are several backends, one of which gets symlinked at install time. libglide2: postrm-has-useless-call-to-ldconfig libglide2: postinst-has-useless-call-to-ldconfig diff -Nru glide-2002.04.10ds1/debian/libglide3.lintian-overrides glide-2002.04.10ds1/debian/libglide3.lintian-overrides --- glide-2002.04.10ds1/debian/libglide3.lintian-overrides 2010-04-27 00:09:41.000000000 +0000 +++ glide-2002.04.10ds1/debian/libglide3.lintian-overrides 2017-11-05 14:21:08.000000000 +0000 @@ -1,3 +1,3 @@ -# There's several backends, one of which gets symlinked at install time. +# There are several backends, one of which gets symlinked at install time. libglide3: postrm-has-useless-call-to-ldconfig libglide3: postinst-has-useless-call-to-ldconfig diff -Nru glide-2002.04.10ds1/debian/patches/glide3x-link-unresolved glide-2002.04.10ds1/debian/patches/glide3x-link-unresolved --- glide-2002.04.10ds1/debian/patches/glide3x-link-unresolved 2017-01-19 00:51:13.000000000 +0000 +++ glide-2002.04.10ds1/debian/patches/glide3x-link-unresolved 2018-09-19 07:34:51.000000000 +0000 @@ -1,5 +1,8 @@ -Index: b/glide3x/h5/glide3/src/makefile.autoconf.am -=================================================================== +--- + glide3x/h3/glide3/src/makefile.autoconf.am | 2 +- + glide3x/h5/glide3/src/makefile.autoconf.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + --- a/glide3x/h5/glide3/src/makefile.autoconf.am +++ b/glide3x/h5/glide3/src/makefile.autoconf.am @@ -152,7 +152,7 @@ LDEFS = -DGLIDE_LIB -DGLIDE3 -DGLIDE3_AL @@ -11,3 +14,14 @@ xdraw2_def.o xdraw2_def.lo: xdraw2.s xdraw2.inc.s fxgasm.h $(PREPROCESSOR) $< > $*.tmp.s libtool --mode=compile $(CC) $(AFLAGS) -c -o $*.o $*.tmp.s +--- a/glide3x/h3/glide3/src/makefile.autoconf.am ++++ b/glide3x/h3/glide3/src/makefile.autoconf.am +@@ -130,7 +130,7 @@ LDEFS = -DGLIDE_INIT_HWC \ + # Special rules for assembly files. + # + +-CPPASFLAGS = -fdollars-in-identifiers -x assembler-with-cpp -I. ++CPPASFLAGS = -x assembler-with-cpp -I. + + xdraw2.lo : xdraw2.S xdraw2.inc.S fxgasm.h + libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $< diff -Nru glide-2002.04.10ds1/debian/patches/series glide-2002.04.10ds1/debian/patches/series --- glide-2002.04.10ds1/debian/patches/series 2017-01-19 00:51:13.000000000 +0000 +++ glide-2002.04.10ds1/debian/patches/series 2018-09-19 07:34:51.000000000 +0000 @@ -34,3 +34,4 @@ z10-ftbfs-gcc-4.8 z11-format-string z12-local-libtool +z13-install-perms diff -Nru glide-2002.04.10ds1/debian/patches/z12-local-libtool glide-2002.04.10ds1/debian/patches/z12-local-libtool --- glide-2002.04.10ds1/debian/patches/z12-local-libtool 2017-01-19 00:51:13.000000000 +0000 +++ glide-2002.04.10ds1/debian/patches/z12-local-libtool 2018-09-19 07:34:51.000000000 +0000 @@ -11,7 +11,7 @@ +LIBTOOL = @LIBTOOL@ + - CPPASFLAGS = -fdollars-in-identifiers -x assembler-with-cpp -I. + CPPASFLAGS = -x assembler-with-cpp -I. xdraw2.lo : xdraw2.S xdraw2.inc.S fxgasm.h - libtool --mode=compile $(CCAS) $(CCASFLAGS) $(CPPASFLAGS) -c -o $@ $< diff -Nru glide-2002.04.10ds1/debian/patches/z13-install-perms glide-2002.04.10ds1/debian/patches/z13-install-perms --- glide-2002.04.10ds1/debian/patches/z13-install-perms 1970-01-01 00:00:00.000000000 +0000 +++ glide-2002.04.10ds1/debian/patches/z13-install-perms 2018-09-19 07:34:51.000000000 +0000 @@ -0,0 +1,69 @@ +--- + swlibs/include/make/3dfx.linux.mak | 8 ++++---- + swlibs/include/make/3dfx.mak | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +--- a/swlibs/include/make/3dfx.linux.mak ++++ b/swlibs/include/make/3dfx.linux.mak +@@ -162,7 +162,7 @@ $(THISDIR)incs: $(HEADERS) + ifdef HEADERS + ifdef INSTALL_DESTINATION + $(INSTALL) -d $(INSTALL_DESTINATION)/include +- $(INSTALL) -m 444 $(HEADERS) $(INSTALL_DESTINATION)/include ++ $(INSTALL) -m 644 $(HEADERS) $(INSTALL_DESTINATION)/include + else + @echo INSTALL_DESTINATION not defined, not installing HEADERS + endif +@@ -193,9 +193,9 @@ endif + $(THISDIR)libs: $(LIBRARIES) $(SHARED_LIBRARY) + ifdef INSTALL_DESTINATION + $(INSTALL) -d $(INSTALL_DESTINATION)/lib +- $(INSTALL) -m 444 $(LIBRARIES) $(INSTALL_DESTINATION)/lib ++ $(INSTALL) -m 644 $(LIBRARIES) $(INSTALL_DESTINATION)/lib + ifneq "$(SHARED_LIBRARY)" "" +- $(INSTALL) -m 444 $(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib ++ $(INSTALL) -m 644 $(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib + # Create proper symlinks for the shared library so that the binaries + # can link against it. + rm -f $(INSTALL_DESTINATION)/lib/$(SONAME) +@@ -232,7 +232,7 @@ ifneq ($(strip $(INSTALL_TARGETS)),) + ifdef INSTALL_DESTINATION + echo installing $(INSTALL_TARGETS) + $(INSTALL) -d $(INSTALL_DESTINATION)/bin +- $(INSTALL) -m 555 $(INSTALL_TARGETS) $(INSTALL_DESTINATION)/bin ++ $(INSTALL) -m 755 $(INSTALL_TARGETS) $(INSTALL_DESTINATION)/bin + else + @echo INSTALL_DESTINATION not defined, not installing PROGRAMS + endif +--- a/swlibs/include/make/3dfx.mak ++++ b/swlibs/include/make/3dfx.mak +@@ -231,7 +231,7 @@ $(THISDIR)incs: $(HEADERS) + ifdef HEADERS + ifdef INSTALL_DESTINATION + $(INSTALL) -d $(INSTALL_DESTINATION)/include +- $(INSTALL) -m 444 $(HEADERS) $(INSTALL_DESTINATION)/include ++ $(INSTALL) -m 644 $(HEADERS) $(INSTALL_DESTINATION)/include + else + @echo INSTALL_DESTINATION not defined, not installing HEADERS + endif +@@ -270,9 +270,9 @@ endif + $(THISDIR)libs: $(LIBRARIES) $(SHARED_LIBRARY) + ifdef INSTALL_DESTINATION + $(INSTALL) -d $(INSTALL_DESTINATION)/lib +- $(INSTALL) -m 444 $(LIBRARIES) $(INSTALL_DESTINATION)/lib ++ $(INSTALL) -m 644 $(LIBRARIES) $(INSTALL_DESTINATION)/lib + ifneq "$(SHARED_LIBRARY)" "" +- $(INSTALL) -m 444 $(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib ++ $(INSTALL) -m 644 $(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib + ln -sf $(INSTALL_DESTINATION)/lib/$(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib/$(SONAME) + ln -sf $(INSTALL_DESTINATION)/lib/$(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib/$(BASENAME) + endif +@@ -309,7 +309,7 @@ ifneq ($(strip $(INSTALL_TARGETS)),) + ifdef INSTALL_DESTINATION + echo installing $(INSTALL_TARGETS) + $(INSTALL) -d $(INSTALL_DESTINATION)/bin +- $(INSTALL) -m 555 $(INSTALL_TARGETS) $(INSTALL_DESTINATION)/bin ++ $(INSTALL) -m 755 $(INSTALL_TARGETS) $(INSTALL_DESTINATION)/bin + else + @echo INSTALL_DESTINATION not defined, not installing PROGRAMS + endif