[game-data-packager] 20/39: Merge remote-tracking branch 'a-detiste/master'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 350f66fc9369e721a1f7935447150703745539a4
Merge: 2c06157 302e0e4
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 10 20:56:24 2015 +0000

    Merge remote-tracking branch 'a-detiste/master'
    
    Conflicts:
    	debian/changelog

 data/spear-of-destiny-data.control.in          |  16 +++
 data/spear-of-destiny-data.copyright           |  20 +++
 data/spear-of-destiny-demo-data.control.in     |  15 ++
 data/spear-of-destiny-demo-data.copyright      |  20 +++
 data/spear-of-destiny-mission2-data.control.in |  14 ++
 data/spear-of-destiny-mission2-data.copyright  |  20 +++
 data/spear-of-destiny-mission3-data.control.in |  14 ++
 data/spear-of-destiny-mission3-data.copyright  |  20 +++
 data/spear-of-destiny.yaml                     | 192 +++++++++++++++++++++++++
 debian/changelog                               |   1 +
 debian/control                                 |   1 +
 debian/game-data-packager.bash-completion      |  14 ++
 debian/rules                                   |   2 +-
 etc/spear-of-destiny-mirrors                   |   2 +
 lib/game-data-packager-shared                  |   6 +-
 supported/spear-of-destiny                     |  44 ++++++
 16 files changed, 397 insertions(+), 4 deletions(-)

diff --cc data/spear-of-destiny-data.control.in
index 0000000,ebdc80c..ebdc80c
mode 000000,100644..100644
--- a/data/spear-of-destiny-data.control.in
+++ b/data/spear-of-destiny-data.control.in
diff --cc data/spear-of-destiny-demo-data.control.in
index 0000000,ca6705b..ca6705b
mode 000000,100644..100644
--- a/data/spear-of-destiny-demo-data.control.in
+++ b/data/spear-of-destiny-demo-data.control.in
diff --cc data/spear-of-destiny-mission2-data.control.in
index 0000000,f31c7ea..f31c7ea
mode 000000,100644..100644
--- a/data/spear-of-destiny-mission2-data.control.in
+++ b/data/spear-of-destiny-mission2-data.control.in
diff --cc data/spear-of-destiny-mission3-data.control.in
index 0000000,7b812be..7b812be
mode 000000,100644..100644
--- a/data/spear-of-destiny-mission3-data.control.in
+++ b/data/spear-of-destiny-mission3-data.control.in
diff --cc debian/changelog
index d05a4a1,3c90771..ad36c75
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,12 -4,8 +4,13 @@@ game-data-packager (39) UNRELEASED; urg
    * rtcw-data should recommend rtcw (ITP #773742), not rtcw-sp
    * make_template: strip trailing '/' from directories to be searched
    * convert tyrian-data to YAML style
+   * Add game Spear Of Destiny, demo & full version
  
 +  [ Simon McVittie ]
 +  * For games in YAML style, do the .deb-building in Python, not in shell
 +    - depend on python3-debian
 +  * Search /usr/share/games/quake3 for Quake III Arena data
 +
   -- Simon McVittie <smcv at debian.org>  Mon, 05 Jan 2015 19:38:04 +0000
  
  game-data-packager (38) experimental; urgency=low
diff --cc debian/rules
index 68ad19f,0b611bf..db46bbf
--- a/debian/rules
+++ b/debian/rules
@@@ -4,16 -4,16 +4,16 @@@
  #export DH_VERBOSE=1
  export DH_OPTIONS
  
 +include /usr/share/dpkg/pkg-info.mk
 +
  %:
- 	dh $@ --with python3
+ 	dh $@ --with python3,bash-completion
  
 -VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2-)
 -
  override_dh_auto_build:
 -	$(MAKE) VERSION=$(VERSION)
 +	$(MAKE) VERSION=$(DEB_VERSION)
  
  override_dh_auto_clean:
 -	$(MAKE) clean VERSION=$(VERSION)
 +	$(MAKE) clean VERSION=$(DEB_VERSION)
  	@if [ "`echo *.deb`" != "*.deb" ]; then \
  		echo; \
  		echo "*************************************************"; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git