-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I'm going to NMU the package right now. debdiff attached.
cheers, G. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJWxHOnAAoJEPNPCXROn13Zn0YQAISl+F6RxZhdNWmzuqiiidjb MOIx78txvLZ6MbPHxzItLxUzeXVJ2yzBmNRX4n+0cG7g4BcpzkcxSk1L38FzpjjV AZg6XS2q9DBHutpwFLVqjKQtpUpg+HWOE9yETfBaRP6RfyXITML2ZEG0QUHSGobC ImswYeFUoizf+IoNtHJ5Pvn+NvnqRlWMb+zigueAieB+WfNEi+32H3JR3xoyYwSo O8ZlgvaefK0swp2s4PNMxkSYySxpqBUZzgh5pJfsc+Dfm75LhontdAIdSpd8OMz9 y7/Un93qCUADR11VmmdvPRYJ881C08z/XyrVFZIqUamI/VE/6+tBcqaSPk1vWyNd xxNTmsTKikUUaazCRs09t4YiBreur2YhkU08fTcIwiny+N5ZxROEwgkVzk0JkfKg 5zBLiijuNwDNuR8LNX+qiwRoQlQ7bCHxSJUlz4IZRB5hQqnIYRA+dR72iR7+mVlg m+vGDSqdJQlev7zNBqeUVg4R9tQvQ3BFGVzE65UNPq2BIYTQoD9RbjR/LTJ10PZT SouZZ97OtQ/L4/UsRqS1s42ot7NlD6g3KbawEL03C9ae11h9iWHK+ECzieHEM7sR 3YTqIsJPphH2TB0UWa6lcEADRMVvbO3940S9knCaJ04a1LRFkhYz2/++Uk5WJx61 EWXDfXbLQKjimylTvFKZ =I1wz -----END PGP SIGNATURE-----
diff -Nru xtrkcad-4.2.2/debian/changelog xtrkcad-4.2.2/debian/changelog --- xtrkcad-4.2.2/debian/changelog 2015-11-19 07:52:29.000000000 +0100 +++ xtrkcad-4.2.2/debian/changelog 2016-02-17 14:18:49.000000000 +0100 @@ -1,3 +1,14 @@ +xtrkcad (1:4.2.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix licenses (Closes: #811091). + * Bump std-version to 3.9.7. + * Update rules file to new dh sequencer. + (add manpages file) + * Remove useless include-binaries file. + + -- Gianfranco Costamagna <[email protected]> Wed, 17 Feb 2016 14:05:22 +0100 + xtrkcad (1:4.2.2-1) unstable; urgency=low * new upstream version diff -Nru xtrkcad-4.2.2/debian/control xtrkcad-4.2.2/debian/control --- xtrkcad-4.2.2/debian/control 2015-11-19 07:56:50.000000000 +0100 +++ xtrkcad-4.2.2/debian/control 2016-02-17 14:13:44.000000000 +0100 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Daniel E. Markle <[email protected]> Build-Depends: debhelper (>= 9), libglib2.0-dev, libgtk2.0-dev, libx11-dev, netpbm, imagemagick, libwebkit-dev, libcairo2-dev, cmake -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: http://xtrkcad.org/ #Vcs-Git: git://git.debian.org/collab-maint/xtrkcad.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/xtrkcad.git;a=summary diff -Nru xtrkcad-4.2.2/debian/copyright xtrkcad-4.2.2/debian/copyright --- xtrkcad-4.2.2/debian/copyright 2015-11-19 08:29:25.000000000 +0100 +++ xtrkcad-4.2.2/debian/copyright 2016-02-17 14:05:19.000000000 +0100 @@ -5,20 +5,26 @@ Files: * Copyright: 2003 by Sillub Technology and 2007 by Martin Fischer and Bob Blackwell. -License: GPL-2 +License: GPL-2+ + +Files: app/lib/icon.svg + app/bin/bitmaps/SVG/tipofday.svg +Copyright: Jakub Steiner +License: public-domain Files: debian/* Copyright: 2015 Daniel E. Markle <[email protected]> -License: GPL-2 +License: GPL-2+ Files: app/wlib/gtklib/uthash.h Copyright: 2005-2015, Troy D. Hanson http://troydhanson.github.com/uthash/ License: BSD-Revised -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 version 2 as published by the Free Software Foundation. +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 @@ -56,3 +62,32 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: public-domain + THIS WORK IS IN PUBLIC DOMAIN: + The person or persons who have associated work with this document + (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best + of his knowledge, the work of authorship identified is in the public domain of + the country from which the work is published, or (b) hereby dedicates whatever + copyright the dedicators holds in the work of authorship identified below + (the "Work") to the public domain. A certifier, moreover, dedicates any + copyright interest he may have in the associated work, and for these purposes, + is described as a "dedicator" below. + . + A certifier has taken reasonable steps to verify the copyright status of this + work. Certifier recognizes that his good faith efforts may not shield him from + liability if in fact the work certified is not in the public domain. + . + Dedicator makes this dedication for the benefit of the public at large and to + the detriment of the Dedicator's heirs and successors. Dedicator intends this + dedication to be an overt act of relinquishment in perpetuity of all present + and future rights under copyright law, whether vested or contingent, in the + Work. Dedicator understands that such relinquishment of all rights includes the + relinquishment of all rights to enforce (by lawsuit or otherwise) those + copyrights in the Work. + . + Dedicator recognizes that, once placed in the public domain, the Work may be + freely reproduced, distributed, transmitted, used, modified, built upon, or + otherwise exploited by anyone for any purpose, commercial or non-commercial, + and in any way, including by methods that have not yet been invented or + conceived. diff -Nru xtrkcad-4.2.2/debian/rules xtrkcad-4.2.2/debian/rules --- xtrkcad-4.2.2/debian/rules 2015-11-19 07:22:09.000000000 +0100 +++ xtrkcad-4.2.2/debian/rules 2016-02-17 14:16:37.000000000 +0100 @@ -3,52 +3,18 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# Explicitly set build flags variables to allow hardening -export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) +%: + dh $@ --parallel -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: - dh_testdir - mkdir -p build - (cd build ; cmake -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_INSTALL_PREFIX=/usr/ \ - -D XTRKCAD_USE_GETTEXT=ON \ - -D XTRKCAD_USE_GTK=ON \ - -D XTRKCAD_USE_GTK_CAIRO=ON \ - -D XTRKCAD_USE_LAYOUTCONTROL=ON ../) - (cd build ; make) +override_dh_auto_configure: + dh_auto_configure -- \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_INSTALL_PREFIX=/usr/ \ + -D XTRKCAD_USE_GETTEXT=ON \ + -D XTRKCAD_USE_GTK=ON \ + -D XTRKCAD_USE_GTK_CAIRO=ON \ + -D XTRKCAD_USE_LAYOUTCONTROL=ON -clean: - dh_testdir - rm -rf build - dh_clean - -binary-indep: build - -binary-arch: build - dh_testdir - dh_testroot - dh_installdirs - dh_installdocs - dh_auto_install -Dbuild - rm -f debian/xtrkcad/usr/share/xtrkcad/COPYING +override_dh_install: dh_install - dh_installman debian/xtrkcad.1 - dh_installchangelogs - dh_lintian - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary + rm -f debian/xtrkcad/usr/share/xtrkcad/COPYING diff -Nru xtrkcad-4.2.2/debian/source/include-binaries xtrkcad-4.2.2/debian/source/include-binaries --- xtrkcad-4.2.2/debian/source/include-binaries 2015-11-09 00:27:01.000000000 +0100 +++ xtrkcad-4.2.2/debian/source/include-binaries 1970-01-01 01:00:00.000000000 +0100 @@ -1,164 +0,0 @@ -build/CMakeFiles/3.0.2/CMakeDetermineCompilerABI_C.bin -build/CMakeFiles/3.0.2/CMakeDetermineCompilerABI_CXX.bin -build/CMakeFiles/3.0.2/CompilerIdC/a.out -build/CMakeFiles/3.0.2/CompilerIdCXX/a.out -build/app/bin/CMakeFiles/cnvdsgn.dir/cnvdsgn.c.o -build/app/bin/CMakeFiles/cnvdsgn.dir/utility.c.o -build/app/bin/CMakeFiles/mkturnout.dir/ctodesgn.c.o -build/app/bin/CMakeFiles/mkturnout.dir/utility.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/bllnhlp.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cblock.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/ccurve.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cdraw.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/celev.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cgroup.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/chndldto.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/chotbar.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cjoin.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cmisc.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cmodify.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cnote.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/compound.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cparalle.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cprint.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cprofile.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cpull.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cruler.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cselect.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/csnap.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/csplit.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cstraigh.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cstruct.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cswitchmotor.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/ctext.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/ctodesgn.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/ctrain.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cturnout.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cturntbl.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/cundo.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/custom.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dbench.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dbitmap.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dcar.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dcmpnd.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dcustmgm.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dease.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/denum.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dlayer.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/doption.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dpricels.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/dprmfile.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/draw.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/drawgeom.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/elev.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/fileio.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/i18n.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/lprintf.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/macro.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/misc2.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/param.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/shrtpath.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/smalldlg.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/tcurve.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/tease.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/track.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/trkseg.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/tstraigh.c.o -build/app/bin/CMakeFiles/xtrkcad-lib.dir/utility.c.o -build/app/bin/CMakeFiles/xtrkcad.dir/misc.c.o -build/app/bin/cnvdsgn -build/app/bin/libxtrkcad-lib.a -build/app/bin/mkturnout -build/app/bin/xtrkcad -build/app/help/CMakeFiles/genhelp.dir/genhelp.c.o -build/app/help/CMakeFiles/genmessages.dir/genmessages.c.o -build/app/help/genhelp -build/app/help/genmessages -build/app/i18n/CMakeFiles/stripmsg.dir/stripmsg.c.o -build/app/i18n/de_DE/LC_MESSAGES/xtrkcad.mo -build/app/i18n/fi/LC_MESSAGES/xtrkcad.mo -build/app/i18n/pt_BR/LC_MESSAGES/xtrkcad.mo -build/app/i18n/stripmsg -build/app/lib/params/CMakeFiles/mkcarpart.dir/mkcarpart.c.o -build/app/lib/params/CMakeFiles/mkstruct.dir/mkstruct.c.o -build/app/lib/params/CMakeFiles/nmra-to.dir/nmra-to.c.o -build/app/lib/params/mkcarpart -build/app/lib/params/mkstruct -build/app/lib/params/nmra-to -build/app/tools/CMakeFiles/addcrlf.dir/addcrlf.c.o -build/app/tools/CMakeFiles/bin2c.dir/bin2c.c.o -build/app/tools/CMakeFiles/listxtp.dir/listxtp.c.o -build/app/tools/addcrlf -build/app/tools/bin2c -build/app/tools/halibut/CMakeFiles/halibut.dir/biblio.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/bk_html.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/bk_paper.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/contents.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/deflate.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/error.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/help.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/in_afm.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/in_pf.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/index.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/input.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/keywords.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/licence.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/main.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/malloc.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/misc.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/psdata.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/tree234.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/ustring.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/version.c.o -build/app/tools/halibut/CMakeFiles/halibut.dir/wcwidth.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/big5enc.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/big5set.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/cns11643.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/cp949.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/euc.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/fromucs.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/gb2312.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/hz.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/iso2022.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/iso2022s.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/istate.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/jisx0208.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/jisx0212.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/ksx1001.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/locale.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/localenc.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/macenc.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/mimeenc.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/sbcs.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/sbcsdat.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/shiftjis.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/slookup.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/superset.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/test.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/toucs.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/utf16.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/utf7.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/utf8.c.o -build/app/tools/halibut/charset/CMakeFiles/xtrkcad-charset.dir/xenc.c.o -build/app/tools/halibut/charset/libxtrkcad-charset.a -build/app/tools/halibut/halibut -build/app/tools/listxtp -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkbitmap.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkbutton.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkcolor.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkdraw-cairo.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkfilsel.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkfont.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkhelp.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtklist.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkmenu.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkmisc.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtksimple.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtksingle.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtksplash.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtktext.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkwindow.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/gtkxpm.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/psprint.c.o -build/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/wpref.c.o -build/app/wlib/gtklib/libxtrkcad-wlib.a diff -Nru xtrkcad-4.2.2/debian/xtrkcad.manpages xtrkcad-4.2.2/debian/xtrkcad.manpages --- xtrkcad-4.2.2/debian/xtrkcad.manpages 1970-01-01 01:00:00.000000000 +0100 +++ xtrkcad-4.2.2/debian/xtrkcad.manpages 2016-02-17 14:16:57.000000000 +0100 @@ -0,0 +1 @@ +debian/xtrkcad.1
