This is an automated email from the git hooks/post-receive script. bbk-guest pushed a commit to branch master in repository trigger-rally.
commit 4d70730f94e937919927e79f433e181353cb4cf3 Author: Bertrand Marc <[email protected]> Date: Thu Oct 22 17:10:21 2015 +0000 Exclude third party code from debian/copyright: + add +dfsg to the source version. + add dversionmangle to debian/watch to handle +dfsg. + do not remove third party code from debian/rules anymore. --- debian/changelog | 7 ++- debian/copyright | 152 +++++++++++-------------------------------------------- debian/rules | 9 ---- debian/watch | 2 +- 4 files changed, 37 insertions(+), 133 deletions(-) diff --git a/debian/changelog b/debian/changelog index 641b639..2ac57e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -trigger-rally (0.6.2-1) UNRELEASED; urgency=medium +trigger-rally (0.6.2+dfsg-1) UNRELEASED; urgency=medium [ Stefan Potyra ] * Acknowledge NMU, thanks to Tobias Frost. @@ -22,6 +22,11 @@ trigger-rally (0.6.2-1) UNRELEASED; urgency=medium + remove debian/patches/30_autotools.patch. + update debian/rules to dh style. + add debian/trigger-rally.install. + * Update debian/copyright to machine-interpretable format 1.0. + * Exclude third party code from debian/copyright: + + add +dfsg to the source version. + + add dversionmangle to debian/watch to handle +dfsg. + + do not remove third party code from debian/rules anymore. -- Bertrand Marc <[email protected]> Sun, 18 Oct 2015 12:08:57 +0200 diff --git a/debian/copyright b/debian/copyright index 4d59b89..42d08bb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,122 +1,30 @@ -This package was debianized by Stefan Potyra <[email protected]> on -Thu, 16 Feb 2006 19:53:35 +0100. - -It was downloaded from http://www.positro.net/trigger/#downloads - -Copyright (C) 2004-2006 Jasmine Langridge and Richard Langridge. - - -License: - - Trigger is released under the GPL (see gpl.txt in - source package, or http://www.gnu.org/licenses/gpl.txt ). - - NO WARRANTY WHATSOEVER. - - -- - - 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, version 2 of the License. - - 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. - -On Debian systems, the complete text of the GNU General Public License -(version 2) can be found in `/usr/share/common-licenses/GPL-2'. - - -The following files have a different license: - -* src/pengine/tinystr.cpp - src/pengine/tinystr.h - - www.sourceforge.net/projects/tinyxml - Original file by Yves Berquin. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any - damages arising from the use of this software. - - Permission is granted to anyone to use this software for any - purpose, including commercial applications, and to alter it and - redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must - not 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. - - -* src/pengine/tinyxml.cpp - src/penging/tinyxml.h - src/pengine/tinyxmlerror.cpp - src/pengine/tinyxmlerror.h - src/pengine/tinyxmlparser.cpp - src/pengine/tinyxmlparser.h: - - www.sourceforge.net/projects/tinyxml - Original code (2.0 and earlier ) - copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com) - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any - damages arising from the use of this software. - - Permission is granted to anyone to use this software for any - purpose, including commercial applications, and to alter it and - redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must - not 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. - - -* src/glew/glew.cpp - src/glew/GL/glew.h - src/glew/GL/glxew.h - src/glew/GL/wglew.h: - - The OpenGL Extension Wrangler Library - Copyright (C) 2002-2005, Milan Ikits <milan ikits[]ieee org> - Copyright (C) 2002-2005, Marcelo E. Magallon <mmagallo[]debian org> - Copyright (C) 2002, Lev Povalahev - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * The name of the author may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Trigger Rally +Upstream-Contact: Jasmine Langridge <[email protected]> +Source: http://sourceforge.net/projects/trigger-rally/files/ +License: GPL-2+ +Files-Excluded: src/pengine/tiny* src/glew + +Files: * +Copyright: 2004-2006 Jasmine Langridge and Richard Langridge. +License: GPL-2+ + +Files: debian/* +Copyright: 2006 Stefan Potyra <[email protected]> + 2015 Bertrand Marc <[email protected]> +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. + . + 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 --git a/debian/rules b/debian/rules index 24d650d..4b810fb 100755 --- a/debian/rules +++ b/debian/rules @@ -17,15 +17,6 @@ $(MANPAGES): $(addsuffix .sgml,$(MANPAGES)) docbook-to-man $< > $@ override_dh_auto_configure: - # make sure that the shipped glew is not used during build - $(RM) -r src/glew - # same goes for tinyxml - $(RM) src/pengine/tinyxml.h - $(RM) src/pengine/tinyxmlparser.cpp - $(RM) src/pengine/tinyxml.cpp - $(RM) src/pengine/tinystr.cpp - $(RM) src/pengine/tinyxmlerror.cpp - $(RM) src/pengine/tinystr.h ./autogen.sh dh_auto_configure -- --datadir=$(DATADIR) diff --git a/debian/watch b/debian/watch index 1fa5cbe..a071749 100644 --- a/debian/watch +++ b/debian/watch @@ -2,4 +2,4 @@ version=3 #http://www.positro.net/trigger/download.php trigger-0\.(.*)-src\.tar\.bz2 #http://files.scapecaster.com/posit/trigger-(\d+\..+)-src\.tar\.bz2 -http://sf.net/trigger-rally/trigger-rally-(\d\S*)-src\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +opts=dversionmangle=s/\+dfsg// http://sf.net/trigger-rally/trigger-rally-(\d\S*)-src\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
