[game-data-packager] branch master updated (e766ed9 -> 62890bd)

[Alexandre Detiste]

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

detiste-guest pushed a change to branch master
in repository game-data-packager.

  from  e766ed9   fedora: define correct engines for ROTT
   new  62890bd   ROTT: fix bad copy-paste in demo alternatives handling

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 data/rott.yaml  | 12 ++--
 game_data_packager/build.py | 28 +++-
 2 files changed, 29 insertions(+), 11 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (62890bd -> 187acea)

[Alexandre Detiste]

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

detiste-guest pushed a change to branch master
in repository game-data-packager.

  from  62890bd   ROTT: fix bad copy-paste in demo alternatives handling
   new  d031ec9   fedora: fix handling of "UnownedDirectories"
   new  187acea   doom_common: also install uncompressed .svg icons

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 game_data_packager/build.py | 25 ++---
 game_data_packager/games/doom_common.py | 13 +++--
 2 files changed, 17 insertions(+), 21 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 02/02: doom_common: also install uncompressed .svg icons

[Alexandre Detiste]

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

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

commit 187acea09236b439c79bdf9e4defec140a83fc68
Author: Alexandre Detiste 
Date:   Tue Jan 5 10:04:52 2016 +0100

doom_common: also install uncompressed .svg icons
---
 game_data_packager/games/doom_common.py | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/games/doom_common.py 
b/game_data_packager/games/doom_common.py
index 59d3c11..f9be0df 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -127,13 +127,14 @@ class DoomTask(PackagingTask):
 else:
 raise AssertionError('doom-common.png should have existed')
 
-from_ = os.path.splitext(from_)[0] + '.svgz'
-if os.path.exists(from_):
-svgdir = os.path.join(destdir,
+for ext in ('.svgz', '.svg'):
+from_ = os.path.splitext(from_)[0] + ext
+if os.path.exists(from_):
+svgdir = os.path.join(destdir,
   'usr/share/icons/hicolor/scalable/apps')
-mkdir_p(svgdir)
-install_data(from_,
-os.path.join(svgdir, '%s.svgz' % desktop_file))
+mkdir_p(svgdir)
+install_data(from_,
+os.path.join(svgdir, desktop_file + ext))
 
 docdir = os.path.join(destdir, 'usr/share/doc/%s' % package.name)
 mkdir_p(docdir)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/01: reproducible: avoid rebuilding vfs.zip again during 'make install'

[Alexandre Detiste]

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

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

commit 1889819d97950436bae3b47dbd1a8fc73a19c89e
Author: Alexandre Detiste 
Date:   Tue Jan 5 10:30:37 2016 +0100

reproducible: avoid rebuilding vfs.zip again during 'make install'
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 23cbd72..4367045 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ check:
LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. $(PYTHON) tools/check_syntax.py
LC_ALL=C GDP_UNINSTALLED=1 PYTHONPATH=. $(PYTHON) 
tools/check_equivalence.py
 
-install: default
+install:
echo DESTDIR: $(DESTDIR)
mkdir -p $(DESTDIR)$(bindir)
install -m0755 out/game-data-packager  
$(DESTDIR)$(bindir)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (6c8339a -> 1889819)

[Alexandre Detiste]

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

detiste-guest pushed a change to branch master
in repository game-data-packager.

  from  6c8339a   Makefile: install out/memento-mori-2.svg
   new  1889819   reproducible: avoid rebuilding vfs.zip again during 'make 
install'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (e81816f -> 5ab47e4)

[Simon McVittie]

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

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

  from  e81816f   debug info: do not log calls to 'cp' that duplicates 
'Found...' & 'Copying...'
   new  3bb5e99   launcher: use an X-prefixed group for non-standard 
content in desktop file
   new  8e61dbf   Remove support for Debian maintainer scripts, except in 
doom-common
   new  3ef741f   version: detect features, not distributions, to load 
...VERSION
   new  4146921   GameData: look in {rpm,debian} as lower priority than 
{arch,fedora,suse}
   new  5fe4497   Reduce circular imports by introducing packaging modules
   new  b3ef1df   Move ASSETS, BINDIR, LICENSEDIR into PackagingSystem 
object
   new  92d1e72   PackagingTask: distinguish docdir with and without 
destdir prepended
   new  2a64467   Replace most "install_to: $docdir" with doc shortcut
   new  2f14d8e   Rename $docdir to $pkgdocdir and $licensedir to 
$pkglicensedir
   new  dc35b16   install_to, symlinks: strip leading / if any
   new  5ab47e4   Consistently apply the same substitutions to all 
install_to and symlinks

The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 data/atlantis.yaml |   6 +-
 data/chex.yaml |   5 +-
 data/descent2.yaml |   2 +-
 data/doom2.yaml|   5 +-
 data/drbrain2.yaml |   2 +-
 data/dreamweb.yaml |  14 +-
 data/duke3d.yaml   |   4 +-
 data/enclosure.yaml|   5 +-
 data/final-doom.yaml   |   5 +-
 data/glory3.yaml   |   3 +-
 data/gobliiins.yaml|   4 +-
 data/gobliins2.yaml|   4 +-
 data/goblins3.yaml |   7 +-
 data/grimfandango.yaml |   1 -
 data/hank.yaml |   6 +-
 data/hugo.yaml |  13 +-
 data/inherit.yaml  |   7 +-
 data/kingsquest6.yaml  |   6 +-
 data/kyrandia2.yaml|   7 +-
 data/kyrandia3.yaml|   4 +-
 data/larry1.yaml   |   2 +-
 data/larry2.yaml   |   2 +-
 data/larry3.yaml   |   2 +-
 data/larry5.yaml   |   2 +-
 data/larry6.yaml   |   2 +-
 data/longbow.yaml  |   2 +-
 data/loom.yaml |   4 +-
 data/nomouth.yaml  |  17 ++-
 data/personal-nightmare.yaml   |   5 +-
 data/planescape-torment.yaml   |   6 +-
 data/quake2.yaml   |   8 --
 data/quake3.yaml   |   8 +-
 data/return-to-zork.yaml   |   6 +-
 data/rott.yaml |   7 +-
 data/spacequest2.yaml  |   4 +-
 data/tyrian.yaml   |   2 +-
 data/waxworks.yaml |   5 +-
 data/wip/policequest4.yaml |   5 +-
 debian/rules   |   7 -
 doc/adding_a_game.mdwn |   9 +-
 doc/tags.txt   |   5 +-
 game_data_packager/__init__.py |  20 +--
 game_data_packager/build.py| 107 +++
 game_data_packager/games/doom_common.py|   4 +-
 game_data_packager/games/scummvm_common.py |   3 +-
 game_data_packager/games/unreal.py |   3 +-
 game_data_packager/games/z_code.py |  11 +-
 game_data_packager/gog.py  |   7 +-
 game_data_packager/packaging/__init__.py   |  86 
 .../{util_arch.py => packaging/arch.py}|  35 ++---
 .../{util_deb.py => packaging/deb.py}  | 106 +++
 game_data_packager/packaging/rpm.py| 148 +
 game_data_packager/steam.py|  11 +-
 game_data_packager/util.py |  10 +-
 game_data_packager/util_deb.py |  99 +-
 game_data_packager/util_fedora.py  |  53 
 game_data_packager/util_rpm.py |  33 

[game-data-packager] 01/11: launcher: use an X-prefixed group for non-standard content in desktop file

[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 3bb5e99f96f07f379478efe06588186169ca222d
Author: Simon McVittie 
Date:   Tue Jan 5 07:41:08 2016 +

launcher: use an X-prefixed group for non-standard content in desktop file
---
 runtime/launcher.py | 2 +-
 runtime/unreal-gold.desktop | 2 +-
 runtime/unreal.desktop  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/launcher.py b/runtime/launcher.py
index c86288b..3135cb4 100755
--- a/runtime/launcher.py
+++ b/runtime/launcher.py
@@ -38,7 +38,7 @@ if 'GDP_UNINSTALLED' in os.environ:
 else:
 GDP_DIR = '/usr/share/games/game-data-packager'
 
-GDL_GROUP = 'game-data-launcher'
+GDL_GROUP = 'X-game-data-launcher'
 GDL_KEY_BINARY_ONLY = 'BinaryOnly'
 GDL_KEY_BASE_DIRECTORIES = 'BaseDirectories'
 GDL_KEY_REQUIRED_FILES = 'RequiredFiles'
diff --git a/runtime/unreal-gold.desktop b/runtime/unreal-gold.desktop
index e27c7cd..b996ef1 100644
--- a/runtime/unreal-gold.desktop
+++ b/runtime/unreal-gold.desktop
@@ -9,7 +9,7 @@ Type=Application
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;epic megagames;epic games;digital 
extremes;return to na pali;
 
-[game-data-launcher]
+[X-game-data-launcher]
 BinaryOnly=true
 
RequiredFiles=System/Core.so;System/Core.u;System/UnrealLinux.bin;Maps/Entry.unr;
 
BaseDirectories=/usr/lib/unreal-gold;/usr/lib/unreal;/usr/share/games/unreal-gold;/usr/share/games/unreal;
diff --git a/runtime/unreal.desktop b/runtime/unreal.desktop
index ee5aef0..9dba2ce 100644
--- a/runtime/unreal.desktop
+++ b/runtime/unreal.desktop
@@ -9,7 +9,7 @@ Type=Application
 Categories=Game;ActionGame;
 Keywords=first person shooter;fps;3d;epic megagames;epic games;digital 
extremes;return to na pali;
 
-[game-data-launcher]
+[X-game-data-launcher]
 BinaryOnly=true
 
RequiredFiles=System/Core.so;System/Core.u;System/UnrealLinux.bin;Maps/Entry.unr;
 
BaseDirectories=/usr/lib/unreal-classic;/usr/lib/unreal;/usr/share/games/unreal;

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (5ab47e4 -> 883470a)

[Simon McVittie]

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

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

  from  5ab47e4   Consistently apply the same substitutions to all 
install_to and symlinks
   new  883470a   Move Lintian overrides into PackagingSystem

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 game_data_packager/build.py   |  6 ++--
 game_data_packager/games/doom_common.py   |  7 +++--
 game_data_packager/games/ecwolf_common.py |  6 ++--
 game_data_packager/games/residualvm_common.py |  6 ++--
 game_data_packager/games/scummvm_common.py|  4 ++-
 game_data_packager/packaging/__init__.py  |  3 ++
 game_data_packager/packaging/deb.py   |  9 +-
 game_data_packager/util.py| 19 -
 game_data_packager/util_deb.py| 41 ---
 9 files changed, 31 insertions(+), 70 deletions(-)
 delete mode 100644 game_data_packager/util_deb.py

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/01: Move Lintian overrides into PackagingSystem

[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 883470ab27c73f78a715fb25910b04ffc45a0775
Author: Simon McVittie 
Date:   Tue Jan 5 10:11:37 2016 +

Move Lintian overrides into PackagingSystem
---
 game_data_packager/build.py   |  6 ++--
 game_data_packager/games/doom_common.py   |  7 +++--
 game_data_packager/games/ecwolf_common.py |  6 ++--
 game_data_packager/games/residualvm_common.py |  6 ++--
 game_data_packager/games/scummvm_common.py|  4 ++-
 game_data_packager/packaging/__init__.py  |  3 ++
 game_data_packager/packaging/deb.py   |  9 +-
 game_data_packager/util.py| 19 -
 game_data_packager/util_deb.py| 41 ---
 9 files changed, 31 insertions(+), 70 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index e8ea2b4..4489245 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -51,7 +51,6 @@ from .util import (AGENT,
 copy_with_substitutions,
 human_size,
 lang_score,
-lintian_license,
 mkdir_p,
 rm_rf,
 recursive_utime,
@@ -1336,7 +1335,10 @@ class PackagingTask(object):
  licenses.add("/%s/%s/%s" % (self.packaging.LICENSEDIR,
  package.name, license_file))
  if os.path.splitext(license_file)[0].lower() == 'license':
- lintian_license(destdir, package.name, license_file)
+ self.packaging.override_lintian(destdir, package.name,
+ 'extra-license-file',
+ 'usr/share/doc/%s/%s' % (package.name,
+ license_file))
 
 if package.component == 'local':
 o.write('It contains proprietary game data '
diff --git a/game_data_packager/games/doom_common.py 
b/game_data_packager/games/doom_common.py
index 2b33d84..34652e2 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -24,7 +24,7 @@ import subprocess
 from .. import GameData
 from ..build import (PackagingTask)
 from ..paths import DATADIR
-from ..util import (copy_with_substitutions, mkdir_p, lintian_desktop)
+from ..util import (copy_with_substitutions, mkdir_p)
 from ..version import (FORMAT)
 
 logger = logging.getLogger('game-data-packager.games.doom-common')
@@ -171,7 +171,10 @@ class DoomTask(PackagingTask):
   'w', encoding='utf-8') as output:
  desktop.write(output, space_around_delimiters=False)
 
-lintian_desktop(destdir, package.name, package.program)
+self.packaging.override_lintian(destdir, package.name,
+'desktop-command-not-in-package',
+'%s/%s.desktop %s' % (appdir,
+desktop_file, package.program))
 
 if FORMAT == 'deb':
 debdir = os.path.join(destdir, 'DEBIAN')
diff --git a/game_data_packager/games/ecwolf_common.py 
b/game_data_packager/games/ecwolf_common.py
index d9bc702..5f4ed57 100644
--- a/game_data_packager/games/ecwolf_common.py
+++ b/game_data_packager/games/ecwolf_common.py
@@ -23,7 +23,7 @@ import subprocess
 from .. import GameData
 from ..build import (PackagingTask)
 from ..paths import DATADIR
-from ..util import (mkdir_p, lintian_desktop)
+from ..util import (mkdir_p)
 
 logger = logging.getLogger('game-data-packager.games.ecwolf-common')
 
@@ -100,6 +100,8 @@ class EcwolfTask(PackagingTask):
   'w', encoding='utf-8') as output:
  desktop.write(output, space_around_delimiters=False)
 
-lintian_desktop(destdir, package.name, 'ecwolf')
+self.packaging.override_lintian(destdir, package.name,
+'desktop-command-not-in-package',
+'%s/%s.desktop %s' % (appdir, package.name, 'ecwolf'))
 
 GAME_DATA_SUBCLASS = EcwolfGameData
diff --git a/game_data_packager/games/residualvm_common.py 
b/game_data_packager/games/residualvm_common.py
index 120abc8..8822e42 100644
--- a/game_data_packager/games/residualvm_common.py
+++ b/game_data_packager/games/residualvm_common.py
@@ -24,7 +24,7 @@ import subprocess
 from .. import GameData
 from ..build import (PackagingTask)
 from ..paths import DATADIR
-from ..util import (mkdir_p, lintian_desktop)
+from ..util import (mkdir_p)
 
 logger = logging.getLogger('game-data-packager.games.residualvm-common')
 
@@ -114,6 +114,8 @@ class ResidualvmTask(PackagingTask):
   'w', encoding='utf-8') as output:
  desktop.write(output, space_around_delimiters=False)
 
-lintian_desktop(destdir, package.name, 'residualvm')
+self.packaging.override_lintian(destdir, package.name,
+'desktop-command-not-in-package',
+

[game-data-packager] 02/02: Remove now-unused variables

[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 fac00a0592b7a8711982c073cf3929e0120be2f4
Author: Simon McVittie 
Date:   Tue Jan 5 10:17:48 2016 +

Remove now-unused variables

They aren't needed because their only purpose is covered by the usual
"create the directory into which we are going to install a file" logic.
---
 game_data_packager/build.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 4489245..9c48648 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1556,9 +1556,6 @@ class PackagingTask(object):
 pkgdocdir = os.path.join('usr/share/doc', package.name)
 dest_pkgdocdir = os.path.join(destdir, pkgdocdir)
 mkdir_p(dest_pkgdocdir)
-# only create license directory if needed
-pkglicensedir = os.path.join(self.packaging.LICENSEDIR, package.name)
-dest_pkglicensedir = os.path.join(destdir, pkglicensedir)
 shutil.copyfile(os.path.join(DATADIR, 'changelog.gz'),
 os.path.join(destdir, pkgdocdir, 'changelog.gz'))
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/01: ROTT: fix bad copy-paste in demo alternatives handling

[Alexandre Detiste]

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

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

commit 62890bd0d2e841e46013891d024fb79f13b9ca18
Author: Alexandre Detiste 
Date:   Tue Jan 5 09:43:17 2016 +0100

ROTT: fix bad copy-paste in demo alternatives handling
---
 data/rott.yaml  | 12 ++--
 game_data_packager/build.py | 28 +++-
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/data/rott.yaml b/data/rott.yaml
index cb26246..0bc7a1b 100644
--- a/data/rott.yaml
+++ b/data/rott.yaml
@@ -132,18 +132,18 @@ files:
 
   DEMO2_3.DMO:
 alternatives:
-- DEMO1_3.DMO?huntbgin
-- DEMO1_3.DMO?darkwar
+- DEMO2_3.DMO?huntbgin
+- DEMO2_3.DMO?darkwar
 
   DEMO3_3.DMO:
 alternatives:
-- DEMO1_3.DMO?huntbgin
-- DEMO1_3.DMO?darkwar
+- DEMO3_3.DMO?huntbgin
+- DEMO3_3.DMO?darkwar
 
   DEMO4_3.DMO:
 alternatives:
-- DEMO1_3.DMO?huntbgin
-- DEMO1_3.DMO?darkwar
+- DEMO4_3.DMO?huntbgin
+- DEMO4_3.DMO?darkwar
 
   setup_rise_of_the_triad_2.0.0.5.exe:
 unpack:
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 40c9f5e..95857e2 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1461,6 +1461,27 @@ class PackagingTask(object):
 else:
 url = 'https://wiki.debian.org/Games/GameDataPackager'
 
+# always include these two directories in %files
+files = set(['/' + package.install_to,
+ '/usr/share/doc/' + package.name])
+
+# licenses too
+if os.path.isdir(os.path.join(destdir, 'usr/share/licenses')):
+files.add('/usr/share/licenses/' + package.name)
+
+print('FILES:', files)
+# extra misc files, in doubt add directory instead
+for dirpath, dirnames, filenames in os.walk(destdir):
+ for fn in filenames:
+ full = os.path.join(dirpath, fn)
+ dir = dirpath[len(destdir):]
+ file = full[len(destdir):]
+ if dir in files:
+ break
+ print(dir, file)
+
+print('FILES:', files)
+
 with open(specfile, 'w', encoding='utf-8') as spec:
 spec.write('Summary: %s\n' % short_desc)
 spec.write('Name: %s\n' % package.name)
@@ -1487,11 +1508,8 @@ class PackagingTask(object):
 spec.write('%description\n')
 spec.write('%s\n' % long_desc)
 spec.write('%files\n')
-for dirpath, dirnames, filenames in os.walk(destdir):
-for fn in filenames:
-full = os.path.join(dirpath, fn)
-full = full[len(destdir):]
-spec.write(full + '\n')
+spec.write('\n'.join(files))
+spec.write('\n\n')
 
 spec.write('%changelog\n')
 spec.write('* %s %s@%s - %s-0\n' %

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/01: debug info: do not log calls to 'cp' that duplicates 'Found...' & 'Copying...'

[Alexandre Detiste]

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

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

commit e81816feb6830c4e4f08354c616c0366cf48d017
Author: Alexandre Detiste 
Date:   Tue Jan 5 10:42:15 2016 +0100

debug info: do not log calls to 'cp' that duplicates 'Found...' & 
'Copying...'

spit out fedora's "%files" entry
---
 game_data_packager/build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 81f0689..0a1e11c 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1476,6 +1476,7 @@ class PackagingTask(object):
  else:
  files.add(dir)
  break
+logger.debug('%%files in specfile:\n%s', '\n'.join(sorted(files)))
 
 with open(specfile, 'w', encoding='utf-8') as spec:
 spec.write('Summary: %s\n' % short_desc)
@@ -1600,7 +1601,7 @@ class PackagingTask(object):
 mkdir_p(copy_to_dir)
 # Use cp(1) so we can make a reflink if source and
 # destination happen to be the same btrfs volume
-check_call(['cp', '--reflink=auto',
+subprocess.check_call(['cp', '--reflink=auto',
 '--preserve=timestamps', copy_from, copy_to])
 
 if wanted.executable:

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 04/11: GameData: look in {rpm, debian} as lower priority than {arch, fedora, suse}

[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 4146921fa06aee476d6d011a92ae3fee9ac8a81b
Author: Simon McVittie 
Date:   Mon Jan 4 23:46:34 2016 +

GameData: look in {rpm,debian} as lower priority than {arch,fedora,suse}

For now I'm treating "Debian packaging" as more like a packaging format
than a distribution, because Debian derivatives are quite close,
whereas RPM-based distributions have diverged.
---
 doc/tags.txt   | 5 -
 game_data_packager/__init__.py | 8 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/tags.txt b/doc/tags.txt
index 16aa307..4eac6fe 100644
--- a/doc/tags.txt
+++ b/doc/tags.txt
@@ -44,7 +44,10 @@ packages:
   provides:
   recommends:
   replaces:
-fedora:
+  engine: string
+  install_to: string
+  description: string
+rpm|fedora|suse|arch: (fedora/suse takes priority over rpm)
   engine: string
   install_to: string
   description: string
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 43af8b5..8a759c8 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -37,7 +37,7 @@ from .gog import run_gog_meta_mode
 from .paths import (DATADIR, USE_VFS)
 from .util import ascii_safe
 from .steam import run_steam_meta_mode
-from .version import (GAME_PACKAGE_VERSION, DISTRO, ASSETS)
+from .version import (ASSETS, DISTRO, FORMAT, GAME_PACKAGE_VERSION)
 
 logging.basicConfig()
 logger = logging.getLogger('game-data-packager')
@@ -800,6 +800,12 @@ class GameData(object):
 if k in d:
 setattr(package, k, d[k])
 
+for port in ('debian', 'rpm'):
+if FORMAT == port and port in d:
+for k in ('engine', 'install_to', 'description'):
+if k in d[port]:
+setattr(package, k, d[port][k])
+
 for port in ('arch', 'fedora', 'suse'):
 if DISTRO == port and port in d:
 for k in ('engine', 'install_to', 'description'):

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/02: fedora: fix handling of "UnownedDirectories"

[Alexandre Detiste]

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

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

commit d031ec950bae8b9de3f812ef442ea786e9a9aca6
Author: Alexandre Detiste 
Date:   Tue Jan 5 10:04:04 2016 +0100

fedora: fix handling of "UnownedDirectories"

https://fedoraproject.org/wiki/Packaging:UnownedDirectories
---
 game_data_packager/build.py | 25 ++---
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 95857e2..81f0689 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1461,26 +1461,21 @@ class PackagingTask(object):
 else:
 url = 'https://wiki.debian.org/Games/GameDataPackager'
 
-# always include these two directories in %files
-files = set(['/' + package.install_to,
- '/usr/share/doc/' + package.name])
-
-# licenses too
-if os.path.isdir(os.path.join(destdir, 'usr/share/licenses')):
-files.add('/usr/share/licenses/' + package.name)
-
-print('FILES:', files)
-# extra misc files, in doubt add directory instead
+SYSTEM_DIRS = set(['/usr/bin',
+   '/usr/share/applications',
+   '/usr/share/icons/hicolor/scalable/apps',
+   '/usr/share/pixmaps'])
+files = set()
 for dirpath, dirnames, filenames in os.walk(destdir):
  for fn in filenames:
  full = os.path.join(dirpath, fn)
  dir = dirpath[len(destdir):]
- file = full[len(destdir):]
- if dir in files:
+ if dir in SYSTEM_DIRS:
+ file = full[len(destdir):]
+ files.add(file)
+ else:
+ files.add(dir)
  break
- print(dir, file)
-
-print('FILES:', files)
 
 with open(specfile, 'w', encoding='utf-8') as spec:
 spec.write('Summary: %s\n' % short_desc)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 08/11: Replace most "install_to: $docdir" with doc shortcut

[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 2a64467417963c18db5ad7fe8212ca766ca34a34
Author: Simon McVittie 
Date:   Tue Jan 5 08:54:49 2016 +

Replace most "install_to: $docdir" with doc shortcut
---
 data/atlantis.yaml   |  6 ++
 data/chex.yaml   |  5 +
 data/descent2.yaml   |  2 +-
 data/doom2.yaml  |  5 +
 data/drbrain2.yaml   |  2 +-
 data/duke3d.yaml |  4 +---
 data/enclosure.yaml  |  5 +
 data/final-doom.yaml |  5 ++---
 data/glory3.yaml |  3 +--
 data/gobliiins.yaml  |  4 +---
 data/gobliins2.yaml  |  4 +---
 data/goblins3.yaml   |  7 ---
 data/grimfandango.yaml   |  1 -
 data/hank.yaml   |  6 ++
 data/hugo.yaml   | 13 +++--
 data/inherit.yaml|  7 ++-
 data/kingsquest6.yaml|  6 ++
 data/kyrandia2.yaml  |  7 +--
 data/kyrandia3.yaml  |  4 +---
 data/longbow.yaml|  2 +-
 data/loom.yaml   |  4 +---
 data/nomouth.yaml| 17 -
 data/personal-nightmare.yaml |  5 +
 data/planescape-torment.yaml |  6 +++---
 data/quake2.yaml |  8 
 data/return-to-zork.yaml |  6 +-
 data/rott.yaml   |  3 +--
 data/spacequest2.yaml|  4 +---
 data/tyrian.yaml |  2 +-
 data/waxworks.yaml   |  5 +
 data/wip/policequest4.yaml   |  5 +
 31 files changed, 48 insertions(+), 115 deletions(-)

diff --git a/data/atlantis.yaml b/data/atlantis.yaml
index d76c481..4b0d180 100644
--- a/data/atlantis.yaml
+++ b/data/atlantis.yaml
@@ -97,7 +97,7 @@ packages:
 - atlantis.000?fr
 - atlantis.001?fr
 # floppy version, no dubbing known
-optional:
+doc:
 - hintbook.pdf
 - manual.pdf
 
@@ -110,18 +110,16 @@ packages:
 - atlantis.000?it
 - atlantis.001?it
 # floppy version, no dubbing known
-optional:
+doc:
 - hintbook.pdf
 - manual.pdf
 
 files:
   hintbook.pdf:
-install_to: $docdir
 look_for: [hintbook.pdf,Indiana Jones and the Fate of Atlantis - 
Hintbook.pdf]
 install_as: hintbook.pdf
 
   manual.pdf:
-install_to: $docdir
 look_for: [manual.pdf,Indiana Jones and the Fate of Atlantis - Manual.pdf]
 install_as: manual.pdf
 
diff --git a/data/chex.yaml b/data/chex.yaml
index 9b586af..acee365 100644
--- a/data/chex.yaml
+++ b/data/chex.yaml
@@ -17,7 +17,7 @@ packages:
 install:
 - chex.wad
 - chex.deh
-optional:
+doc:
 - chexdeh.txt
 
   chexquest2-data:
@@ -41,9 +41,6 @@ files:
 - chex.deh
 - chexdeh.txt
 
-  chexdeh.txt:
-install_to: $docdir
-
 size_and_md5: |
   12361532 25485721882b050afa96a56e5758dd52 chex.wad
   7585664  fdc4ffa57e1983e30912c006284a3e01 chex2.wad
diff --git a/data/descent2.yaml b/data/descent2.yaml
index 2de7491..436e670 100644
--- a/data/descent2.yaml
+++ b/data/descent2.yaml
@@ -35,7 +35,7 @@ packages:
 
 files:
   readme.txt?demo:
-install_to: $docdir
+doc: true
 
   d2shar10.tar.gz:
 download: http://icculus.org/d2x/data/d2shar10.tar.gz
diff --git a/data/doom2.yaml b/data/doom2.yaml
index e5cba44..9bf2d02 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -31,7 +31,7 @@ packages:
   game: doom_ii_master_levels_game
 install:
 - doom2.wad
-optional:
+doc:
 - manual.pdf
 
   doom2-nerve-wad:
@@ -183,9 +183,6 @@ files:
 - nerve.wad?pc
 - nerve.wad?xbox360_bfg
 
-  manual.pdf:
-install_to: $docdir
-
   setup_doom2_2.0.0.6.exe:
 unpack:
   format: innoextract
diff --git a/data/drbrain2.yaml b/data/drbrain2.yaml
index 925034e..06f5be8 100644
--- a/data/drbrain2.yaml
+++ b/data/drbrain2.yaml
@@ -24,7 +24,7 @@ files:
 
   readme.txt:
 distinctive_name: False
-install_to: $docdir
+doc: true
 
 groups:
  original assets: |
diff --git a/data/duke3d.yaml b/data/duke3d.yaml
index 1d54d56..c9b3306 100644
--- a/data/duke3d.yaml
+++ b/data/duke3d.yaml
@@ -38,6 +38,7 @@ packages:
 - duke3d.grp
 optional:
 - duke.rts
+doc:
 - manual.pdf
 license:
 - license.txt
@@ -57,9 +58,6 @@ files:
 - duke.rts
 - license.txt?demo
 
-  manual.pdf:
-install_to: $docdir
-
 size_and_md5: |
   5924374  04e4ca70b8a2d59ed56c451c5c1d5d39 3dduke13.zip
   5848108  e061c3794afbf168698946b26e161d75 dn3dsw13.shr
diff --git a/data/enclosure.yaml b/data/enclosure.yaml
index 6f57d3c..26025c0 100644
--- a/data/enclosure.yaml
+++ b/data/enclosure.yaml
@@ -22,13 +22,10 @@ packages:
 - VIEWDIR
 - VOL.0
 - WORDS.TOK
-optional:
+doc:
 - Enclosure.txt
 
 files:
-  Enclosure.txt:
-install_to: $docdir
-
   Enclosure.zip:
 download:
   spear-of-destiny-mirrors:
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index 1cdd0fe..b6fb1e2 100644

[game-data-packager] 07/11: PackagingTask: distinguish docdir with and without destdir prepended

[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 92d1e7201a4ba1a31a425d5907ff58b9ba9de9f5
Author: Simon McVittie 
Date:   Tue Jan 5 09:00:28 2016 +

PackagingTask: distinguish docdir with and without destdir prepended

In the symlink-creation code, we were actually getting it wrong
for packages like quake3 that use $docdir, and trying to create a
symlink from /tmp/.../usr/share/doc/... to /tmp/.../usr/share/doc/...;
but because os.path.join(destdir, "/tmp/...") == "/tmp/...",
and because we have code to make the symlinks as relative as possible,
it worked anyway.

Similarly, distinguish licensedir with and without destdir prepended.
---
 game_data_packager/build.py | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 4d9a2a0..543518a 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1307,7 +1307,7 @@ class PackagingTask(object):
 return complete
 
 def fill_docs(self, package, destdir, docdir):
-copy_to = os.path.join(docdir, 'copyright')
+copy_to = os.path.join(destdir, docdir, 'copyright')
 for n in (package.name, self.game.shortname):
 copy_from = os.path.join(DATADIR, n + '.copyright')
 if os.path.exists(copy_from):
@@ -1553,13 +1553,14 @@ class PackagingTask(object):
 if not self.check_complete(package, log=True):
 return False
 
-docdir = os.path.join(destdir, 'usr/share/doc', package.name)
-mkdir_p(docdir)
+docdir = os.path.join('usr/share/doc', package.name)
+dest_docdir = os.path.join(destdir, docdir)
+mkdir_p(dest_docdir)
 # only create licensedir if needed
-licensedir = os.path.join(destdir, self.packaging.LICENSEDIR,
-package.name)
+licensedir = os.path.join(self.packaging.LICENSEDIR, package.name)
+dest_licensedir = os.path.join(destdir, licensedir)
 shutil.copyfile(os.path.join(DATADIR, 'changelog.gz'),
-os.path.join(docdir, 'changelog.gz'))
+os.path.join(destdir, docdir, 'changelog.gz'))
 
 self.fill_docs(package, destdir, docdir)
 
@@ -1599,7 +1600,7 @@ class PackagingTask(object):
 install_to = 'usr/share/doc/%s%s' % (package.name,
 install_to[7:])
 elif install_to.startswith('$licensedir'):
-mkdir_p(licensedir)
+mkdir_p(dest_licensedir)
 install_to = '%s/%s%s' % (self.packaging.LICENSEDIR,
 package.name, install_to[11:])
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 09/11: Rename $docdir to $pkgdocdir and $licensedir to $pkglicensedir

[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 2f14d8e626d692463b39b555802b07a2a2fa23d0
Author: Simon McVittie 
Date:   Tue Jan 5 09:03:20 2016 +

Rename $docdir to $pkgdocdir and $licensedir to $pkglicensedir

We were not entirely consistent about whether substituted variables
meant a generic directory like /usr/share/doc, or a package-specific
directory like /usr/share/doc/quake3-data. In Autoconf and the GNU
coding standards, package-specific directories are consistently
named pkgfoodir: borrow that convention.

This means we can consistently use lower-case variable names
(again consistent with Autoconf); do so, by renaming $LICENSEDIR
to $licensedir.
---
 data/dreamweb.yaml | 14 ++--
 data/larry1.yaml   |  2 +-
 data/larry2.yaml   |  2 +-
 data/larry3.yaml   |  2 +-
 data/larry5.yaml   |  2 +-
 data/larry6.yaml   |  2 +-
 data/quake3.yaml   |  8 +++
 data/rott.yaml |  4 ++--
 doc/adding_a_game.mdwn |  9 +---
 game_data_packager/__init__.py |  4 ++--
 game_data_packager/build.py| 48 --
 11 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/data/dreamweb.yaml b/data/dreamweb.yaml
index 66cd1ca..1b54fbc 100644
--- a/data/dreamweb.yaml
+++ b/data/dreamweb.yaml
@@ -180,13 +180,13 @@ files:
 - license.txt
 
   symbol_p22.gif:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
   symbol_p23.gif:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
   symbol_p25.gif:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
   symbol_p27.gif:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
 
   dreamweb-cd-uk-1.1.zip:
 download: 
http://prdownloads.sourceforge.net/scummvm/dreamweb-cd-uk-1.1.zip?download
@@ -213,11 +213,11 @@ files:
 - license.txt
 
   coverde.png?diary:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
   tagebuch.html:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
   tagebuch.txt:
-install_to: $docdir/diary
+install_to: $pkgdocdir/diary
 
   dreamweb-cd-de-1.1.zip:
 download: 
http://prdownloads.sourceforge.net/scummvm/dreamweb-cd-de-1.1.zip?download
diff --git a/data/larry1.yaml b/data/larry1.yaml
index 45656c5..7db2d5f 100644
--- a/data/larry1.yaml
+++ b/data/larry1.yaml
@@ -84,7 +84,7 @@ files:
 - Leisure Suit Larry 1 - Manual.pdf
 - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
   Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
-install_to: $docdir
+install_to: $pkgdocdir
 
   setup_leisure_suit_larry_vga_2.2.0.20.exe:
 unpack:
diff --git a/data/larry2.yaml b/data/larry2.yaml
index 8baaf0f..bcf00bf 100644
--- a/data/larry2.yaml
+++ b/data/larry2.yaml
@@ -33,7 +33,7 @@ packages:
 
 files:
   Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
-install_to: $docdir
+install_to: $pkgdocdir
   setup_leisure_suit_larry2_2.2.0.18.exe:
 unpack:
   format: innoextract
diff --git a/data/larry3.yaml b/data/larry3.yaml
index 5face47..2a774a6 100644
--- a/data/larry3.yaml
+++ b/data/larry3.yaml
@@ -36,7 +36,7 @@ packages:
 
 files:
   Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
-install_to: $docdir
+install_to: $pkgdocdir
   setup_leisure_suit_larry3_2.2.0.19.exe:
 unpack:
   format: innoextract
diff --git a/data/larry5.yaml b/data/larry5.yaml
index f94e93f..a5391f8 100644
--- a/data/larry5.yaml
+++ b/data/larry5.yaml
@@ -51,7 +51,7 @@ packages:
 
 files:
   Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
-install_to: $docdir
+install_to: $pkgdocdir
   setup_leisure_suit_larry5_2.2.0.20.exe:
 unpack:
   format: innoextract
diff --git a/data/larry6.yaml b/data/larry6.yaml
index 5885e6d..aae643f 100644
--- a/data/larry6.yaml
+++ b/data/larry6.yaml
@@ -47,7 +47,7 @@ files:
 unsuitable: "ScummVM only support the VGA version (320x200x256), not the 
SVGA one (640x480x256)"
 
   Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf:
-install_to: $docdir
+install_to: $pkgdocdir
 
   setup_leisure_suit_larry6_vga_2.2.0.18.exe:
 unpack:
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 3902c84..3c06bcd 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -81,10 +81,10 @@ packages:
   usr/lib/quake3/ta/missionpack/pak2.pk3: $install_to/missionpack/pak2.pk3
   usr/lib/quake3/ta/missionpack/pak3.pk3: $install_to/missionpack/pak3.pk3
   # let mix win & linux html documentation
-  $docdir/Help/BotCommands.htm: $docdir/Help/BotCommands.html
-  $docdir/Help/Dedicated Server.htm: $docdir/Help/DedicatedServer.html
-  $docdir/Help/Index.htm: $docdir/Help/Index.html
-  $docdir/Help/Readme.htm: 

[game-data-packager] 05/11: Reduce circular imports by introducing packaging modules

[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 5fe449739788ffdf3a1c9f4dcdce77ca74337077
Author: Simon McVittie 
Date:   Mon Jan 4 23:47:51 2016 +

Reduce circular imports by introducing packaging modules

Also stop deleting non-native packaging systems in g-d-p's packaging:
in principle, there's nothing to stop us producing a working .deb
on a Fedora system or a working RPM on a Debian system, if the right
tools are installed.
---
 debian/rules   |   4 -
 game_data_packager/build.py|  33 +++--
 game_data_packager/games/z_code.py |   5 +-
 game_data_packager/gog.py  |   7 +-
 game_data_packager/packaging/__init__.py   |  70 ++
 .../{util_arch.py => packaging/arch.py}|  35 ++---
 .../{util_deb.py => packaging/deb.py}  | 103 +++
 game_data_packager/packaging/rpm.py| 146 +
 game_data_packager/steam.py|  11 +-
 game_data_packager/util.py |  10 +-
 game_data_packager/util_deb.py |  99 +-
 game_data_packager/util_fedora.py  |  53 
 game_data_packager/util_rpm.py |  33 -
 game_data_packager/util_suse.py|  53 
 tools/babel.py |   5 +-
 tools/game-data-packager.spec  |   3 -
 16 files changed, 318 insertions(+), 352 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1b99807..afcc122 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,10 +38,6 @@ override_dh_install:
touch 
debian/game-data-packager/usr/share/games/game-data-packager/is-ubuntu-derived; 
\
fi
install -D -m755 runtime/doom2-masterlevels.py 
debian/game-data-packager/usr/games/doom2-masterlevels
-   rm -f 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/util_arch.py
-   rm -f 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/util_fedora.py
-   rm -f 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/util_rpm.py
-   rm -f 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/util_suse.py
 
 override_dh_installdocs:
dh_installdocs -XTODO
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 8c5bd88..221fbf9 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -40,18 +40,17 @@ except ImportError:
 from distutils.version import LooseVersion as Version
 
 from .gog import GOG
+from .packaging import (get_native_packaging_system)
 from .paths import (DATADIR, ETCDIR)
 from .unpack import (TarUnpacker, ZipUnpacker)
 from .unpack.umod import (Umod)
 from .util import (AGENT,
 MEBIBYTE,
-PACKAGE_CACHE,
 TemporaryUmask,
 check_call,
 check_output,
 copy_with_substitutions,
 human_size,
-install_packages,
 lang_score,
 lintian_license,
 mkdir_p,
@@ -344,10 +343,16 @@ def iter_fat_mounts(folder):
 yield path
 
 class PackagingTask(object):
-def __init__(self, game):
+def __init__(self, game, packaging=None):
 # A GameData object.
 self.game = game
 
+if packaging is None:
+packaging = get_native_packaging_system()
+
+# A packaging system.
+self.packaging = packaging
+
 # A temporary directory.
 self.__workdir = None
 
@@ -1418,7 +1423,8 @@ class PackagingTask(object):
 size = int(size.split()[0])
 with open(PKGINFO, 'w',  encoding='utf-8') as pkginfo:
 pkginfo.write('# Generated by game-data-packager %s\n' % 
package.version.split('+')[-1])
-pkginfo.write('# using fakeroot version %s\n' % 
PACKAGE_CACHE.current_version('fakeroot'))
+pkginfo.write('# using fakeroot version %s\n' %
+self.packaging.current_version('fakeroot'))
 pkginfo.write('# %s\n' % time.strftime("%a %b %d %H:%M:%S UTC %Y", 
time.gmtime()))
 pkginfo.write('pkgname = %s\n' % package.name)
 pkginfo.write('pkgver = %s-1\n' % package.version)
@@ -1882,8 +1888,8 @@ class PackagingTask(object):
 ver = None
 
 # check engine
-is_installed = PACKAGE_CACHE.is_installed(engine)
-if not is_installed and not PACKAGE_CACHE.is_available(engine):
+is_installed = self.packaging.is_installed(engine)
+if not is_installed and not self.packaging.is_available(engine):
 return FillResult.IMPOSSIBLE
 if ver is None:
 if is_installed:
@@ -1893,9 +1899,9 @@ class 

[game-data-packager] 06/11: Move ASSETS, BINDIR, LICENSEDIR into PackagingSystem object

[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 b3ef1dfee2f916efeaed718a03a89fadb45acbb7
Author: Simon McVittie 
Date:   Tue Jan 5 00:05:55 2016 +

Move ASSETS, BINDIR, LICENSEDIR into PackagingSystem object
---
 debian/rules   |  3 ---
 game_data_packager/__init__.py | 10 +++
 game_data_packager/build.py| 42 ++
 game_data_packager/games/doom_common.py|  4 +--
 game_data_packager/games/scummvm_common.py |  3 +--
 game_data_packager/games/unreal.py |  3 +--
 game_data_packager/games/z_code.py |  6 ++---
 game_data_packager/packaging/__init__.py   |  3 +++
 game_data_packager/packaging/deb.py|  3 +++
 game_data_packager/packaging/rpm.py|  2 ++
 game_data_packager/version.py  | 12 -
 tools/game-data-packager.spec  |  3 ---
 12 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/debian/rules b/debian/rules
index afcc122..46aadb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,6 @@ override_dh_install:
echo 'GAME_PACKAGE_VERSION = """$(DEB_VERSION)"""' > 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
echo 'FORMAT = "deb"' >> 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
echo 'DISTRO = "generic"' >> 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
-   echo 'BINDIR = "usr/games"' >> 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
-   echo 'LICENSEDIR = "usr/share/doc"' >> 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
-   echo 'ASSETS = "usr/share/games"' >> 
debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
if dpkg-vendor --derives-from Ubuntu; then \
touch 
debian/game-data-packager/usr/share/games/game-data-packager/is-ubuntu-derived; 
\
fi
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 8a759c8..de7fd4e 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -37,7 +37,7 @@ from .gog import run_gog_meta_mode
 from .paths import (DATADIR, USE_VFS)
 from .util import ascii_safe
 from .steam import run_steam_meta_mode
-from .version import (ASSETS, DISTRO, FORMAT, GAME_PACKAGE_VERSION)
+from .version import (DISTRO, FORMAT, GAME_PACKAGE_VERSION)
 
 logging.basicConfig()
 logger = logging.getLogger('game-data-packager')
@@ -239,9 +239,9 @@ class GameDataPackage(object):
 # put 'usr/share/games/quake3/baseq3/pak1.pk3' in the .deb.
 # The default is 'usr/share/games/' plus the binary package's name.
 if name.endswith('-data'):
-self.install_to = ASSETS + '/' + name[:len(name) - 5]
+self.install_to = '$assets/' + name[:len(name) - 5]
 else:
-self.install_to = ASSETS + '/' + name
+self.install_to = '$assets/' + name
 
 # If true, this package is allowed to be empty
 self.empty = False
@@ -838,9 +838,7 @@ class GameData(object):
"A package shouldn't extraneously provide itself"
 
 if 'install_to' in d:
-if package.install_to.startswith('$assets/'):
-package.install_to = ASSETS + 
package.install_to[len('$assets'):]
-assert 'usr/share/games/' + package.name != d['install_to'] + 
'-data', \
+assert '$assets/' + package.name != d['install_to'] + '-data', \
 "install_to %s is extraneous" % package.name
 
 if 'demo_for' in d:
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 221fbf9..4d9a2a0 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -57,7 +57,7 @@ from .util import (AGENT,
 rm_rf,
 recursive_utime,
 which)
-from .version import (ASSETS, BINDIR, LICENSEDIR, FORMAT, DISTRO)
+from .version import (FORMAT, DISTRO)
 
 if FORMAT == 'deb':
 from debian.deb822 import Deb822
@@ -1334,7 +1334,8 @@ class PackagingTask(object):
  if not f.license:
  continue
  license_file = f.install_as
- licenses.add("/%s/%s/%s" % (LICENSEDIR, package.name, 
license_file))
+ licenses.add("/%s/%s/%s" % (self.packaging.LICENSEDIR,
+ package.name, license_file))
  if os.path.splitext(license_file)[0].lower() == 'license':
  lintian_license(destdir, package.name, license_file)
 
@@ -1376,16 +1377,20 @@ class PackagingTask(object):
  main_wad = f.install_as
  exts.add(os.path.splitext(main_wad.lower())[1])
 
+

[game-data-packager] 10/11: install_to, symlinks: strip leading / if any

[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 dc35b1628b7e9e3ecc04e30838177fe5cd8038b3
Author: Simon McVittie 
Date:   Tue Jan 5 09:25:14 2016 +

install_to, symlinks: strip leading / if any
---
 game_data_packager/build.py | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index eaa4547..55e5ed1 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1602,6 +1602,8 @@ class PackagingTask(object):
 mkdir_p(dest_pkglicensedir)
 install_to = pkglicensedir + install_to[14:]
 
+install_to = install_to.lstrip('/')
+
 copy_to = os.path.join(destdir, install_to, install_as)
 copy_to_dir = os.path.dirname(copy_to)
 logger.debug('Copying to %s', copy_to)
@@ -1618,9 +1620,6 @@ class PackagingTask(object):
 os.chmod(copy_to, 0o644)
 
 for symlink, real_file in package.symlinks.items():
-symlink = symlink.lstrip('/')
-real_file = real_file.lstrip('/')
-
 symlink = string.Template(symlink).safe_substitute(
 assets=self.packaging.ASSETS,
 bindir=self.packaging.BINDIR,
@@ -1636,6 +1635,9 @@ class PackagingTask(object):
 pkglicensedir=pkglicensedir,
 install_to=package.install_to)
 
+symlink = symlink.lstrip('/')
+real_file = real_file.lstrip('/')
+
 toplevel, rest = symlink.split('/', 1)
 if real_file.startswith(toplevel + '/'):
 symlink_dirs = symlink.split('/')
@@ -1662,6 +1664,8 @@ class PackagingTask(object):
 install_to = package.install_to
 if install_to.startswith('$assets'):
 install_to = self.packaging.ASSETS + install_to[7:]
+
+install_to = install_to.lstrip('/')
 install_as = package.rip_cd['filename_format'] % i
 copy_to = os.path.join(destdir, install_to, install_as)
 copy_to_dir = os.path.dirname(copy_to)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 11/11: Consistently apply the same substitutions to all install_to and symlinks

[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 5ab47e402df1f1881cf406af970a3a455b991326
Author: Simon McVittie 
Date:   Tue Jan 5 09:53:03 2016 +

Consistently apply the same substitutions to all install_to and symlinks

One minor exception is that ${install_to} only works for symlinks,
because what would it mean in install_to? :-)
---
 game_data_packager/build.py  | 38 +++-
 game_data_packager/packaging/__init__.py | 13 +++
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 55e5ed1..e8ea2b4 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -26,7 +26,6 @@ import random
 import shutil
 import stat
 import subprocess
-import string
 import sys
 import tempfile
 import time
@@ -1377,9 +1376,8 @@ class PackagingTask(object):
  main_wad = f.install_as
  exts.add(os.path.splitext(main_wad.lower())[1])
 
-install_to = package.install_to
-if install_to.startswith('$assets'):
-install_to = self.packaging.ASSETS + install_to[7:]
+install_to = self.packaging.substitute(package.install_to,
+package.name)
 
 if count_usr == 0 and count_doc == 1:
 o.write('"/usr/share/doc/%s/%s"\n' % (package.name,
@@ -1594,15 +1592,8 @@ class PackagingTask(object):
 if install_to is None:
 install_to = package.install_to
 
-if install_to.startswith('$assets'):
-install_to = self.packaging.ASSETS + install_to[7:]
-elif install_to.startswith('$pkgdocdir'):
-install_to = pkgdocdir + install_to[10:]
-elif install_to.startswith('$pkglicensedir'):
-mkdir_p(dest_pkglicensedir)
-install_to = pkglicensedir + install_to[14:]
-
-install_to = install_to.lstrip('/')
+install_to = self.packaging.substitute(install_to,
+package.name).lstrip('/')
 
 copy_to = os.path.join(destdir, install_to, install_as)
 copy_to_dir = os.path.dirname(copy_to)
@@ -1620,19 +1611,9 @@ class PackagingTask(object):
 os.chmod(copy_to, 0o644)
 
 for symlink, real_file in package.symlinks.items():
-symlink = string.Template(symlink).safe_substitute(
-assets=self.packaging.ASSETS,
-bindir=self.packaging.BINDIR,
-licensedir=self.packaging.LICENSEDIR,
-pkgdocdir=pkgdocdir,
-pkglicensedir=pkglicensedir,
+symlink = self.packaging.substitute(symlink, package.name,
 install_to=package.install_to)
-real_file = string.Template(real_file).safe_substitute(
-assets=self.packaging.ASSETS,
-bindir=self.packaging.BINDIR,
-pkgdocdir=pkgdocdir,
-licensedir=self.packaging.LICENSEDIR,
-pkglicensedir=pkglicensedir,
+real_file = self.packaging.substitute(real_file, package.name,
 install_to=package.install_to)
 
 symlink = symlink.lstrip('/')
@@ -1661,11 +1642,8 @@ class PackagingTask(object):
 if package.rip_cd and self.cd_tracks.get(package.name):
 for i, copy_from in self.cd_tracks[package.name].items():
 logger.debug('Found CD track %d at %s', i, copy_from)
-install_to = package.install_to
-if install_to.startswith('$assets'):
-install_to = self.packaging.ASSETS + install_to[7:]
-
-install_to = install_to.lstrip('/')
+install_to = self.packaging.substitute(package.install_to,
+package.name).lstrip('/')
 install_as = package.rip_cd['filename_format'] % i
 copy_to = os.path.join(destdir, install_to, install_as)
 copy_to_dir = os.path.dirname(copy_to)
diff --git a/game_data_packager/packaging/__init__.py 
b/game_data_packager/packaging/__init__.py
index 5ca2acf..23faa11 100644
--- a/game_data_packager/packaging/__init__.py
+++ b/game_data_packager/packaging/__init__.py
@@ -17,6 +17,7 @@
 # /usr/share/common-licenses/GPL-2.
 
 from abc import (ABCMeta, abstractmethod)
+import string
 
 class PackagingSystem(metaclass=ABCMeta):
 ASSETS = 'usr/share'
@@ -57,6 +58,18 @@ class PackagingSystem(metaclass=ABCMeta):
 """Install one or more packages (a list of filenames)."""
 raise NotImplementedError
 
+def substitute(self, template, package, **kwargs):
+if '$' not in template:
+   

[game-data-packager] 01/02: Finish replacing lintian_desktop with PackagingSystem.override_lintian

[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 7d3f4fa431bec77167b2961973c089fb5b6fd466
Author: Simon McVittie 
Date:   Tue Jan 5 10:15:19 2016 +

Finish replacing lintian_desktop with PackagingSystem.override_lintian
---
 game_data_packager/games/scummvm_common.py | 2 +-
 game_data_packager/games/z_code.py | 7 ---
 game_data_packager/packaging/deb.py| 2 +-
 game_data_packager/util.py | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/games/scummvm_common.py 
b/game_data_packager/games/scummvm_common.py
index b64af13..f3c3960 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -24,7 +24,7 @@ import subprocess
 from .. import GameData
 from ..build import (PackagingTask)
 from ..paths import DATADIR
-from ..util import (mkdir_p, lintian_desktop)
+from ..util import (mkdir_p)
 
 logger = logging.getLogger('game-data-packager.games.scummvm-common')
 
diff --git a/game_data_packager/games/z_code.py 
b/game_data_packager/games/z_code.py
index ff96989..fe05d95 100644
--- a/game_data_packager/games/z_code.py
+++ b/game_data_packager/games/z_code.py
@@ -23,8 +23,7 @@ import os
 from .. import GameData
 from ..build import (PackagingTask)
 from ..util import (TemporaryUmask,
-mkdir_p,
-lintian_desktop)
+mkdir_p)
 
 logger = logging.getLogger('game-data-packager.games.z_code')
 
@@ -81,7 +80,9 @@ class ZCodeTask(PackagingTask):
   'w', encoding='utf-8') as output:
  desktop.write(output, space_around_delimiters=False)
 
-lintian_desktop(destdir, package.name, engine)
+self.packaging.override_lintian(destdir, package.name,
+'desktop-command-not-in-package',
+'%s/%s.desktop %s' % (appdir, package.name, engine))
 
 if engine == 'frotz':
 bindir = os.path.join(destdir, self.packaging.BINDIR)
diff --git a/game_data_packager/packaging/deb.py 
b/game_data_packager/packaging/deb.py
index 56d37f8..ed3d933 100644
--- a/game_data_packager/packaging/deb.py
+++ b/game_data_packager/packaging/deb.py
@@ -126,7 +126,7 @@ class DebPackaging(PackagingSystem):
 assert type(package) is str
 lintiandir = os.path.join(destdir, 'usr/share/lintian/overrides')
 mkdir_p(lintiandir)
-with open(os.path.join(lintian, package), 'a', encoding='utf-8') as l:
+with open(os.path.join(lintiandir, package), 'a', encoding='utf-8') as 
l:
 l.write('%s: %s %s\n' % (package, tag, args))
 
 def get_distro_packaging():
diff --git a/game_data_packager/util.py b/game_data_packager/util.py
index 6b040e2..d63a181 100644
--- a/game_data_packager/util.py
+++ b/game_data_packager/util.py
@@ -26,7 +26,7 @@ import subprocess
 import sys
 
 from .paths import DATADIR
-from .version import (GAME_PACKAGE_VERSION, FORMAT, DISTRO)
+from .version import (GAME_PACKAGE_VERSION)
 
 logger = logging.getLogger('game-data-packager.util')
 

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (883470a -> fac00a0)

[Simon McVittie]

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

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

  from  883470a   Move Lintian overrides into PackagingSystem
   new  7d3f4fa   Finish replacing lintian_desktop with 
PackagingSystem.override_lintian
   new  fac00a0   Remove now-unused variables

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 game_data_packager/build.py| 3 ---
 game_data_packager/games/scummvm_common.py | 2 +-
 game_data_packager/games/z_code.py | 7 ---
 game_data_packager/packaging/deb.py| 2 +-
 game_data_packager/util.py | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (187acea -> 6c8339a)

[Alexandre Detiste]

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

detiste-guest pushed a change to branch master
in repository game-data-packager.

  from  187acea   doom_common: also install uncompressed .svg icons
   new  6c8339a   Makefile: install out/memento-mori-2.svg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/01: Makefile: install out/memento-mori-2.svg

[Alexandre Detiste]

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

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

commit 6c8339aca64491a33bea03d15e289d97e41250c7
Author: Alexandre Detiste 
Date:   Tue Jan 5 10:19:33 2016 +0100

Makefile: install out/memento-mori-2.svg
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7c6443f..23cbd72 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ dot_in:= $(patsubst ./data/%,./out/%,$(wildcard 
./data/*.in))
 
 default: $(png) $(svgz) $(json) $(copyright) $(dot_in) \
   out/bash_completion out/changelog.gz out/copyright \
-  out/game-data-packager out/vfs.zip
+  out/game-data-packager out/vfs.zip out/memento-mori-2.svg
 
 out/%: data/%
mkdir -p out

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

r15685 - in packages/trunk/alienblaster/debian: . icons patches source

[Markus Koschany]

Author: apo-guest
Date: 2016-01-05 17:19:05 + (Tue, 05 Jan 2016)
New Revision: 15685

Added:
   packages/trunk/alienblaster/debian/icons/
   packages/trunk/alienblaster/debian/icons/alienblaster.png
   packages/trunk/alienblaster/debian/icons/alienblaster.xpm
   packages/trunk/alienblaster/debian/source/include-binaries
Removed:
   packages/trunk/alienblaster/debian/source/options
Modified:
   packages/trunk/alienblaster/debian/alienblaster-data.install
   packages/trunk/alienblaster/debian/alienblaster.desktop
   packages/trunk/alienblaster/debian/changelog
   packages/trunk/alienblaster/debian/control
   packages/trunk/alienblaster/debian/copyright
   packages/trunk/alienblaster/debian/patches/add-hardening-support.patch
   packages/trunk/alienblaster/debian/rules
Log:
Release 1.1.0-9


Modified: packages/trunk/alienblaster/debian/alienblaster-data.install
===
--- packages/trunk/alienblaster/debian/alienblaster-data.install
2015-12-31 15:07:21 UTC (rev 15684)
+++ packages/trunk/alienblaster/debian/alienblaster-data.install
2016-01-05 17:19:05 UTC (rev 15685)
@@ -1,5 +1,5 @@
-alienblaster.pngusr/share/pixmaps
-alienblaster.xpmusr/share/pixmaps
-cfg/*   usr/share/games/alienblaster/cfg
-images/*usr/share/games/alienblaster/images
-sound/* usr/share/games/alienblaster/sound
+debian/icons/alienblaster.pngusr/share/icons/hicolor/32x32/apps
+debian/icons/alienblaster.xpmusr/share/pixmaps
+cfg/*usr/share/games/alienblaster/cfg
+images/* usr/share/games/alienblaster/images
+sound/*  usr/share/games/alienblaster/sound

Modified: packages/trunk/alienblaster/debian/alienblaster.desktop
===
--- packages/trunk/alienblaster/debian/alienblaster.desktop 2015-12-31 
15:07:21 UTC (rev 15684)
+++ packages/trunk/alienblaster/debian/alienblaster.desktop 2016-01-05 
17:19:05 UTC (rev 15685)
@@ -2,6 +2,7 @@
 Name=AlienBlaster
 GenericName=2D Action Shooter
 Comment=Blast the invading aliens
+Comment[de]=Vernichte die angreifenden Aliens
 Type=Application
 Exec=alienblaster
 Icon=alienblaster

Modified: packages/trunk/alienblaster/debian/changelog
===
--- packages/trunk/alienblaster/debian/changelog2015-12-31 15:07:21 UTC 
(rev 15684)
+++ packages/trunk/alienblaster/debian/changelog2016-01-05 17:19:05 UTC 
(rev 15685)
@@ -1,9 +1,16 @@
-alienblaster (1.1.0-9) UNRELEASED; urgency=medium
+alienblaster (1.1.0-9) unstable; urgency=medium
 
   * Team upload.
-  * Fix build reproducibility issues due to use of imagemagick
+  * debian/rules: Remove override for dh_builddeb because xz compression
+is the default now. Drop source/options too.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Vcs-Browser: Use https.
+  * alienblaster.desktop: Add a comment in German.
+  * Remove imagemagick from Build-Depends and manually convert
+alienblastericon.bmp to alienblaster.png and alienblaster.xpm icons.
+(Closes: #778479)
 
- -- Paul Wise   Wed, 26 Nov 2014 16:41:07 +0800
+ -- Markus Koschany   Tue, 05 Jan 2016 17:58:22 +0100
 
 alienblaster (1.1.0-8) unstable; urgency=low
 

Modified: packages/trunk/alienblaster/debian/control
===
--- packages/trunk/alienblaster/debian/control  2015-12-31 15:07:21 UTC (rev 
15684)
+++ packages/trunk/alienblaster/debian/control  2016-01-05 17:19:05 UTC (rev 
15685)
@@ -7,13 +7,12 @@
  Barry deFreese 
 Build-Depends:
  debhelper (>= 9),
- imagemagick,
  libsdl-mixer1.2-dev,
  libsdl1.2-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://www.schwardtnet.de/alienblaster/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/alienblaster/
-Vcs-Browser: 
http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/alienblaster/
+Vcs-Browser: 
https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/alienblaster/
 
 Package: alienblaster
 Architecture: any

Modified: packages/trunk/alienblaster/debian/copyright
===
--- packages/trunk/alienblaster/debian/copyright2015-12-31 15:07:21 UTC 
(rev 15684)
+++ packages/trunk/alienblaster/debian/copyright2016-01-05 17:19:05 UTC 
(rev 15685)
@@ -16,7 +16,7 @@
 Files: debian/*
 Copyright: 2008-2011,  Moritz Muehlenhoff 
2009,   Gonéri Le Bouder 
-   2013,   Markus Koschany 
+   2013, 2016  Markus Koschany 
2009, 2013, Barry deFreese 
 License: GPL-2+
 

Added: packages/trunk/alienblaster/debian/icons/alienblaster.png

r15686 - in packages/tags/alienblaster: ! dirs' list truncated !

[Markus Koschany]

Author: apo-guest
Date: 2016-01-05 17:19:17 + (Tue, 05 Jan 2016)
New Revision: 15686

Added:
   packages/tags/alienblaster/1.1.0-9/
   packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install
   packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop
   packages/tags/alienblaster/1.1.0-9/debian/changelog
   packages/tags/alienblaster/1.1.0-9/debian/control
   packages/tags/alienblaster/1.1.0-9/debian/copyright
   packages/tags/alienblaster/1.1.0-9/debian/icons/
   packages/tags/alienblaster/1.1.0-9/debian/patches/add-hardening-support.patch
   packages/tags/alienblaster/1.1.0-9/debian/rules
   packages/tags/alienblaster/1.1.0-9/debian/source/include-binaries
Removed:
   packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install
   packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop
   packages/tags/alienblaster/1.1.0-9/debian/changelog
   packages/tags/alienblaster/1.1.0-9/debian/control
   packages/tags/alienblaster/1.1.0-9/debian/copyright
   packages/tags/alienblaster/1.1.0-9/debian/patches/add-hardening-support.patch
   packages/tags/alienblaster/1.1.0-9/debian/rules
   packages/tags/alienblaster/1.1.0-9/debian/source/options
Log:
[svn-buildpackage] Tagging alienblaster 1.1.0-9

Deleted: packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install
===
--- packages/trunk/alienblaster/debian/alienblaster-data.install
2015-12-31 15:07:21 UTC (rev 15684)
+++ packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install 
2016-01-05 17:19:17 UTC (rev 15686)
@@ -1,5 +0,0 @@
-alienblaster.pngusr/share/pixmaps
-alienblaster.xpmusr/share/pixmaps
-cfg/*   usr/share/games/alienblaster/cfg
-images/*usr/share/games/alienblaster/images
-sound/* usr/share/games/alienblaster/sound

Copied: packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install 
(from rev 15685, packages/trunk/alienblaster/debian/alienblaster-data.install)
===
--- packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install 
(rev 0)
+++ packages/tags/alienblaster/1.1.0-9/debian/alienblaster-data.install 
2016-01-05 17:19:17 UTC (rev 15686)
@@ -0,0 +1,5 @@
+debian/icons/alienblaster.pngusr/share/icons/hicolor/32x32/apps
+debian/icons/alienblaster.xpmusr/share/pixmaps
+cfg/*usr/share/games/alienblaster/cfg
+images/* usr/share/games/alienblaster/images
+sound/*  usr/share/games/alienblaster/sound

Deleted: packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop
===
--- packages/trunk/alienblaster/debian/alienblaster.desktop 2015-12-31 
15:07:21 UTC (rev 15684)
+++ packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop  
2016-01-05 17:19:17 UTC (rev 15686)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=AlienBlaster
-GenericName=2D Action Shooter
-Comment=Blast the invading aliens
-Type=Application
-Exec=alienblaster
-Icon=alienblaster
-Terminal=false
-Categories=Game;ActionGame;
-Keywords=shooter;arcade;action;aliens;explosions;2D;

Copied: packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop (from 
rev 15685, packages/trunk/alienblaster/debian/alienblaster.desktop)
===
--- packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop  
(rev 0)
+++ packages/tags/alienblaster/1.1.0-9/debian/alienblaster.desktop  
2016-01-05 17:19:17 UTC (rev 15686)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=AlienBlaster
+GenericName=2D Action Shooter
+Comment=Blast the invading aliens
+Comment[de]=Vernichte die angreifenden Aliens
+Type=Application
+Exec=alienblaster
+Icon=alienblaster
+Terminal=false
+Categories=Game;ActionGame;
+Keywords=shooter;arcade;action;aliens;explosions;2D;

Deleted: packages/tags/alienblaster/1.1.0-9/debian/changelog
===
--- packages/trunk/alienblaster/debian/changelog2015-12-31 15:07:21 UTC 
(rev 15684)
+++ packages/tags/alienblaster/1.1.0-9/debian/changelog 2016-01-05 17:19:17 UTC 
(rev 15686)
@@ -1,109 +0,0 @@
-alienblaster (1.1.0-9) UNRELEASED; urgency=medium
-
-  * Team upload.
-  * Fix build reproducibility issues due to use of imagemagick
-
- -- Paul Wise   Wed, 26 Nov 2014 16:41:07 +0800
-
-alienblaster (1.1.0-8) unstable; urgency=low
-
-  [ Gonéri Le Bouder ]
-  * Remove myself from Uploaders.
-
-  [ Barry deFreese ]
-  * Bump debhelper depends and compat to 9.
-  * Add misc:Depends to -data package for debhelper.
-  * Bump Standards Version to 3.9.4.
-
-  [ Markus Koschany ]
-  * debian/control:
-- Add Suggests: alienblaster to alienblaster-data.
-- Add build-dep on imagemagick.
-- Use canonical 

[pentobi] annotated tag debian/11.0-1 created (now f2e98f6)

[Juhani Numminen]

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

jsonic-guest pushed a change to annotated tag debian/11.0-1
in repository pentobi.

at  f2e98f6   (tag)
   tagging  c18d71b498f3d178e05e80f8bcefca176468c1ba (commit)
  replaces  debian/10.1-1
 tagged by  Juhani Numminen
on  Tue Jan 5 16:36:32 2016 +0200

- Log -
Debian release 11.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQEcBAABCgAGBQJWi9TwAAoJEICGa2KP4xPG/rQIAJnwxsEzodg87j67N/Us2pu4
N2clNJlz8OlR6GiuwW8MukxtsCPzh6+g7vS5xoamBLm2554BomICBtPgeAN8/1nu
WKn78coxoTVO1IpAwTPBFhz9/R51+8kG2kfdoa3TQo4qUCWOwzAtm1aWfxUsc1Y4
XEOiscGwNjkc7cyx1Q6ZaqbP7ua7OaIYxVWIeTVYjErGBMjd6Qmyp8IEvbEQnkim
WV3i3P7iaDkaFXthylIbdPlKLQntiBpB2b6+b3wc/uBZSpL1pdnGzzK3gW2Bdace
O7h5uL1/YYUjphs0rUDTvAqpQD1ZvxtyZ3VwDJ8qzDMQBHoJcw5OxwQ8EFZYe/8=
=iwu3
-END PGP SIGNATURE-

Juhani Numminen (4):
  Imported Upstream version 11.0
  d/rules: "USE_QT5" not needed, qt4 support was dropped upstream; 
d/pentobi.install: Add usr/share/appdata, remove usr/share/pixmaps.
  d/control: Update Vcs-Browser field to use https.
  Bump changelog date.

---

No new revisions were added by this update.

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (2e17d7c -> db245be)

[Stephen Kitt]

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

skitt pushed a change to branch master
in repository game-data-packager.

  from  2e17d7c   fedora: fix little refactor glitches
   new  db245be   Add French CD version of Cruise for a Corpse.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 data/cruise.yaml | 27 +++
 debian/changelog |  3 +++
 2 files changed, 30 insertions(+)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/01: Add French CD version of Cruise for a Corpse.

[Stephen Kitt]

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

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

commit db245be84282aa1822f9de479133b295fd49665d
Author: Stephen Kitt 
Date:   Tue Jan 5 21:30:42 2016 +0100

Add French CD version of Cruise for a Corpse.
---
 data/cruise.yaml | 27 +++
 debian/changelog |  3 +++
 2 files changed, 30 insertions(+)

diff --git a/data/cruise.yaml b/data/cruise.yaml
index 56af934..39a1621 100644
--- a/data/cruise.yaml
+++ b/data/cruise.yaml
@@ -32,6 +32,19 @@ packages:
 - system.fnt
 - vol.cnf?fr
 
+  cruise-for-a-corpse-cd-fr-data:
+longname: "Cruise for a Corpse (Croisière pour un cadavre)"
+provides: cruise-for-a-corpse-data
+install:
+- d1?frcd
+- d2?frcd
+- d3?frcd
+- d4?frcd
+- d5?frcd
+- delphine.lng?frcd
+- system.fnt
+- vol.cnf
+
 size_and_md5: |
   612731330cb6c19ee4feaed1023413bfb710a5 d1
   635629e5832b08d7621a288e38b0a239fa33f2 d2
@@ -49,6 +62,13 @@ size_and_md5: |
   6493753594fa7efe4ec1ed63d81c92bb2f7d5b d5?fr
   12370 9c578575468b356a11d4d1f9f2a3786a vol.cnf?fr
 
+  61138700f096601c5c952c207f98ea291f6e01 d1?frcd
+  63768703be87f0a2e075a700de1358c52df521 d2?frcd
+  699783171f84df221d5f79ee86d3e0a840630b d3?frcd
+  787008569fe41c1d753e3d83b9ccf589883a26 d4?frcd
+  7290412d6349b91e9134a230a90c837ee642bb d5?frcd
+  620   d7ede0acdc2e9ec3350ae7229377d893 delphine.lng?frcd
+
 sha1sums: |
   562f4ab92883f01622f6ac342d61a18830e972a4  d1
   e9b91f5589854c1d3ea4de0634082feb59f48d52  d2
@@ -64,4 +84,11 @@ sha1sums: |
   578f640ed30a1aa94583750126c8c8682c547c62  d4?fr
   22938b410e232d463d31e4c64779892c54a6a7b1  d5?fr
   7aa203ade3bc99d0e7daae16b167ac6bbb4084fd  vol.cnf?fr
+
+  12babf516759a2a0f82efab16087f58531655b9a  d1?frcd
+  ee4c334684b64fcfa1af1b56f8731c0e04ea4ad6  d2?frcd
+  c743c758f6c177c3654660eec9ccc17b4065cf35  d3?frcd
+  a4f5086e25c19d480804cbe204e555c897100af0  d4?frcd
+  187fe4e75f7ba9002ce0ab34fb5464bc477ce08b  d5?frcd
+  cae812632772e8d221205f7e9fcfadfbd4838fa0  delphine.lng?frcd
 ...
diff --git a/debian/changelog b/debian/changelog
index 4e9e1d8..8bca528 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ game-data-packager (44) UNRELEASED; urgency=medium
   * Discworld 1: add de/fr/es/it floppy version
   * RTCW: add Italian version, Thanks to iortcw upstream
 
+  [ Stephen Kitt ]
+  * Cruise for a Corpse: add French CD version
+
   Other changes:
 
   [ Alexandre Detiste ]

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[tworld] 03/03: apply upstream supplied patch for DESTDIR support

[Gerfried Fuchs]

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

rhonda pushed a commit to branch master
in repository tworld.

commit 5461701ff6720ae8bb0a3219e99e5ab04bd02767
Author: Rhonda D'Vine 
Date:   Tue Jan 5 21:06:15 2016 +0100

apply upstream supplied patch for DESTDIR support
---
 debian/changelog  |  2 ++
 debian/patches/03_fix-Makefile.in | 21 ++---
 debian/rules  |  4 
 debian/tworld-data.install|  7 +--
 debian/tworld.install |  4 ++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c994192..84edfc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ tworld (1.3.2-2) unstable; urgency=medium
 tweak. Closes: #792980 is about a different issue, but that one is fixed
 and the one report about reproducible build open so closing it here.
   * Get rid of ancient postinst script from oldstable times.
+  * Apply patch provided by upstream to support DESTDIR and use
+dh_auto_install again.
 
  -- Rhonda D'Vine   Tue, 05 Jan 2016 14:23:32 +0100
 
diff --git a/debian/patches/03_fix-Makefile.in 
b/debian/patches/03_fix-Makefile.in
index a1ea706..6c93776 100644
--- a/debian/patches/03_fix-Makefile.in
+++ b/debian/patches/03_fix-Makefile.in
@@ -6,9 +6,24 @@ Description: patch to fix clean target
 
 Index: VCS/Makefile.in
 ===
 VCS.orig/Makefile.in
-+++ VCS/Makefile.in
-@@ -110,10 +110,10 @@ all: tworld
+--- VCS.orig/Makefile.in   2016-01-05 14:48:50.500844745 +0100
 VCS/Makefile.in2016-01-05 14:50:50.101437812 +0100
+@@ -9,10 +9,10 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
+-datarootdir = @datarootdir@
+-sharedir = @sharedir@
+-mandir = @mandir@
++bindir = $(DESTDIR)@bindir@
++datarootdir = $(DESTDIR)@datarootdir@
++sharedir = $(DESTDIR)@sharedir@
++mandir = $(DESTDIR)@mandir@
+ 
+ CC = @CC@
+ 
+@@ -110,10 +110,10 @@
  clean:
rm -f $(OBJS) tworld comptime.h config.*
rm -f tworldres.o tworld.exe
diff --git a/debian/rules b/debian/rules
index 887d9da..f4e95c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ override_dh_clean:
rm -f Makefile oshw-sdl/Makefile oshw
dh_clean
 
+override_dh_auto_configure:
+   dh_auto_configure -- --bindir=/usr/games 
--with-sharedir=/usr/share/games/tworld
+
 override_dh_auto_build:
echo \#define COMPILE_TIME \"$(BUILD_DATE)\" > comptime.h
dh_auto_build
@@ -17,6 +20,7 @@ override_dh_auto_install:
mkdir -p debian/tworld-data/usr/share/man/man6
pod2man -s 6 -r 'Tile World' -c '' debian/c4 \
debian/tworld-data/usr/share/man/man6/c4.6
+   dh_auto_install
 
 override_dh_installdocs:
dh_installdocs --link-doc=tworld-data
diff --git a/debian/tworld-data.install b/debian/tworld-data.install
index 17e5381..9e6e9d5 100644
--- a/debian/tworld-data.install
+++ b/debian/tworld-data.install
@@ -1,7 +1,2 @@
+usr/share/games/tworld
 debian/c4 usr/games
-sets/*.dac usr/share/games/tworld/sets
-data/*.dat usr/share/games/tworld/data
-res/rc usr/share/games/tworld/res
-res/*.bmp  usr/share/games/tworld/res
-res/*.txt  usr/share/games/tworld/res
-res/*.wav  usr/share/games/tworld/res
diff --git a/debian/tworld.install b/debian/tworld.install
index 3dcb0e4..0e2c0de 100644
--- a/debian/tworld.install
+++ b/debian/tworld.install
@@ -1,4 +1,4 @@
-tworld usr/games
-docs/tworld.6 usr/share/man/man6
+usr/games/tworld
+usr/share/man/man6
 debian/tworld.desktop usr/share/applications
 debian/tworld.xpm usr/share/pixmaps

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[tworld] 02/03: get rid of ancient postinst script

[Gerfried Fuchs]

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

rhonda pushed a commit to branch master
in repository tworld.

commit b457daf24471ecac8ba6d14f7f2891acdc18f18e
Author: Rhonda D'Vine 
Date:   Tue Jan 5 14:47:14 2016 +0100

get rid of ancient postinst script
---
 debian/changelog |  1 +
 debian/postinst  | 20 
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04a24c2..c994192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ tworld (1.3.2-2) unstable; urgency=medium
   * Fix reproducible issue, thanks to Chris Lamb for finding the spot to
 tweak. Closes: #792980 is about a different issue, but that one is fixed
 and the one report about reproducible build open so closing it here.
+  * Get rid of ancient postinst script from oldstable times.
 
  -- Rhonda D'Vine   Tue, 05 Jan 2016 14:23:32 +0100
 
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 6bdd28f..000
--- a/debian/postinst
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# postinst script for tworld
-# copyright 2006-2011 by Rhonda D'Vine 
-# Licenced under WTFPLv2
-
-set -e
-
-if [ "$1" != configure ]; then
-   exit 0
-fi
-
-if dpkg --compare-versions "$2" lt-nl "1.3.0-5"; then
-   if [ -d /usr/share/doc/tworld ]; then
-   if rmdir /usr/share/doc/tworld 2>/dev/null; then
-   ln -s tworld-data /usr/share/doc/tworld
-   fi
-   fi
-fi
-
-#DEBHELPER#

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[tworld] annotated tag debian/1.3.2-2 created (now 17aff47)

[Gerfried Fuchs]

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

rhonda pushed a change to annotated tag debian/1.3.2-2
in repository tworld.

at  17aff47   (tag)
   tagging  5461701ff6720ae8bb0a3219e99e5ab04bd02767 (commit)
  replaces  debian/1.3.2-1
 tagged by  Rhonda D'Vine
on  Tue Jan 5 21:06:43 2016 +0100

- Log -
Uploaded 1.3.2-2 to unstable
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCAAGBQJWjCJTAAoJEN7oBD7hfrswUGIP/2Jw3glbVITEzi+U6UPbdi6Y
uBU5022rc8rMmwj8ckiqF12W9/gHHodsncfKkmJ3b0N2aNSukbpoyt1/wJqR+9dF
oRj0B70BwMzI95P3yYvGKRBvG4+1roxS/t3nlg0DqF/t6F8Fc8n1TIPSi89i+Qcu
+RvaWLAUOk043bI8jwrCyTcjq0Tb4Wky6l/xlBbFF4CkwLD2MKZjaubcxNCKrzeI
XOjQD4Fr+Y75h7ouwe4Y2+SjGxxv1P/EACsM4L2dUNgQCpzSttiFXDOtg9J7hZZ5
8flqC44w7kxx03l0kJruMQ2dUTslNsZexqKdu0qC+bYLv/Vl4wjZMNN/lzr5fFJc
+SplUG3ZAEEfaABQPRe32Pg9XNGin8qlp3QtAJP5E58LsqaNzLSeH+nnJFIIQla5
SjPOyW3xcoOEmUyZKB4Wv4Rnap8HxYpKfKRPh2m9rUnNdjNvHSNX3JAHJaCSut78
M6vDq5rPKJ8BsRyCPhJbp/3QLXMShIK9eV0ugxOcBuatodAoTx3cjSBn1NquG1wI
UB+wMr6OKfJIhNmmaNsc/md7oGWjA43uqWkglnXu+TNDjQVUMAd2OVhszNLXV0DY
eT27DHIWKg8GonQd39ENHRgNm0sk5IeJ+lCzEcf8uUmG0YeNC47dTd+OJb1jxCMo
mswZvruVavnwXf83kesY
=qbcJ
-END PGP SIGNATURE-

Rhonda D'Vine (3):
  Fix reproducible issue
  get rid of ancient postinst script
  apply upstream supplied patch for DESTDIR support

---

No new revisions were added by this update.

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[tworld] branch master updated (db128cc -> 5461701)

[Gerfried Fuchs]

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

rhonda pushed a change to branch master
in repository tworld.

  from  db128cc   finalize
   new  57e4310   Fix reproducible issue
   new  b457daf   get rid of ancient postinst script
   new  5461701   apply upstream supplied patch for DESTDIR support

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  | 11 +++
 debian/patches/03_fix-Makefile.in | 21 ++---
 debian/postinst   | 20 
 debian/rules  | 10 ++
 debian/tworld-data.install|  7 +--
 debian/tworld.install |  4 ++--
 6 files changed, 42 insertions(+), 31 deletions(-)
 delete mode 100644 debian/postinst

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[tworld] 01/03: Fix reproducible issue

[Gerfried Fuchs]

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

rhonda pushed a commit to branch master
in repository tworld.

commit 57e43104160d3a3abd7bbf07eaf84d270f6a5c28
Author: Rhonda D'Vine 
Date:   Tue Jan 5 14:24:08 2016 +0100

Fix reproducible issue
---
 debian/changelog | 8 
 debian/rules | 6 ++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 694a804..04a24c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tworld (1.3.2-2) unstable; urgency=medium
+
+  * Fix reproducible issue, thanks to Chris Lamb for finding the spot to
+tweak. Closes: #792980 is about a different issue, but that one is fixed
+and the one report about reproducible build open so closing it here.
+
+ -- Rhonda D'Vine   Tue, 05 Jan 2016 14:23:32 +0100
+
 tworld (1.3.2-1) unstable; urgency=medium
 
   * New Upstream release (closes: #807623)
diff --git a/debian/rules b/debian/rules
index a3306d9..887d9da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+BUILD_DATE := $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
+
 %:
dh $@
 
@@ -7,6 +9,10 @@ override_dh_clean:
rm -f Makefile oshw-sdl/Makefile oshw
dh_clean
 
+override_dh_auto_build:
+   echo \#define COMPILE_TIME \"$(BUILD_DATE)\" > comptime.h
+   dh_auto_build
+
 override_dh_auto_install:
mkdir -p debian/tworld-data/usr/share/man/man6
pod2man -s 6 -r 'Tile World' -c '' debian/c4 \

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[tworld] annotated tag debian/1.3.2-1 created (now 407b71d)

[Gerfried Fuchs]

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

rhonda pushed a change to annotated tag debian/1.3.2-1
in repository tworld.

at  407b71d   (tag)
   tagging  db128cc80d8811762cee565c28d580564ed74e0e (commit)
  replaces  debian/1.3.0-6
 tagged by  Rhonda D'Vine
on  Fri Jan 1 04:03:05 2016 +0100

- Log -
Uploadead 1.3.2-1 to unstable
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCAAGBQJWhexpAAoJEN7oBD7hfrswMrYP/RggEyww0TI3r0HMJ0Sl15xa
i6a66ksWdTrTeIh1haC98pOroVPULhz+2uwh1HcH/4TkseZc2TiLzq9c6j6Zt5Q9
JjY3eUmISRR7mYRRWFk1o9iG18wCwVxd/OLk5+Rg9jyZPQmwRWWVoGcsX76GwnVH
xbj3pqAhyphGVGoZ4vMNplV5efnTLxYZapbkYMl6mhSp8ow95vWlMLVQx2uAgAuh
SxxwIM/N5itvnPRjBnnYw7LOs/IwK/AlGNq3/qhDZe8trkzWyKN45swlZ9epEmXk
UX4qFLUrjvCGvaqsgUPGLiiAxKxrqUtXySOKiqkzY0UaxymlQlKCI3SeapbE5kfc
oSgGuTId05KUwxOffoNIhqDurwdJeopUjsZcHYga8lu6bvSmEtvLjIuGrlKfIpNM
6aHCDtvL+D+33/CBpqHXZxzp3moPVn7LR4/ZkE+k17FjtA1WPRIfW9x7P/U/Y79t
6B9EzrZdenn7fiCBhq6i/7KveeEmyilL7mtND1VRzvYND3K+V6fmnqqBHfbxTbE/
E0r9TTTZ+ECN00LDaKxEQBV4j9UbFn40gRiu6kAyOb7RKG9g+slQJQUk1YKQjTt1
YJ8P5i0Xl3pYQkcr0j4MI+m+ZZ7NQWu55SfL6CQcWYelRwJv9CyhIM4UU/1zKdmK
x3Itfx78+xmPRjJ/UCD2
=58WE
-END PGP SIGNATURE-

Rhonda D'Vine (12):
  Imported Upstream version 1.3.2
  Merge tag 'upstream/1.3.2'
  New Upstream release
  Update 01_fix-manpage and refresh 02_integer-types patches
  fix version
  Source format 3.0 (quilt) and dh style debian/rules
  use dh option to create the doc symlink
  add misc:Depends to tworld-data
  Update VCS-* links
  add patch header
  name update
  finalize

---

No new revisions were added by this update.

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 02/02: The new GOG installer for The Dig doesn't include the EULA.

[Stephen Kitt]

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

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

commit a0458c5c21d9f390b5151d3761f2b32a093eb58a
Author: Stephen Kitt 
Date:   Tue Jan 5 22:51:48 2016 +0100

The new GOG installer for The Dig doesn't include the EULA.
---
 data/dig.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/dig.yaml b/data/dig.yaml
index 3c43605..a7fb4fd 100644
--- a/data/dig.yaml
+++ b/data/dig.yaml
@@ -153,7 +153,6 @@ files:
 - video/digtxt.trs?gogen
 - manual.pdf
 - refcard.pdf
-- end user license agreement.txt
 
   setup_the_dig_german_2.0.0.3.exe:
 unpack:

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] 01/02: Add English CD version of The Dig.

[Stephen Kitt]

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

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

commit 7621619158351d16a0cafb17126a8977be7c3eca
Author: Stephen Kitt 
Date:   Tue Jan 5 22:51:09 2016 +0100

Add English CD version of The Dig.
---
 data/dig.yaml| 65 
 debian/changelog |  1 +
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/data/dig.yaml b/data/dig.yaml
index f44904c..3c43605 100644
--- a/data/dig.yaml
+++ b/data/dig.yaml
@@ -19,6 +19,10 @@ packages:
 install:
 - shared assets
 - english version
+- video/digtxt.trs?en
+- video/font1.nut
+- video/font2.nut
+- video/font3.nut
 doc:
 - manual.pdf
 - refcard.pdf
@@ -33,6 +37,9 @@ packages:
 install:
 - shared assets
 - german dub
+- video/font1.nut
+- video/font2.nut
+- video/font3.nut
 doc:
 - manual.pdf
 - refcard.pdf
@@ -47,6 +54,9 @@ packages:
 install:
 - shared assets
 - spanish dub
+- video/font1.nut
+- video/font2.nut
+- video/font3.nut
 doc:
 - manual.pdf?es
 - refcard.pdf
@@ -61,6 +71,9 @@ packages:
 install:
 - shared assets
 - french dub
+- video/font1.nut
+- video/font2.nut
+- video/font3.nut
 doc:
 - manual.pdf?fr
 - refcard.pdf
@@ -75,6 +88,9 @@ packages:
 install:
 - shared assets
 - italian dub
+- video/font1.nut
+- video/font2.nut
+- video/font3.nut
 doc:
 - manual.pdf?it
 - refcard.pdf
@@ -87,12 +103,31 @@ files:
   refcard.pdf:
 look_for: [refcard.pdf,the dig - quick reference card.pdf]
 
+  video/digtxt.trs?en:
+alternatives:
+- video/digtxt.trs?gogen
+- video/digtxt.trs?cden
+  video/font1.nut:
+alternatives:
+- video/font1.nut?gog
+- video/font1.nut?cd
+  video/font2.nut:
+alternatives:
+- video/font2.nut?gog
+- video/font2.nut?cd
+  video/font3.nut:
+alternatives:
+- video/font3.nut?gog
+- video/font3.nut?cd
+
   setup_the_dig_2.0.0.3.exe:
 unpack:
   format: innoextract
 provides:
 - shared assets
+- gog fonts
 - english version
+- video/digtxt.trs?gogen
 - manual.pdf
 - refcard.pdf
 
@@ -101,7 +136,9 @@ files:
   format: deb
 provides:
 - shared assets
+- gog fonts
 - english version
+- video/digtxt.trs?gogen
 - manual.pdf
 - refcard.pdf
 - end user license agreement.txt
@@ -111,7 +148,9 @@ files:
   format: zip
 provides:
 - shared assets
+- gog fonts
 - english version
+- video/digtxt.trs?gogen
 - manual.pdf
 - refcard.pdf
 - end user license agreement.txt
@@ -121,6 +160,7 @@ files:
   format: innoextract
 provides:
 - shared assets
+- gog fonts
 - german dub
 - manual.pdf
 - refcard.pdf
@@ -130,6 +170,7 @@ files:
   format: deb
 provides:
 - shared assets
+- gog fonts
 - german dub
 - manual.pdf
 - refcard.pdf
@@ -143,6 +184,7 @@ files:
   format: innoextract
 provides:
 - shared assets
+- gog fonts
 - spanish dub
 - manual.pdf?es
 - refcard.pdf
@@ -152,6 +194,7 @@ files:
   format: deb
 provides:
 - shared assets
+- gog fonts
 - spanish dub
 - manual.pdf?es
 - refcard.pdf
@@ -165,6 +208,7 @@ files:
   format: innoextract
 provides:
 - shared assets
+- gog fonts
 - french dub
 - manual.pdf?fr
 - refcard.pdf
@@ -174,6 +218,7 @@ files:
   format: deb
 provides:
 - shared assets
+- gog fonts
 - french dub
 - manual.pdf?fr
 - refcard.pdf
@@ -187,6 +232,7 @@ files:
   format: innoextract
 provides:
 - shared assets
+- gog fonts
 - italian dub
 - manual.pdf?it
 - refcard.pdf
@@ -196,6 +242,7 @@ files:
   format: deb
 provides:
 - shared assets
+- gog fonts
 - italian dub
 - manual.pdf?it
 - refcard.pdf
@@ -210,9 +257,6 @@ groups:
   3666166   ef0992dad809d4fe2e69b4dd9c0f6bce video/asttun.san
   4458916   158b3f10bcf51e7ec8eed118d171822b video/darkcave.san
   34738 339268c9c839b4bb3094d3aaf34827d8 video/font0.nut
-  28302 48efaacc7be8886a0f13125477e04d98 video/font1.nut
-  28302 48efaacc7be8886a0f13125477e04d98 video/font2.nut
-  28302 48efaacc7be8886a0f13125477e04d98 video/font3.nut
   1133070   c58ba44c2b76d9dc10a6ccfc73df4f2e video/m1.san
   1048844   67835ca2d504370232281f77d6cf6d00 video/m2.san
   1247242   ed56452de0059706ed30eb31d6874878 video/nexuspan.san
@@ -255,7 +299,6 @@ groups:
 
  english version: |
   130123511 beb6d64ccf146f82a26a1ab65a4c4b13 digvoice.bun
-  10723 951c8cfc1089724c63e2433e8682a476 video/digtxt.trs
   50124786  aeffce448ef3193110dab71d7cc27c15 video/sq1.san
   17759462  2bd8d22069743c996281bd5aa4c33040 video/sq2.san
   12073682  eca489a95b8ef9ef71073811d085fe9b video/sq3.san
@@ 

[game-data-packager] 01/01: fedora: fix little refactor glitches

[Alexandre Detiste]

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

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

commit 2e17d7c0431967b8ef97e3623a51d01be798ec26
Author: Alexandre Detiste 
Date:   Tue Jan 5 14:29:18 2016 +0100

fedora: fix little refactor glitches
---
 game_data_packager/packaging/rpm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/game_data_packager/packaging/rpm.py 
b/game_data_packager/packaging/rpm.py
index 929992a..85758f8 100644
--- a/game_data_packager/packaging/rpm.py
+++ b/game_data_packager/packaging/rpm.py
@@ -63,7 +63,7 @@ class RpmPackaging(PackagingSystem):
 
 class DnfPackaging(RpmPackaging):
 def __init__(self):
-self.__available = None
+self.available = None
 
 def is_available(self, package):
 if self.available is None:
@@ -124,10 +124,10 @@ class ZypperPackaging(RpmPackaging):
 
 def get_distro_packaging():
 if os.path.isfile('/etc/redhat-release'):
-return ZypperPackaging()
+return DnfPackaging()
 
 if os.path.isfile('/etc/SuSE-release'):
-return DnfPackaging()
+return ZypperPackaging()
 
 try:
 maybe = DnfPackaging()

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[game-data-packager] branch master updated (fac00a0 -> 2e17d7c)

[Alexandre Detiste]

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

detiste-guest pushed a change to branch master
in repository game-data-packager.

  from  fac00a0   Remove now-unused variables
   new  2e17d7c   fedora: fix little refactor glitches

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 game_data_packager/packaging/rpm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] branch master updated (1d5813f -> 7daf4d0)

[Markus Koschany]

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

apo-guest pushed a change to branch master
in repository empire.

  from  1d5813f   Update clean target.
   new  dc684ea   Add get-orig-source target.
   new  88c1516   Imported Upstream version 1.14
   new  5852e00   Merge tag 'upstream/1.14'
   new  f6789ed   Vcs-Browser: Use https.
   new  d584def   Update my e-mail address.
   new  7daf4d0   Update changelog

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile |  5 -
 NEWS | 15 -
 attack.c |  5 +++--
 compmove.c   | 36 +++
 control  | 14 -
 debian/changelog |  9 
 debian/control   |  4 ++--
 debian/copyright |  4 ++--
 debian/rules |  3 +++
 display.c|  6 +++---
 edit.c   | 20 ++
 empire.6 | 12 ++-
 empire.c |  2 +-
 game.c   | 32 ++--
 map.c|  4 ++--
 object.c | 25 +-
 term.c   |  8 +++
 usermove.c   | 64 +++-
 util.c   |  8 ---
 vms-empire.xml   |  4 +++-
 20 files changed, 160 insertions(+), 120 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] 02/06: Imported Upstream version 1.14

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository empire.

commit 88c15160ae404f68ed1abb60c984f3a9ca2f7068
Author: Markus Koschany 
Date:   Tue Jan 5 13:12:59 2016 +0100

Imported Upstream version 1.14
---
 Makefile   |  5 -
 NEWS   | 15 +-
 attack.c   |  5 +++--
 compmove.c | 36 -
 control| 14 -
 display.c  |  6 +++---
 edit.c | 20 +-
 empire.6   | 12 ++-
 empire.c   |  2 +-
 game.c | 32 +++--
 map.c  |  4 ++--
 object.c   | 25 +--
 term.c |  8 +++-
 usermove.c | 64 --
 util.c |  8 +---
 vms-empire.xml |  4 +++-
 16 files changed, 144 insertions(+), 116 deletions(-)

diff --git a/Makefile b/Makefile
index 8158eb7..966604a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the file COPYING, distributed with empire, for restriction
 # and warranty information.
 
-VERS=1.13
+VERS=1.14
 
 # Use -g to compile the program for debugging.
 #DEBUG = -g -DDEBUG
@@ -128,3 +128,6 @@ dist: vms-empire-$(VERS).tar.gz
 
 release: vms-empire-$(VERS).tar.gz vms-empire.html
shipper version=$(VERS) | sh -e -x
+
+refresh: vms-empire.html
+   shipper -N -w version=$(VERS) | sh -e -x
diff --git a/NEWS b/NEWS
index 566c8a5..759412f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,24 +1,29 @@
vms-empire news
 
-1.13: 2014-12-14:
+1.14: 2016-01-05 06:49:17Z
+Add an identifying magic cookie and version to save files.
+Full ANSI prototypes for private functions as well as public.
+   Markup fix for probability table.
+
+1.13: 2014-12-14T17:06:26Z
Comment on entry to and exit from edit mode.
Cleaned up packaging and install/uninstall productions.
 
-1.12: 2014-05-20:
+1.12: 2014-05-20T09:03:09Z
Incorporated Dennis Pinckard's fix for a Mac OS/X port bug.
Added desktop file.
 
-1.11: 2013-12-31T17:28:06
+1.11: 2013-12-31T17:31:04Z
Clean up code to modern C, apply cppcheck.
Fix code typo reported as Debian bug #593434
 
-1.10: 2013-08-22T23:46:03
+1.10: 2013-08-22T23:47:21Z
Fix core dump when a satellite bounced off the world edge.
Full ANSIfication of function prototypes (which fixed the 
sat bug - the code appears to have been tickling some obscure
bug in the compilation of function calls with K prototypes).
 
-1.9: 2012-02-16T02:49:47
+1.9: 2012-02-16T22:59:22Z
Drop RPM packaging. Documentation cleanups.
 
 1.8: 2010-10-21T12:47:33Z
diff --git a/attack.c b/attack.c
index e313187..d17895e 100644
--- a/attack.c
+++ b/attack.c
@@ -79,8 +79,9 @@ First we have to figure out what is being attacked.
 void
 attack_obj(piece_info_t *att_obj, loc_t loc)
 {
-void describe(), survive();
-   
+void describe(piece_info_t *, piece_info_t *, loc_t);
+void survive(piece_info_t *, loc_t);
+
 piece_info_t *def_obj; /* defender */
 int owner;
 
diff --git a/compmove.c b/compmove.c
index 6aa588d..eeb5949 100644
--- a/compmove.c
+++ b/compmove.c
@@ -34,7 +34,7 @@ void comp_prod(city_info_t *, bool);
 void
 comp_move(int nmoves) 
 {
-void do_cities(), do_pieces(), check_endgame();
+void do_cities(void), do_pieces(void), check_endgame(void);
 
 int i;
 piece_info_t *obj;
@@ -366,7 +366,7 @@ static path_map_t path_map[MAP_SIZE];
 void
 do_pieces(void) 
 {
-void cpiece_move();
+void cpiece_move(piece_info_t *);
 
 int i;
 piece_info_t *obj, *next_obj;
@@ -389,12 +389,10 @@ objective.
 void
 cpiece_move(piece_info_t *obj)
 {
-void move1();
+void move1(piece_info_t *);
 
 bool changed_loc;
 int max_hits;
-loc_t saved_loc;
-city_info_t *cityp;
 
 if (obj->type == SATELLITE) {
move_sat (obj);
@@ -406,11 +404,12 @@ cpiece_move(piece_info_t *obj)
 max_hits = piece_attr[obj->type].max_hits;
 
 if (obj->type == FIGHTER) { /* init fighter range */
-   cityp = find_city (obj->loc);
+   city_info_t *cityp = find_city (obj->loc);
if (cityp != NULL) obj->range = piece_attr[FIGHTER].range;
 }

 while (obj->moved < obj_moves (obj)) {
+   loc_t saved_loc;
saved_loc = obj->loc; /* remember starting location */
move1 (obj);
if (saved_loc != obj->loc) changed_loc = true;
@@ -441,7 +440,8 @@ Move a piece one square.
 void
 move1(piece_info_t *obj)
 {
-void army_move(), transport_move(), fighter_move(), ship_move();
+void army_move(piece_info_t *), transport_move(piece_info_t *);
+void fighter_move(piece_info_t *), ship_move(piece_info_t *);
 
 switch (obj->type) {
 case ARMY: army_move (obj); break;
@@ -483,10 +483,12 @@ destination.  (If there is no destination, sit around and 
wait.)
 void
 

[empire] 01/06: Add get-orig-source target.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository empire.

commit dc684ea6d71cdf80a187efc734fe0383289ccd94
Author: Markus Koschany 
Date:   Tue Jan 5 13:12:16 2016 +0100

Add get-orig-source target.
---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index c3d2aaf..8ef878e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,6 @@ override_dh_install:
 
 override_dh_auto_clean:
$(RM) *.o empire vms-empire.xpm
+
+get-orig-source:
+   uscan --verbose --download-current-version --force-download

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] 04/06: Vcs-Browser: Use https.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository empire.

commit f6789ede4b6f7b86554bcc26e8284d250a8ed56f
Author: Markus Koschany 
Date:   Tue Jan 5 13:14:16 2016 +0100

Vcs-Browser: Use https.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 2a78a1a..32018ee 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
 Standards-Version: 3.9.6
 Homepage: http://www.catb.org/~esr/vms-empire/
 Vcs-Git: git://anonscm.debian.org/pkg-games/empire.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-games/empire.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/empire.git
 
 Package: empire
 Architecture: any

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] 05/06: Update my e-mail address.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository empire.

commit d584def9bd1535aa0f906be3359e4a510f989def
Author: Markus Koschany 
Date:   Tue Jan 5 13:15:02 2016 +0100

Update my e-mail address.
---
 debian/control   | 2 +-
 debian/copyright | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 32018ee..87d0646 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team 
 Uploaders:
- Markus Koschany 
+ Markus Koschany 
 Build-Depends:
  debhelper (>=9),
  imagemagick,
diff --git a/debian/copyright b/debian/copyright
index 7cfe97a..74d2b9f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Source: http://www.catb.org/~esr/vms-empire/
 
 Files: *
 Copyright: 1987,1988, Chuck Simmons 
-   1994-2014, Eric S. Raymond 
+   1994-2016, Eric S. Raymond 
 License: GPL-2
 
 Files: debian/*
 Copyright: 2000-2006, Peter Palfrader 
-   2014,  Markus Koschany 
+   2014-2016, Markus Koschany 
 License: GPL-2
 
 License: GPL-2

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] annotated tag upstream/1.14 created (now 26d3e53)

[Markus Koschany]

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

apo-guest pushed a change to annotated tag upstream/1.14
in repository empire.

at  26d3e53   (tag)
   tagging  88c15160ae404f68ed1abb60c984f3a9ca2f7068 (commit)
  replaces  upstream/1.13
 tagged by  Markus Koschany
on  Tue Jan 5 13:13:00 2016 +0100

- Log -
Upstream version 1.14
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQJ8BAABCgBmBQJWi7NMXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQ0YzRDA4OEVGMzJFREVGNkExQTgzNUZE
OUFEMTRCOTUxM0I1MUU0AAoJENmtFLlRO1Hk8RUP+wSGUDi383Uwdmj35wjvdflm
TY05EB7qSTHXl3HrW1gSOpjQN2+SU3u+JGCuokfB+/NaMNxiwp0/EQ6UVFqvQt6p
cFVpKRAjDn78x+a4Ey+YWLY3DJr/2UfxSDD4R0CBotAeYzUzJ2h6mY7d3kTpRKUS
CCbK5mAK416PiIBL5SMzRZ9QMC6tIkc84w0aYqJn4XAcTnacKNFyrSUUh85Odtjs
fVwVcLVsWr6RWo3SrT4tO/WcPV/pXbRZxswgH0JcaII11EMKrXSm9Gn55Q6lwjmM
FwetpLpfZU1Bh5kdNVNz4D/b8Sws9RUFQ4lgLvaJLfGSZTeyTafJxlrqeGLSSOL/
QXeVaq/3iFEWwDzRMnZnAN8gKvmJGtb8xHenSAaxzoWB3/5jjPc4kwhUyJJuv59J
GqpDsIlLuP2KWVw62UWsP2evLhMoPhRueem3iWZgL5naGo/SR8WqI2zjREH23h08
3hoGtKOfJ3cRlP8umg72asLZytzgf6C/eG/AknGrdlUmZA5SsWh8fHfe7Zqa76US
qgv0bjZ+3QezPVIK4qljRG5aMbNVeyq+k42593yi54Sh+WcSlXXeJwX3NFgj+Jzp
oM0C1HOvC6ziqjTT8YYn22umW/C1achh30PVgdPFQl/b00gNdJAKKBo9cm8ogONK
4YO1nF3ToKOf0mDWi2W5
=4mYS
-END PGP SIGNATURE-

Markus Koschany (1):
  Imported Upstream version 1.14

---

This annotated tag includes the following new commits:

   new  88c1516   Imported Upstream version 1.14

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] branch pristine-tar updated (1f4d43d -> 72c9a59)

[Markus Koschany]

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

apo-guest pushed a change to branch pristine-tar
in repository empire.

  from  1f4d43d   pristine-tar data for empire_1.13.orig.tar.gz
   new  72c9a59   pristine-tar data for empire_1.14.orig.tar.gz

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 empire_1.14.orig.tar.gz.delta | Bin 0 -> 1529 bytes
 empire_1.14.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 empire_1.14.orig.tar.gz.delta
 create mode 100644 empire_1.14.orig.tar.gz.id

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] branch upstream updated (4d65c56 -> 88c1516)

[Markus Koschany]

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

apo-guest pushed a change to branch upstream
in repository empire.

  from  4d65c56   Imported Upstream version 1.13
   new  88c1516   Imported Upstream version 1.14

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile   |  5 -
 NEWS   | 15 +-
 attack.c   |  5 +++--
 compmove.c | 36 -
 control| 14 -
 display.c  |  6 +++---
 edit.c | 20 +-
 empire.6   | 12 ++-
 empire.c   |  2 +-
 game.c | 32 +++--
 map.c  |  4 ++--
 object.c   | 25 +--
 term.c |  8 +++-
 usermove.c | 64 --
 util.c |  8 +---
 vms-empire.xml |  4 +++-
 16 files changed, 144 insertions(+), 116 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] 01/01: pristine-tar data for empire_1.14.orig.tar.gz

[Markus Koschany]

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

apo-guest pushed a commit to branch pristine-tar
in repository empire.

commit 72c9a592304e052ed47ad0597681a9d2a826e89f
Author: Markus Koschany 
Date:   Tue Jan 5 13:13:00 2016 +0100

pristine-tar data for empire_1.14.orig.tar.gz
---
 empire_1.14.orig.tar.gz.delta | Bin 0 -> 1529 bytes
 empire_1.14.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/empire_1.14.orig.tar.gz.delta b/empire_1.14.orig.tar.gz.delta
new file mode 100644
index 000..d00be14
Binary files /dev/null and b/empire_1.14.orig.tar.gz.delta differ
diff --git a/empire_1.14.orig.tar.gz.id b/empire_1.14.orig.tar.gz.id
new file mode 100644
index 000..854d153
--- /dev/null
+++ b/empire_1.14.orig.tar.gz.id
@@ -0,0 +1 @@
+317d244a4568d19e8c0bd347da8e2151f8604e5d

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] 06/06: Update changelog

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository empire.

commit 7daf4d02d3e870cac4a70cbf0b41259c24f6c088
Author: Markus Koschany 
Date:   Tue Jan 5 13:16:31 2016 +0100

Update changelog
---
 debian/changelog | 9 +
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 80da313..818300c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+empire (1.14-1) unstable; urgency=medium
+
+  * Imported Upstream version 1.14. (Closes: #809992)
+  * Add get-orig-source target.
+  * Vcs-Browser: Use https.
+  * Update my e-mail address.
+
+ -- Markus Koschany   Tue, 05 Jan 2016 13:16:05 +0100
+
 empire (1.13-1) unstable; urgency=medium
 
   * Imported Upstream version 1.13.

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] 03/06: Merge tag 'upstream/1.14'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository empire.

commit 5852e00520e3fe4e357d13298f2d2c3d4693ce43
Merge: dc684ea 88c1516
Author: Markus Koschany 
Date:   Tue Jan 5 13:13:04 2016 +0100

Merge tag 'upstream/1.14'

Upstream version 1.14

# gpg: Signature made Tue 05 Jan 2016 13:13:00 CET using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany " [ultimate]
# gpg: aka "Markus Koschany " 
[ultimate]
# gpg: aka "Markus Koschany " [ultimate]

 Makefile   |  5 -
 NEWS   | 15 +-
 attack.c   |  5 +++--
 compmove.c | 36 -
 control| 14 -
 display.c  |  6 +++---
 edit.c | 20 +-
 empire.6   | 12 ++-
 empire.c   |  2 +-
 game.c | 32 +++--
 map.c  |  4 ++--
 object.c   | 25 +--
 term.c |  8 +++-
 usermove.c | 64 --
 util.c |  8 +---
 vms-empire.xml |  4 +++-
 16 files changed, 144 insertions(+), 116 deletions(-)

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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[empire] annotated tag debian/1.14-1 created (now 9f93763)

[Markus Koschany]

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

apo-guest pushed a change to annotated tag debian/1.14-1
in repository empire.

at  9f93763   (tag)
   tagging  7daf4d02d3e870cac4a70cbf0b41259c24f6c088 (commit)
  replaces  debian/1.13-1
 tagged by  Markus Koschany
on  Tue Jan 5 13:32:39 2016 +0100

- Log -
Debian release 1.14-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQJ8BAABCgBmBQJWi7fuXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQ0YzRDA4OEVGMzJFREVGNkExQTgzNUZE
OUFEMTRCOTUxM0I1MUU0AAoJENmtFLlRO1Hk3nIP/j9cIUMmnv2GxKZdDmuApEwC
0oP9Dw9q5hoisxueCDLpz8FQFfREbKvSqcQ32rt+3H4NUrTmhM1u5QvUfe0bflzA
KgPVAdtoAOOCvEZYjw3CbGPYPjfAFlU2MLlPxjqi2SxuTF/T4UlQDtPTRnMixD29
AY6C4CfUL9lhu6cMIVPYNA8VvIKY3HYz1EA0PaL1DERB0BfTatrW8/Htl0LuL4dX
lgWRXgkN6547jOMmDrsX1ZAnB2OZKoFwPKNcKIzaaqCwBG8vcBq7GjhsV3/iE6ki
k70TGfife1SkCu6/iWWVtv/R5Sgi5tXCRlGIc0vv5uvSeZXnpeKQiivcj2Q68/9y
SeZZ9BMnD3tz+mt3+JnDbAzYUWMblju6MhYqKMSCmkYzNfLHkxyDygGP1Dws6yRq
YMU0TMXw2yQfVUTfrmmcB++1CgVbBCIoRw0cHvdAgH2DyKU+pMu/LuRcjtgvqHFr
FvGjhAK0UNhbZWn67XY+7lHdF7ISbt/fXTy56/ra8hGLUWyVdX/8E0TgjbH9j0TW
IBsbXzUolCDXnHBvQE2ObOCLsfPOGoJNqr53FXgxPThu2UhrvRxON7nMIwnYlZzr
T0VmV4YOEBZO63guUSHwWD9Yijs64/OVRdmA1aXut4iKhAqn44gTl5c5VyMDroBK
jrckA9G8BpGvpNYD55Ki
=B4rJ
-END PGP SIGNATURE-

Markus Koschany (6):
  Add get-orig-source target.
  Imported Upstream version 1.14
  Merge tag 'upstream/1.14'
  Vcs-Browser: Use https.
  Update my e-mail address.
  Update changelog

---

This annotated tag includes the following new commits:

   new  dc684ea   Add get-orig-source target.
   new  88c1516   Imported Upstream version 1.14
   new  5852e00   Merge tag 'upstream/1.14'
   new  f6789ed   Vcs-Browser: Use https.
   new  d584def   Update my e-mail address.
   new  7daf4d0   Update changelog

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits