[wesnoth] 01/01: close #775153 by shipping data/tools/ and utils/ in wesnoth-*-tools
Vincent Cheng
vcheng at moszumanska.debian.org
Sun Feb 1 10:18:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
vcheng pushed a commit to branch master
in repository wesnoth.
commit 82d55378cdb72f2e8e04a11f72c8139ae377a25a
Author: Vincent Cheng <vcheng at debian.org>
Date: Sun Feb 1 02:17:35 2015 -0800
close #775153 by shipping data/tools/ and utils/ in wesnoth-*-tools
---
debian/changelog | 3 +++
debian/copyright | 39 ++++++++++++++++++++++++++++++++++
debian/rules | 7 ------
debian/wesnoth-1.12-tools.install | 18 ++--------------
debian/wesnoth-BRANCH-tools.install.in | 18 ++--------------
5 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4365559..90c0471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
wesnoth-1.12 (1:1.12.1-1) UNRELEASED; urgency=medium
* New upstream stable release.
+ * Ship all scripts inside both data/tools/ and utils/ from the source
+ tarball in wesnoth-1.12-tools. (Closes: #775153)
+ - Update debian/copyright accordingly.
-- Vincent Cheng <vcheng at debian.org> Tue, 27 Jan 2015 18:20:56 -0800
diff --git a/debian/copyright b/debian/copyright
index 2dcf35b..8e4bc58 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -202,6 +202,45 @@ later versions can be found in the same directory.
-----
+ utils/nacl/
+
+ Copyright (c) 2011 The Native Client Authors. 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.
+ * Neither the name of the <organization> nor the
+ names of its contributors 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 <COPYRIGHT HOLDER> 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.
+
+ -----
+
+ utils/umc_dev/
+
+ Copyright (c) 2010 - 2013 by Timotei Dolean <timotei21 at gmail.com>
+
+ This program and the accompanying materials are made available
+ under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ -----
+
The debianization of the package is licensed under the WTFPLv2:
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
diff --git a/debian/rules b/debian/rules
index 73dec46..61f67bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,13 +94,6 @@ debian/stamp-install: build
$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
- cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
- && chmod +x extractbindings unit_tree/TeamColorizer \
- wesnoth/wescamp.py wesnoth/wmldata.py wesnoth/wmlparser.py \
- wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \
- wmlvalidator hexometer/hexometer wmlxgettext imgcheck \
- rmtrans/rmtrans.py
-
dh_install -Xgitignore
touch $@
diff --git a/debian/wesnoth-1.12-tools.install b/debian/wesnoth-1.12-tools.install
index e557e31..8955485 100644
--- a/debian/wesnoth-1.12-tools.install
+++ b/debian/wesnoth-1.12-tools.install
@@ -1,16 +1,2 @@
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/addon_manager/
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/extractbindings
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/helpheader.html
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/helptrailer.html
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/hexometer/
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/README
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/rmtrans/
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/unit_tree/
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wesnoth/
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wesnoth_addon_manager
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wmlflip
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wmlindent
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wmllint
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wmlscope
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wmlvalidator
-debian/tmp/usr/share/games/wesnoth/1.12/data/tools/wmlxgettext
+debian/tmp/usr/share/games/wesnoth/1.12/data/tools/
+debian/tmp/usr/share/games/wesnoth/1.12/utils/
diff --git a/debian/wesnoth-BRANCH-tools.install.in b/debian/wesnoth-BRANCH-tools.install.in
index 1320540..d51bc72 100644
--- a/debian/wesnoth-BRANCH-tools.install.in
+++ b/debian/wesnoth-BRANCH-tools.install.in
@@ -1,16 +1,2 @@
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/addon_manager/
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/extractbindings
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/helpheader.html
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/helptrailer.html
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/hexometer/
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/README
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/rmtrans/
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/unit_tree/
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wesnoth/
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wesnoth_addon_manager
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wmlflip
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wmlindent
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wmllint
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wmlscope
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wmlvalidator
-debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/wmlxgettext
+debian/tmp/usr/share/games/wesnoth/BRANCH/data/tools/
+debian/tmp/usr/share/games/wesnoth/BRANCH/utils/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git
More information about the Pkg-games-commits
mailing list