Control: tags - moreinfo Hi Jonathan, sorry for the huge debdiff.
The reason is that I stripped the upstream-generated doxygen stuff, part of this bug. They ship a minified jquery library, without the source code and the jquery that is actually in debian/sources/missing-sources *doesn't* reflect the minified js (doxygen uses a patched jquery version, without the correspondant source code.) So I removed all the generated stuff and repacked the source, generating the documentation at build time. I also cherry-picked some copyright fixes and wrap and sorted some build depends diff -Nru libsdl2-gfx-1.0.1/debian/changelog libsdl2-gfx-1.0.1+dfsg/debian/changelog --- libsdl2-gfx-1.0.1/debian/changelog 2014-07-26 23:08:43.000000000 +0200 +++ libsdl2-gfx-1.0.1+dfsg/debian/changelog 2014-10-30 15:04:12.000000000 +0100 @@ -1,3 +1,14 @@ +libsdl2-gfx (1.0.1+dfsg-1) unstable; urgency=medium + + * Repack without html in the source tree. + * Do not symlink jquery from doxygen, this will result in a + broken documentation. cfr: 736360. + * Bump std-version, no changes required. + * Update copyright file. + * Create docs package with doxygen at build time. + + -- Gianfranco Costamagna <costamagnagianfra...@yahoo.it> Sat, 25 Oct 2014 19:08:30 +0200 + libsdl2-gfx (1.0.1-1) unstable; urgency=medium [ Gianfranco Costamagna ] diff -Nru libsdl2-gfx-1.0.1/debian/control libsdl2-gfx-1.0.1+dfsg/debian/control --- libsdl2-gfx-1.0.1/debian/control 2014-07-26 23:08:13.000000000 +0200 +++ libsdl2-gfx-1.0.1+dfsg/debian/control 2014-10-30 15:04:12.000000000 +0100 @@ -1,19 +1,20 @@ Source: libsdl2-gfx Maintainer: Debian SDL packages maintainers <pkg-sdl-maintain...@lists.alioth.debian.org> Uploaders: Felix Geyer <fge...@debian.org>, - Manuel A. Fernandez Montecelo <m...@debian.org>, - Gianfranco Costamagna <costamagnagianfra...@yahoo.it> + Manuel A. Fernandez Montecelo <m...@debian.org>, + Gianfranco Costamagna <costamagnagianfra...@yahoo.it> Section: libs Priority: optional -Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 9), +Standards-Version: 3.9.6 +Build-Depends: autoconf, + automake, + autotools-dev, + debhelper (>= 9), dh-autoreconf, libsdl2-dev, - autotools-dev, - automake, - autoconf, libtool, pkg-config +Build-Depends-Indep: doxygen Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/libsdl2-gfx.git Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/libsdl2-gfx.git Homepage: http://www.ferzkopp.net/joomla/content/view/19/14/ @@ -21,8 +22,7 @@ Package: libsdl2-gfx-1.0-0 Architecture: any Multi-Arch: same -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Description: drawing and graphical effects extension for SDL2 The SDL2_gfx library is an extension to the SDL2 library which provides @@ -37,8 +37,7 @@ Architecture: any Multi-Arch: same Priority: extra -Depends: ${misc:Depends}, - libsdl2-gfx-1.0-0 (= ${binary:Version}) +Depends: libsdl2-gfx-1.0-0 (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for SDL2_gfx The SDL2_gfx library is an extension to the SDL2 library which provides basic antialiased drawing routines such as lines, circles or polygons, @@ -51,9 +50,7 @@ Architecture: any Multi-Arch: same Section: libdevel -Depends: ${misc:Depends}, - libsdl2-gfx-1.0-0 (= ${binary:Version}), - libsdl2-dev +Depends: libsdl2-dev, libsdl2-gfx-1.0-0 (= ${binary:Version}), ${misc:Depends} Suggests: libsdl2-gfx-doc Description: development files for SDL2_gfx The SDL2_gfx library is an extension to the SDL2 library which provides @@ -68,7 +65,7 @@ Architecture: all Section: doc Priority: extra -Depends: ${misc:Depends}, libjs-jquery +Depends: ${misc:Depends} Recommends: libsdl2-gfx-dev (= ${binary:Version}) Description: documentation files for SDL2_gfx The SDL2_gfx library is an extension to the SDL2 library which provides @@ -77,4 +74,3 @@ image filters. . This package contains the documentation to program with the SDL2_gfx library. - diff -Nru libsdl2-gfx-1.0.1/debian/copyright libsdl2-gfx-1.0.1+dfsg/debian/copyright --- libsdl2-gfx-1.0.1/debian/copyright 2014-07-26 22:38:28.000000000 +0200 +++ libsdl2-gfx-1.0.1+dfsg/debian/copyright 2014-10-30 14:45:28.000000000 +0100 @@ -1,9 +1,78 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: http://www.ferzkopp.net/joomla/content/view/19/14/ Upstream-Contact: Andreas Schiffler <aschiffler at ferzkopp dot net> +Files-Excluded: Docs/html/jquery.js Files: * -Copyright: Copyright 2001-2012 Andreas Schiffler <aschiffler at ferzkopp dot net> +Copyright: 2001-2012 Andreas Schiffler <aschiffler at ferzkopp dot net> +License: zlib/libpng + +Files: acinclude/pkg.m4 + test/acinclude.m4 +Copyright: 2004 Scott James Remnant <sc...@netsplit.com>. +License: GPL-2+ with exception or zlib/libpng + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + As a special exception to the GNU General Public License, if you + distribute this file as part of a program that contains a + configuration script generated by Autoconf, you may include it under + the same distribution terms that you use for the rest of that program. + +Files: test/testimagefilter.c +Copyright: 2013 Sylvain Beucler + 2006 A. Schiffler +License: zlib/libpng + +Copyright: 1999-2009 Free Software Foundation + Thomas Tanner, + Gary V. Vaughan, + Scott James Remnant, +Files: acinclude/ltoptions.m4 + acinclude/ltsugar.m4 + acinclude/ltdl.m4 + acinclude/lt~obsolete.m4 + acinclude/ltversion.m4 +License: + This file is free software; the Free Software Foundation gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + +Files: debian/* +Copyright: 2014 Gianfranco Costamagna <costamagnagianfra...@yahoo.it> + 2014 Manuel A. Fernandez Montecelo <m...@debian.org> + 2014 Felix Geyer <fge...@debian.org> +License: GPL-2+ + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + License: zlib/libpng This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -17,33 +86,9 @@ claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - . + . 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - . + . 3. This notice may not be removed or altered from any source distribution. - -Files: debian/* -Copyright: 2013 Gianfranco Costamagna <costamagnagianfra...@yahoo.it> -License: GPL-2+ - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. diff -Nru libsdl2-gfx-1.0.1/debian/missing-sources/jquery.js libsdl2-gfx-1.0.1+dfsg/debian/missing-sources/jquery.js --- libsdl2-gfx-1.0.1/debian/missing-sources/jquery.js 2014-07-26 22:42:28.000000000 +0200 +++ libsdl2-gfx-1.0.1+dfsg/debian/missing-sources/jquery.js 1970-01-01 01:00:00.000000000 +0100 [JQUERY REMOVAL] diff -Nru libsdl2-gfx-1.0.1/debian/README.source libsdl2-gfx-1.0.1+dfsg/debian/README.source --- libsdl2-gfx-1.0.1/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ libsdl2-gfx-1.0.1+dfsg/debian/README.source 2014-10-30 15:04:12.000000000 +0100 @@ -0,0 +1,21 @@ +The source is repacked because upstream ships a minified js without +the corresponding source code. +Since because of bug 622147 doxygen doesn't need to include an jquery file +when both GENERATE_TREEVIEW and SEARCHENGINE are set to false, and since +this project don't use (yet) them, we simply strip it from the source tree. +If GENERATE_TREEVIEW or SEARCHENGINE will one day in a future release enabled +we will simply get the lintian warning about embedded jquery in the doc package +and leave it to avoid broken documentation. + +References: +https://lists.debian.org/debian-devel/2014/10/msg00774.html +https://lists.debian.org/debian-mentors/2012/11/msg00310.html +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=736360 +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751727 +/usr/share/doc/doxygen/REAMDE.jquery +" +It is not considered a problem for Doxygen or packages using Doxygen to embed +jquery. In fact replacing the `jquery.js` file created by Doxygen likely +results in broken documentation. Packages doing that are buggy. Lintian will +have to learn that a `jquery.js` embedded by Doxygen is a normal thing. +" diff -Nru libsdl2-gfx-1.0.1/debian/rules libsdl2-gfx-1.0.1+dfsg/debian/rules --- libsdl2-gfx-1.0.1/debian/rules 2014-07-26 23:01:06.000000000 +0200 +++ libsdl2-gfx-1.0.1+dfsg/debian/rules 2014-10-30 15:04:12.000000000 +0100 @@ -16,6 +16,10 @@ CONFIGURE_FLAGS =--enable-mmx endif +override_dh_auto_clean: + dh_auto_clean + rm -rf Docs/html + override_dh_autoreconf: AUTOMAKE="automake --foreign" dh_autoreconf --as-needed @@ -23,16 +27,14 @@ dh_auto_configure -- $(CONFIGURE_FLAGS) override_dh_install: - dh_install --fail-missing -XlibSDL2_gfx.la -Xjquery.js + dh_install --fail-missing -XlibSDL2_gfx.la override_dh_auto_build: dh_auto_build tar -cvz --transform='s,^test,examples,' -f debian/examples.tar.gz test -override_dh_link: - # fix lintian warning embedded-javascript-library - dh_link -plibsdl2-gfx-doc usr/share/javascript/jquery/jquery.js usr/share/doc/libsdl2-gfx-doc/jquery.js - dh_link --remaining-packages +override_dh_auto_build-indep: + doxygen Docs/html.doxyfile override_dh_strip: dh_strip --dbg-package=libsdl2-gfx-dbg diff -Nru libsdl2-gfx-1.0.1/debian/watch libsdl2-gfx-1.0.1+dfsg/debian/watch --- libsdl2-gfx-1.0.1/debian/watch 2014-07-26 22:38:28.000000000 +0200 +++ libsdl2-gfx-1.0.1+dfsg/debian/watch 2014-10-30 14:45:30.000000000 +0100 @@ -1,4 +1,4 @@ version=3 - -http://cms.ferzkopp.net/index.php/software/13-sdl-gfx \ -http://www\.ferzkopp\.net/Software/SDL2_gfx/SDL2_gfx-([\d.]+)\.tar\.gz +opts=dversionmangle=s/(\+|\.)dfsg$// \ + http://cms.ferzkopp.net/index.php/software/13-sdl-gfx \ + http://www\.ferzkopp\.net/Software/SDL2_gfx/SDL2_gfx-([\d.]+)\.tar\.gz [Docs/html directory removal] cheers, Gianfranco -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
