[cytadela] branch master updated (7a315bc -> 7e4cc1b)

[Sylvain Beucler]

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

beuc pushed a change to branch master
in repository cytadela.

  from  7a315bc   README.source: more precisions
   new  7e4cc1b   Stop using dh_installdocs --link-doc + tidy packaging

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:
 debian/README.source |  4 +++-
 debian/changelog | 10 ++
 debian/control   |  6 +++---
 debian/{cytadela-data.docs => cytadela.docs} |  0
 debian/cytadela.maintscript  |  2 ++
 debian/rules | 10 +++---
 6 files changed, 21 insertions(+), 11 deletions(-)
 rename debian/{cytadela-data.docs => cytadela.docs} (100%)
 create mode 100644 debian/cytadela.maintscript

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/cytadela.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

[cytadela] annotated tag debian/1.1.0-3 created (now f18963b)

[Sylvain Beucler]

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

beuc pushed a change to annotated tag debian/1.1.0-3
in repository cytadela.

at  f18963b   (tag)
   tagging  7e4cc1b021d55fb3ea64223fb57b598c131d8abe (commit)
  replaces  debian/1.1.0-2
 tagged by  Sylvain Beucler
on  Sun Apr 9 18:39:59 2017 +0200

- Log -
cytadela Debian release 1.1.0-3

Sylvain Beucler (2):
  README.source: more precisions
  Stop using dh_installdocs --link-doc + tidy packaging

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/cytadela.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

[ballz] branch pristine-tar updated (4dbc94d - 4083ee4)

[Sylvain Beucler]

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

beuc pushed a change to branch pristine-tar
in repository ballz.

  from  4dbc94d   pristine-tar data for ballz_1.0.2.orig.tar.gz
   new  4083ee4   pristine-tar data for ballz_1.0.3.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:
 ballz_1.0.3.orig.tar.gz.delta | Bin 0 - 8458 bytes
 ballz_1.0.3.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 ballz_1.0.3.orig.tar.gz.delta
 create mode 100644 ballz_1.0.3.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] 03/05: Imported Upstream version 1.0.3

[Sylvain Beucler]

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

beuc pushed a commit to branch master
in repository ballz.

commit f81a45c778dcaead33a330811209f01ecac4b86d
Author: Sylvain Beucler b...@beuc.net
Date:   Mon Jul 27 23:24:27 2015 +0200

Imported Upstream version 1.0.3

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] 01/01: pristine-tar data for ballz_1.0.3.orig.tar.gz

[Sylvain Beucler]

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

beuc pushed a commit to branch pristine-tar
in repository ballz.

commit 4083ee41ea02822d27a15759f573a51fc95b54a8
Author: Sylvain Beucler b...@beuc.net
Date:   Mon Jul 27 23:24:27 2015 +0200

pristine-tar data for ballz_1.0.3.orig.tar.gz
---
 ballz_1.0.3.orig.tar.gz.delta | Bin 0 - 8458 bytes
 ballz_1.0.3.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ballz_1.0.3.orig.tar.gz.delta b/ballz_1.0.3.orig.tar.gz.delta
new file mode 100644
index 000..98b6414
Binary files /dev/null and b/ballz_1.0.3.orig.tar.gz.delta differ
diff --git a/ballz_1.0.3.orig.tar.gz.id b/ballz_1.0.3.orig.tar.gz.id
new file mode 100644
index 000..1dae273
--- /dev/null
+++ b/ballz_1.0.3.orig.tar.gz.id
@@ -0,0 +1 @@
+86493b977202e774ac2fb36c5485ed9b7d4f6d7c

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] annotated tag upstream/1.0.3 created (now 1a23dec)

[Sylvain Beucler]

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

beuc pushed a change to annotated tag upstream/1.0.3
in repository ballz.

at  1a23dec   (tag)
   tagging  f81a45c778dcaead33a330811209f01ecac4b86d (commit)
  replaces  upstream/1.0.2
 tagged by  Sylvain Beucler
on  Mon Jul 27 23:24:27 2015 +0200

- Log -
Upstream version 1.0.3

Sylvain Beucler (2):
  Imported Upstream version 1.0.3
  Imported Upstream version 1.0.3

toto (1):
  Imported Upstream version 1.0.3

---

This annotated tag includes the following new commits:

   new  62f980e   Imported Upstream version 1.0.3
   new  dc353ff   Imported Upstream version 1.0.3
   new  f81a45c   Imported Upstream version 1.0.3

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.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] 05/05: New upstream release

[Sylvain Beucler]

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

beuc pushed a commit to branch master
in repository ballz.

commit fbee7e3060c0775f3e5392a64d6aeedc65f7f307
Author: Sylvain Beucler b...@beuc.net
Date:   Mon Jul 27 23:24:54 2015 +0200

New upstream release
---
 debian/changelog | 10 ++
 debian/compat|  2 +-
 debian/control   | 10 +-
 debian/watch |  2 --
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 128224e..29c4aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ballz (1.0.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards to 3.9.6 (no changes)
+  * Bump compat to 9 to address lintian 'hardening-no-relro'
+  * Canonicalize Vcs-* fields (fixes 'vcs-field-not-canonical')
+  * Removed 'watch' file following upstream move to pristine-tar
+
+ -- Sylvain Beucler b...@debian.org  Mon, 27 Jul 2015 22:33:59 +0200
+
 ballz (1.0.2-1) unstable; urgency=low
 
   [ Sylvain Beucler ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index a613e76..aa3dc1a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: debhelper (= 8), autotools-dev (= 20100122.1), 
libguichan-dev, libdumb1-dev, libaldmb1-dev
-Standards-Version: 3.9.2
-Homepage: http://www.allegro.cc/forums/thread/590831
-Vcs-Git: git://git.debian.org/git/pkg-games/ballz.git
-Vcs-Browser: http://git.debian.org/?p=pkg-games/ballz.git
+Build-Depends: debhelper (= 9), autotools-dev, libguichan-dev, libdumb1-dev, 
libaldmb1-dev
+Standards-Version: 3.9.6
+Homepage: https://gitlab.com/groups/ballz
+Vcs-Git: git://anonscm.debian.org/git/pkg-games/ballz.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/ballz.git
 
 Package: ballz
 Architecture: any
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 1b4cc1d..000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://code.google.com/p/db-tins07/downloads/list 
http://db-tins07\.googlecode\.com/files/ballz-(.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] 04/05: Merge tag 'upstream/1.0.3'

[Sylvain Beucler]

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

beuc pushed a commit to branch master
in repository ballz.

commit ee225531c66be76ce35b9607e508858851229fd8
Merge: aa6c912 f81a45c
Author: Sylvain Beucler b...@beuc.net
Date:   Mon Jul 27 23:24:27 2015 +0200

Merge tag 'upstream/1.0.3'

Upstream version 1.0.3

 ChangeLog |  10 +
 INSTALL   | 374 ++-
 Makefile.am   |   7 +-
 Makefile.in   | 403 +++-
 README|   5 +-
 aclocal.m4| 889 +-
 acsite.m4 | 192 ++
 autogen.sh|  21 -
 autotools/compile | 347 ++
 config.guess = autotools/config.guess| 560 +++-
 config.sub = autotools/config.sub| 305 +
 depcomp = autotools/depcomp  | 531 +--
 autotools/install-sh  | 527 +++
 autotools/missing | 215 +++
 bootstrap |  37 ++
 configure | 751 ++
 configure.ac  |  14 +-
 data/Makefile.in  | 141 +++-
 desktop/Makefile.am   |  12 -
 desktop/ballz.png | Bin 841 - 0 bytes
 install-sh| 251 
 missing   | 265 
 mkinstalldirs |  40 --
 share/Makefile.am |  16 +
 {desktop = share}/Makefile.in| 131 +++-
 share/appdata/ballz.appdata.xml   |  26 +
 {desktop = share/applications}/ballz.desktop |   0
 share/pixmaps/ballz.png   | Bin 0 - 1505 bytes
 src/Makefile.am   |   2 +-
 src/Makefile.in   | 391 ++-
 30 files changed, 4142 insertions(+), 2321 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] branch master updated (aa6c912 - fbee7e3)

[Sylvain Beucler]

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

beuc pushed a change to branch master
in repository ballz.

  from  aa6c912   Ready for pushing
   new  62f980e   Imported Upstream version 1.0.3
   new  dc353ff   Imported Upstream version 1.0.3
   new  f81a45c   Imported Upstream version 1.0.3
   new  ee22553   Merge tag 'upstream/1.0.3'
   new  fbee7e3   New upstream release

The 5 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:
 ChangeLog |  10 +
 INSTALL   | 374 ++-
 Makefile.am   |   7 +-
 Makefile.in   | 403 +++-
 README|   5 +-
 aclocal.m4| 889 +-
 acsite.m4 | 192 ++
 autogen.sh|  21 -
 autotools/compile | 347 ++
 config.guess = autotools/config.guess| 560 +++-
 config.sub = autotools/config.sub| 305 +
 depcomp = autotools/depcomp  | 531 +--
 autotools/install-sh  | 527 +++
 autotools/missing | 215 +++
 bootstrap |  37 ++
 configure | 751 ++
 configure.ac  |  14 +-
 data/Makefile.in  | 141 +++-
 debian/changelog  |  10 +
 debian/compat |   2 +-
 debian/control|  10 +-
 debian/watch  |   2 -
 desktop/Makefile.am   |  12 -
 desktop/ballz.png | Bin 841 - 0 bytes
 install-sh| 251 
 missing   | 265 
 mkinstalldirs |  40 --
 share/Makefile.am |  16 +
 {desktop = share}/Makefile.in| 131 +++-
 share/appdata/ballz.appdata.xml   |  26 +
 {desktop = share/applications}/ballz.desktop |   0
 share/pixmaps/ballz.png   | Bin 0 - 1505 bytes
 src/Makefile.am   |   2 +-
 src/Makefile.in   | 391 ++-
 34 files changed, 4158 insertions(+), 2329 deletions(-)
 create mode 100644 acsite.m4
 delete mode 100755 autogen.sh
 create mode 100755 autotools/compile
 rename config.guess = autotools/config.guess (77%)
 rename config.sub = autotools/config.sub (86%)
 rename depcomp = autotools/depcomp (50%)
 create mode 100755 autotools/install-sh
 create mode 100755 autotools/missing
 create mode 100755 bootstrap
 delete mode 100644 debian/watch
 delete mode 100644 desktop/Makefile.am
 delete mode 100644 desktop/ballz.png
 delete mode 100644 install-sh
 delete mode 100644 missing
 delete mode 100644 mkinstalldirs
 create mode 100644 share/Makefile.am
 rename {desktop = share}/Makefile.in (68%)
 create mode 100644 share/appdata/ballz.appdata.xml
 rename {desktop = share/applications}/ballz.desktop (100%)
 create mode 100644 share/pixmaps/ballz.png

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[ballz] annotated tag debian/1.0.3-1 created (now ec62796)

[Sylvain Beucler]

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

beuc pushed a change to annotated tag debian/1.0.3-1
in repository ballz.

at  ec62796   (tag)
   tagging  fbee7e3060c0775f3e5392a64d6aeedc65f7f307 (commit)
  replaces  debian/1.0.2-1
 tagged by  Sylvain Beucler
on  Mon Jul 27 23:55:04 2015 +0200

- Log -
ballz Debian release 1.0.3-1

Sylvain Beucler (4):
  Imported Upstream version 1.0.3
  Imported Upstream version 1.0.3
  Merge tag 'upstream/1.0.3'
  New upstream release

toto (1):
  Imported Upstream version 1.0.3

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ballz.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

[gargoyle-free] 04/04: Bump standards to 3.9.6 (no changes)

[Sylvain Beucler]

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

beuc pushed a commit to branch master
in repository gargoyle-free.

commit a80c051be39ebea6cb6304aacf629dd663f0bc6b
Author: Sylvain Beucler sylvain.beuc...@inria.fr
Date:   Wed Jul 15 14:46:41 2015 +0200

Bump standards to 3.9.6 (no changes)
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 30210e2..b773dfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ gargoyle-free (2011.1a-3) unstable; urgency=medium
 
   [ Sylvain Beucler ]
   * Replace Matthias' patch with finer one from upstream tracker
+  * Bump standards to 3.9.6 (no changes)
 
  -- Sylvain Beucler b...@debian.org  Wed, 15 Jul 2015 14:12:02 +0200
 
diff --git a/debian/control b/debian/control
index b6a7089..9966ce8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
 Build-Depends: quilt, debhelper (= 9), jam, libgtk2.0-dev, libpng-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev, pkg-config
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://anonscm.debian.org/pkg-games/gargoyle-free.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/gargoyle-free.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/gargoyle-free.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

[gargoyle-free] 02/04: Apply GCC-5 fix from upstream tracker

[Sylvain Beucler]

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

beuc pushed a commit to branch master
in repository gargoyle-free.

commit 3b44ccee599416d3411d52bf548d1797bb170e78
Author: Sylvain Beucler sylvain.beuc...@inria.fr
Date:   Wed Jul 15 14:26:28 2015 +0200

Apply GCC-5 fix from upstream tracker
---
 debian/patches/gcc-5.patch | 18 ++
 debian/patches/series  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/gcc-5.patch b/debian/patches/gcc-5.patch
new file mode 100644
index 000..0a9658b
--- /dev/null
+++ b/debian/patches/gcc-5.patch
@@ -0,0 +1,18 @@
+Description: compile with GCC 5
+Forwarded: https://github.com/garglk/garglk/pull/217
+Author: aaronbpa...@gmail.com
+Last-Update: 2015-07-15
+
+Index: gargoyle-free/terps/Jamfile
+===
+--- gargoyle-free.orig/terps/Jamfile
 gargoyle-free/terps/Jamfile
+@@ -395,7 +395,7 @@ if $(MAKE_NITFOL) = yes
+ SubDir TOP terps nitfol ;
+ ObjDir nitfol ;
+ 
+-SubDirCcFlags -DSMART_TOKENISER -DDEBUGGING -DFAST -DUSE_INLINE -DNO_TICK 
;
++SubDirCcFlags -fgnu89-inline -DSMART_TOKENISER -DDEBUGGING -DFAST 
-DUSE_INLINE -DNO_TICK ;
+ 
+ Main $(GARGLKPRE)nitfol : 
+ automap.c solve.c infix.c copying.c debug.c inform.c quetzal.c
diff --git a/debian/patches/series b/debian/patches/series
index 1d8fd8a..585230f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ desktop_menu_entry_crs.patch
 desktop_menu_entry.patch
 fhs_locate_private_binaries.patch
 librt.patch
+gcc-5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/gargoyle-free.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

[gargoyle-free] 01/04: Build-depend on libpng-dev instead of libpng12-dev (fix from doko)

[Sylvain Beucler]

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

beuc pushed a commit to branch master
in repository gargoyle-free.

commit 464bdeccea01da66915bf08ea834aa864acbd918
Author: Sylvain Beucler sylvain.beuc...@inria.fr
Date:   Wed Jul 15 14:16:33 2015 +0200

Build-depend on libpng-dev instead of libpng12-dev (fix from doko)
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ef26dbf..b6a7089 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: quilt, debhelper (= 9), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev, pkg-config
+Build-Depends: quilt, debhelper (= 9), jam, libgtk2.0-dev, libpng-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev, pkg-config
 Standards-Version: 3.9.4
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://anonscm.debian.org/pkg-games/gargoyle-free.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/gargoyle-free.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

[gargoyle-free] branch master updated (e9fc3ee - a80c051)

[Sylvain Beucler]

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

beuc pushed a change to branch master
in repository gargoyle-free.

  from  e9fc3ee   debian/TODO: Alan 2 is included since 2011.1a-1
   new  464bdec   Build-depend on libpng-dev instead of libpng12-dev (fix 
from doko)
   new  3b44cce   Apply GCC-5 fix from upstream tracker
   new  7b77691   Sync changelog
   new  a80c051   Bump standards to 3.9.6 (no changes)

The 4 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   | 22 ++
 debian/control |  4 ++--
 debian/patches/gcc-5.patch | 18 ++
 debian/patches/series  |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/gcc-5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/gargoyle-free.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

r13918 - mrconfig

[Sylvain Beucler]

Author: beuc-guest
Date: 2012-12-23 10:22:15 + (Sun, 23 Dec 2012)
New Revision: 13918

Modified:
   mrconfig/.mrconfig
Log:
Add meritous's git repo to the .mrconfig file

Modified: mrconfig/.mrconfig
===
--- mrconfig/.mrconfig  2012-12-18 10:40:06 UTC (rev 13917)
+++ mrconfig/.mrconfig  2012-12-23 10:22:15 UTC (rev 13918)
@@ -130,6 +130,9 @@
 [mednafen]
 checkout = git clone git://git.debian.org/git/pkg-games/mednafen.git
 
+[meritous]
+checkout = git clone git://git.debian.org/git/pkg-games/meritous.git
+
 [minetest]
 checkout = git clone git://git.debian.org/git/pkg-games/minetest.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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2011.1-1-3-ge7905b1

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 64e379517769855b1e3bf703e5bb0f6b36ccfbb0
Author: Sylvain Beucler b...@beuc.net
Date:   Thu May 24 22:02:43 2012 +0200

Fix FTBFS

diff --git a/debian/changelog b/debian/changelog
index 8628a7f..6dd2e66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gargoyle-free (2011.1-2) unstable; urgency=low
+
+  * Fix FTBFS: sdl-sound1.2-1.0.3-6 stripped its depencies, and the
+gargoyle build system made unnecessary references to -lsmpeg and
+-lvorbis that are normally used when building with the bundled copy of
+sdl-sound. (Closes: #674336)
+  * Fix FTBFS: -lrt was missing. This has never been a problem so I
+suspect we previously got it indirectly through pkg-config --libs.
+
+ -- Sylvain Beucler b...@debian.org  Thu, 24 May 2012 22:00:30 +0200
+
 gargoyle-free (2011.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/ignore_bundled_libraries.patch 
b/debian/patches/ignore_bundled_libraries.patch
index 68e144b..3801e1d 100644
--- a/debian/patches/ignore_bundled_libraries.patch
+++ b/debian/patches/ignore_bundled_libraries.patch
@@ -5,8 +5,8 @@ Last-Update: 2012-02-19
 
 Index: gargoyle-free/support/Jamfile
 ===
 gargoyle-free.orig/support/Jamfile 2012-02-19 12:37:48.0 +0100
-+++ gargoyle-free/support/Jamfile  2012-02-19 12:50:45.0 +0100
+--- gargoyle-free.orig/support/Jamfile 2012-02-20 17:05:53.0 +0100
 gargoyle-free/support/Jamfile  2012-05-24 21:08:25.0 +0200
 @@ -24,47 +24,3 @@
  level9.c magscrolls.c tads.c tads2.c tads3.c zcode.c
  ;
@@ -55,3 +55,16 @@ Index: gargoyle-free/support/Jamfile
 -}
 -}
 -
+Index: gargoyle-free/Jamrules
+===
+--- gargoyle-free.orig/Jamrules2012-05-24 21:08:24.0 +0200
 gargoyle-free/Jamrules 2012-05-24 21:10:55.0 +0200
+@@ -94,7 +94,7 @@
+ if $(USESDL) = yes
+ {
+ GARGLKCCFLAGS += -I/usr/include/SDL ;
+-GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL -lsmpeg -lvorbisfile ;
++GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL ;
+ }
+ 
+ if $(STATIC) { LINKLIBS += $(GARGLKLIBS) ; }
diff --git a/debian/patches/librt.patch b/debian/patches/librt.patch
new file mode 100644
index 000..f5d05ea
--- /dev/null
+++ b/debian/patches/librt.patch
@@ -0,0 +1,21 @@
+Description: requires -lrt
+  Well, it has been a requirement for a while AFAICS, so my guess is
+  that it was previously gotten indirectly through pkg-config --libs,
+  but not anymore.
+Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/a44d0c7783a32f7d
+Author: Sylvain Beucler b...@beuc.net
+Last-Update: 2012-05-24
+
+Index: gargoyle-free/Jamrules
+===
+--- gargoyle-free.orig/Jamrules2012-05-24 21:39:10.0 +0200
 gargoyle-free/Jamrules 2012-05-24 21:39:23.0 +0200
+@@ -88,7 +88,7 @@
+ PKGCONFIG = pkg-config freetype2 gtk+-x11-2.0 gdk-x11-2.0 
gobject-2.0 glib-2.0 fontconfig ;
+ }
+ GARGLKCCFLAGS = `$(PKGCONFIG) --cflags` -fPIC ;
+-GARGLKLIBS = `$(PKGCONFIG) --libs` -ljpeg -lpng -lz ;
++GARGLKLIBS = `$(PKGCONFIG) --libs` -ljpeg -lpng -lz -lrt ;
+ LINKLIBS = -lz -lm `$(PKGCONFIG) --libs` ;
+ 
+ if $(USESDL) = yes
diff --git a/debian/patches/series b/debian/patches/series
index c55f421..a788809 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ ignore_bundled_libraries.patch
 desktop_menu_entry_crs.patch
 desktop_menu_entry.patch
 fhs_locate_private_binaries.patch
+librt.patch

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2011.1-1-3-ge7905b1

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit b6c87a577cc8018aa5c50ea5d25ab0d5b5146fe8
Author: Sylvain Beucler b...@beuc.net
Date:   Thu May 24 22:05:31 2012 +0200

Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index 6dd2e66..46804c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gargoyle-free (2011.1-2) unstable; urgency=low
 sdl-sound. (Closes: #674336)
   * Fix FTBFS: -lrt was missing. This has never been a problem so I
 suspect we previously got it indirectly through pkg-config --libs.
+  * Bump Standards-Version to 3.9.3
 
  -- Sylvain Beucler b...@debian.org  Thu, 24 May 2012 22:00:30 +0200
 
diff --git a/debian/control b/debian/control
index cc515de..db35717 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
 Build-Depends: quilt, debhelper (= 7.0.50~), jam, libgtk2.0-dev, 
libpng12-dev, libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, 
libsdl-mixer1.2-dev, libfreetype6-dev, libfontconfig1-dev, pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/gargoyle-free.git

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, debian/2011.1-2, created. debian/2011.1-2

[Sylvain Beucler]

The annotated tag, debian/2011.1-2 has been created
at  cd42657ad1056c1c2b04187ab83560710bf8e77a (tag)
   tagging  b6c87a577cc8018aa5c50ea5d25ab0d5b5146fe8 (commit)
  replaces  debian/2011.1-1
 tagged by  Sylvain Beucler
on  Thu May 24 22:08:27 2012 +0200

- Shortlog 
Debian release 2011.1-2

Sylvain Beucler (2):
  Fix FTBFS
  Bump Standards-Version

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2011.1-2-2-g7769083

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 7769083543d600098ac6d9a1977e23ebfeef1a48
Author: Sylvain Beucler b...@beuc.net
Date:   Thu May 24 23:15:46 2012 +0200

Leverage ftp-master rejection

diff --git a/debian/changelog b/debian/changelog
index 8fb3c7a..4959c62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-gargoyle-free (2011.1-3) UNRELEASED; urgency=low
-
-  * Minimize ignore_bundled_libraries.patch.
-
- -- Sylvain Beucler b...@debian.org  Thu, 24 May 2012 22:58:00 +0200
-
 gargoyle-free (2011.1-2) unstable; urgency=low
 
   * Fix FTBFS: sdl-sound1.2-1.0.3-6 stripped its depencies, and the
@@ -13,6 +7,7 @@ gargoyle-free (2011.1-2) unstable; urgency=low
   * Fix FTBFS: -lrt was missing. This has never been a problem so I
 suspect we previously got it indirectly through pkg-config --libs.
   * Bump Standards-Version to 3.9.3
+  * Minimize ignore_bundled_libraries.patch.
 
  -- Sylvain Beucler b...@debian.org  Thu, 24 May 2012 22:57:48 +0200
 

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, debian/2011.1-2, updated. debian/2011.1-2

[Sylvain Beucler]

The annotated tag, debian/2011.1-2 has been updated
to  2a10870e9031e3a5d6a06a197eb029813d00aa1e (tag)
  from  cd42657ad1056c1c2b04187ab83560710bf8e77a (which is now obsolete)
   tagging  7769083543d600098ac6d9a1977e23ebfeef1a48 (commit)
  replaces  debian/2011.1-1
 tagged by  Sylvain Beucler
on  Thu May 24 23:19:02 2012 +0200

- Shortlog 
Debian release 2011.1-2

Sylvain Beucler (4):
  Fix FTBFS
  Bump Standards-Version
  Minimize ignore_bundled_libraries.patch
  Leverage ftp-master rejection

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20120427-1-1-g98bd306

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 98bd3066f2f78ef598422d391bd1d50e203efc5c
Author: Sylvain Beucler b...@beuc.net
Date:   Wed May 2 14:13:12 2012 +0200

Update install-reloc

diff --git a/debian/changelog b/debian/changelog
index b6b2d29..3e62f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freedink (1.08.20120427-2) unstable; urgency=low
+
+  * Update install-reloc (Closes: #671044)
+
+ -- Sylvain Beucler b...@debian.org  Wed, 2 May 2012 14:00:00 +0200
+
 freedink (1.08.20120427-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/patches/install-reloc.patch 
b/debian/patches/install-reloc.patch
new file mode 100644
index 000..dbc4244
--- /dev/null
+++ b/debian/patches/install-reloc.patch
@@ -0,0 +1,332 @@
+Description: Update install-reloc so it works with multiple binaries
+Forwarded: http://lists.gnu.org/archive/html/bug-gnulib/2012-05/msg0.html
+Author: Bruno Haible
+Last-Update: 2012-05-02
+
+Index: freedink-1.08.20120427/autotools/install-reloc
+===
+--- freedink-1.08.20120427.orig/autotools/install-reloc2012-04-27 
11:48:56.0 +
 freedink-1.08.20120427/autotools/install-reloc 2012-05-02 
10:14:44.0 +
+@@ -16,11 +16,11 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see http://www.gnu.org/licenses/.
+ 
+-# Usage:
+-#   install-reloc library_path_var library_path_value prefix destdir \
+-# compile_command srcdir builddir config_h_dir exeext \
+-# strip_command \
+-# install_command... destprog
++# Usage 1:
++#   install-reloc -- library_path_var library_path_value prefix destdir \
++#compile_command srcdir builddir config_h_dir exeext \
++#strip_command \
++#install_command... destprog
+ # where
+ #   - library_path_var is the platform dependent runtime library path variable
+ #   - library_path_value is a colon separated list of directories that contain
+@@ -39,51 +39,67 @@
+ # stripping is desired
+ #   - install_command is the install command line, excluding the final 
destprog
+ #   - destprog is the destination program name
++# Usage 2:
++#   env RELOC_LIBRARY_PATH_VAR=library_path_var \
++#   RELOC_LIBRARY_PATH_VALUE=library_path_value \
++#   RELOC_PREFIX=prefix \
++#   RELOC_DESTDIR=destdir \
++#   RELOC_COMPILE_COMMAND=compile_command \
++#   RELOC_SRCDIR=srcdir \
++#   RELOC_BUILDDIR=builddir \
++#   RELOC_CONFIG_H_DIR=config_h_dir \
++#   RELOC_EXEEXT=exeext \
++#   RELOC_STRIP_PROG=strip_command \
++#   RELOC_INSTALL_PROG=install_command... \
++#   install-reloc prog1 ... destprog
++#   where destprog is either the destination program name (when only one 
program
++#   is specified) or the destination directory for all programs.
+ # install-reloc renames destprog to destprog.bin and installs a relocating
+ # wrapper in the place of destprog.
+ 
+ progname=$0
+ 
+-if test $# -eq 2; then
+-  # Get arguments from environment variables.
+-  library_path_var=$RELOC_LIBRARY_PATH_VAR
+-  library_path_value=$RELOC_LIBRARY_PATH_VALUE
+-  prefix=$RELOC_PREFIX
+-  destdir=$RELOC_DESTDIR
+-  compile_command=$RELOC_COMPILE_COMMAND
+-  srcdir=$RELOC_SRCDIR
+-  builddir=$RELOC_BUILDDIR
+-  config_h_dir=$RELOC_CONFIG_H_DIR
+-  exeext=$RELOC_EXEEXT
+-  strip_prog=$RELOC_STRIP_PROG
+-  install_prog=$RELOC_INSTALL_PROG # including the -c option
++if test $# -ge 12  test x$1 = x--; then
++  # Get fixed position arguments.
++  shift
++  library_path_var=$1
++  library_path_value=$2
++  prefix=$3
++  destdir=$4
++  shift
++  shift
++  shift
++  shift
++  compile_command=$1
++  srcdir=$2
++  builddir=$3
++  config_h_dir=$4
++  exeext=$5
++  shift
++  shift
++  shift
++  shift
++  shift
++  strip_prog=$1
++  shift
++  install_prog=$1 # maybe not including the -c option
++  shift
+ else
+-  if test $# -ge 11; then
+-# Get fixed position arguments.
+-library_path_var=$1
+-library_path_value=$2
+-prefix=$3
+-destdir=$4
+-shift
+-shift
+-shift
+-shift
+-compile_command=$1
+-srcdir=$2
+-builddir=$3
+-config_h_dir=$4
+-exeext=$5
+-shift
+-shift
+-shift
+-shift
+-shift
+-strip_prog=$1
+-shift
+-install_prog=$1 # maybe not including the -c option
+-shift
++  if test $# -ge 2; then
++# Get arguments from environment variables.
++library_path_var=$RELOC_LIBRARY_PATH_VAR
++library_path_value=$RELOC_LIBRARY_PATH_VALUE
++prefix=$RELOC_PREFIX
++destdir=$RELOC_DESTDIR
++compile_command=$RELOC_COMPILE_COMMAND
++srcdir=$RELOC_SRCDIR
++builddir=$RELOC_BUILDDIR
++config_h_dir=$RELOC_CONFIG_H_DIR
++exeext=$RELOC_EXEEXT
++strip_prog=$RELOC_STRIP_PROG
++install_prog=$RELOC_INSTALL_PROG # including

[SCM] Packaging for freedink annotated tag, debian/1.08.20120427-2, created. debian/1.08.20120427-2

[Sylvain Beucler]

The annotated tag, debian/1.08.20120427-2 has been created
at  e2120de925f7298a984d2b53d0044cdc2d25ac3e (tag)
   tagging  98bd3066f2f78ef598422d391bd1d50e203efc5c (commit)
  replaces  debian/1.08.20120427-1
 tagged by  Sylvain Beucler
on  Wed May 2 14:14:43 2012 +0200

- Shortlog 
Debian release 1.08.20120427-2

Sylvain Beucler (1):
  Update install-reloc

---

-- 
Packaging for freedink

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

[SCM] Packaging for DFArc branch, master, updated. debian/3.8.1-1-4-gd584653

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit f70dbd2ff97c1bc96d3e3864a0338368fba0e979
Merge: fb0d809d04a805211cd1264118f07bb253227bb6 
ef8d5896d358084c5bcf3e18bd8d68a8a88de5c1
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Apr 27 19:59:36 2012 +0200

Merge tag 'upstream/3.10'

Upstream version 3.10


-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc branch, master, updated. debian/3.8.1-1-4-gd584653

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit d584653216b19183817ff0bb44058d922d34f139
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Apr 27 20:00:44 2012 +0200

New upstream release - v3.10

diff --git a/debian/changelog b/debian/changelog
index be09ff5..86260a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+freedink-dfarc (3.10-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
+  * Update copyright file
+  * Bump Standards-Version to 3.9.3
+  * Update official webpage
+  * Remove lintian override for dh_desktop (not supporting pre-Squeeze
+anymore)
+
+ -- Sylvain Beucler b...@debian.org  Fri, 27 Apr 2012 19:00:00 +0200
+
 freedink-dfarc (3.8.1-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 888a811..21de6c8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: debhelper (= 6.0.7~), autotools-dev, libbz2-dev, 
libwxgtk2.8-dev, intltool (= 0.31)
-Standards-Version: 3.9.1
-Homepage: http://www.freedink.org/
+Build-Depends: debhelper (= 7.0.50~), autotools-dev, libbz2-dev, 
libwxgtk2.8-dev, intltool (= 0.31)
+Standards-Version: 3.9.3
+Homepage: http://www.gnu.org/software/freedink/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink-dfarc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/freedink-dfarc.git
 
diff --git a/debian/copyright b/debian/copyright
index d2d8202..11cf90e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,7 @@ nl - Copyright (C) 2010  Free Software Foundation
 pl - Copyright (C) 2008  GOKUSSJ6
  Copyright (C) 2009, 2010  Michał Trzebiatowski
 vi - Copyright (C) 2009, 2010  Free Software Foundation
+hr - Copyright (C) 2012  Tomislav Krznar
 
 License:
 
diff --git a/debian/rules b/debian/rules
index 18b4c5b..7f23453 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,104 +1,47 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-SRC := $(CURDIR)
-BUILD   := $(CURDIR)/debian/build
-# default dh_make target
-TARGET  := $(CURDIR)/debian/freedink-dfarc
-
-# Cf. /usr/share/doc/autotools-dev/README.Debian.gz
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-$(BUILD)/config.status: configure
-   dh_testdir
-   [ -d $(BUILD) ] || mkdir $(BUILD)
 
+%:
+   dh $@ --parallel --with autotools_dev
#Install autotools-dev's config.sub and config.guess, if newer:
-   chmod 755 debian/update-autotools-config.sh
-   debian/update-autotools-config.sh autotools/
+   #chmod 755 debian/update-autotools-config.sh
+   #debian/update-autotools-config.sh autotools/
 
+override_dh_auto_configure:
+   # Using '--bindir=/usr/games' by Debian policy
+   #   (e.g. not the case for Fedora)
# Using '--disable-desktopfiles' to avoid installing FreeDesktop files
-   # on the builder (rather than on the end-user computer)
-   cd $(BUILD)  $(SRC)/configure $(confflags) \
- --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games \
- --disable-desktopfiles \
- CFLAGS=$(CFLAGS) LDFLAGS=-Wl,-z,defs
-
-
-build: debian/build-stamp
-
-debian/build-stamp:  $(BUILD)/config.status
-   dh_testdir
-
-   # Add here commands to compile the package.
-   $(MAKE) -C $(BUILD)
-
-   touch $@
+   #   on the builder (rather than on the end-user computer)
+   dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games 
--disable-desktopfiles
 
-clean:
-   dh_testdir
-   dh_testroot

[SCM] Packaging for DFArc branch, pristine-tar, updated. b545873261ba6a6dca49c7a436e523a3301093a4

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit b545873261ba6a6dca49c7a436e523a3301093a4
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Apr 27 19:59:36 2012 +0200

pristine-tar data for freedink-dfarc_3.10.orig.tar.gz

diff --git a/freedink-dfarc_3.10.orig.tar.gz.delta 
b/freedink-dfarc_3.10.orig.tar.gz.delta
new file mode 100644
index 000..94c18c3
Binary files /dev/null and b/freedink-dfarc_3.10.orig.tar.gz.delta differ
diff --git a/freedink-dfarc_3.10.orig.tar.gz.id 
b/freedink-dfarc_3.10.orig.tar.gz.id
new file mode 100644
index 000..5e4448f
--- /dev/null
+++ b/freedink-dfarc_3.10.orig.tar.gz.id
@@ -0,0 +1 @@
+dcccee8c549dd0c3d747e3b97718dd37561ab6ff

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc annotated tag, debian/3.10-1, created. debian/3.10-1

[Sylvain Beucler]

The annotated tag, debian/3.10-1 has been created
at  d2b881c45d67213550747f116e8773a5b32fc728 (tag)
   tagging  d584653216b19183817ff0bb44058d922d34f139 (commit)
  replaces  debian/3.8.1-1
 tagged by  Sylvain Beucler
on  Fri Apr 27 20:01:58 2012 +0200

- Shortlog 
Debian release 3.10-1

Sylvain Beucler (3):
  Imported Upstream version 3.10
  Merge tag 'upstream/3.10'
  New upstream release - v3.10

---

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc annotated tag, upstream/3.10, created. upstream/3.10

[Sylvain Beucler]

The annotated tag, upstream/3.10 has been created
at  b616645433d1449c7544952ef3b9864157cce2bb (tag)
   tagging  ef8d5896d358084c5bcf3e18bd8d68a8a88de5c1 (commit)
  replaces  upstream/3.8.1
 tagged by  Sylvain Beucler
on  Fri Apr 27 19:59:36 2012 +0200

- Shortlog 
Upstream version 3.10

Sylvain Beucler (1):
  Imported Upstream version 3.10

---

-- 
Packaging for DFArc

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-12-g5ceea0a

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 99e8484d5d2416595fd76b701b5fadcfab203b12
Merge: 4f30ce4d0a8c8ef900cbee132f544bf2d64aea82 
0c8c7f7a7ee5fcb5387906cc5871cfd81997937a
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Apr 27 20:46:27 2012 +0200

Merge tag 'upstream/1.08.20120427'

Upstream version 1.08.20120427


-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-12-g5ceea0a

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 5ceea0aeda742dbe8a361e6aed67ca9fbe932b82
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Apr 27 20:50:34 2012 +0200

New upstream release - v1.08.20120427

diff --git a/debian/changelog b/debian/changelog
index 60ba74f..b6b2d29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-freedink (1.08.20110229-1) UNRELEASED; urgency=low
+freedink (1.08.20120427-1) unstable; urgency=low
 
   * New Upstream Version
   * Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
-
- -- Sylvain Beucler b...@debian.org  Sat, 26 Mar 2011 08:11:34 +0100
+  * Update copyright file
+  * Bump Standards-Version to 3.9.3
+  * Update official webpage
+  
+ -- Sylvain Beucler b...@debian.org  Fri, 27 Apr 2012 19:00:00 +0200
 
 freedink (1.08.20101114-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 66c457d..8c659f1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
 Build-Depends: debhelper (= 7.4.2), autotools-dev, pkg-config, libsdl1.2-dev, 
libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, 
libfontconfig1-dev
-Standards-Version: 3.9.1
-Homepage: http://www.freedink.org/
+Standards-Version: 3.9.3
+Homepage: http://www.gnu.org/software/freedink/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/freedink.git
 
diff --git a/debian/copyright b/debian/copyright
index e006288..d22b981 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,6 +23,9 @@ el - Copyright (C) 2010  Michael Kotsarinis
 it - Copyright (C) 2010  Vincenzo Campanella
 cs - Copyright (C) 2010  Marek Černocký
 eo - Copyright (C) 2011  Felipe Castro
+sl - Copyright (C) 2011  Klemen Košir
+sr - Copyright (C) 2011  Мирослав Николић
+hr - Copyright (C) 2012  Tomislav Krznar
 
 License:
 

-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, pristine-tar, updated. 078a63f06f7e379a616d762375a4010968240276

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 078a63f06f7e379a616d762375a4010968240276
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Apr 27 20:46:27 2012 +0200

pristine-tar data for freedink_1.08.20120427.orig.tar.gz

diff --git a/freedink_1.08.20120427.orig.tar.gz.delta 
b/freedink_1.08.20120427.orig.tar.gz.delta
new file mode 100644
index 000..44d7e43
Binary files /dev/null and b/freedink_1.08.20120427.orig.tar.gz.delta differ
diff --git a/freedink_1.08.20120427.orig.tar.gz.id 
b/freedink_1.08.20120427.orig.tar.gz.id
new file mode 100644
index 000..829a5a9
--- /dev/null
+++ b/freedink_1.08.20120427.orig.tar.gz.id
@@ -0,0 +1 @@
+f96f36075a3674a2160769195d72558894eb3a40

-- 
Packaging for freedink

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

[SCM] Packaging for freedink annotated tag, debian/1.08.20120427-1, created. debian/1.08.20120427-1

[Sylvain Beucler]

The annotated tag, debian/1.08.20120427-1 has been created
at  a05f5332840152626f008116c2f957d19b9db9d7 (tag)
   tagging  5ceea0aeda742dbe8a361e6aed67ca9fbe932b82 (commit)
  replaces  debian/1.08.20100420-1
 tagged by  Sylvain Beucler
on  Fri Apr 27 20:52:19 2012 +0200

- Shortlog 
Debian release 1.08.20120427-1

Sylvain Beucler (12):
  Fix copyright-refers-to-symlink-license
  Update copyright; symlink meta-package documentation
  Sync upstream's debian/
  Imported Upstream version 1.08.20101114
  Merge commit 'upstream/1.08.20101114'
  Bump Standards-Version
  Fix new version
  Update e-mail address
  Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
  Imported Upstream version 1.08.20120427
  Merge tag 'upstream/1.08.20120427'
  New upstream release - v1.08.20120427

---

-- 
Packaging for freedink

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

[SCM] Packaging for freedink annotated tag, upstream/1.08.20120427, created. upstream/1.08.20120427

[Sylvain Beucler]

The annotated tag, upstream/1.08.20120427 has been created
at  e6c6c938965ba34f141e650746db6ea08c4e856f (tag)
   tagging  0c8c7f7a7ee5fcb5387906cc5871cfd81997937a (commit)
  replaces  upstream/1.08.20101114
 tagged by  Sylvain Beucler
on  Fri Apr 27 20:46:27 2012 +0200

- Shortlog 
Upstream version 1.08.20120427

Sylvain Beucler (1):
  Imported Upstream version 1.08.20120427

---

-- 
Packaging for freedink

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, upstream/2011.1, created. upstream/2011.1

[Sylvain Beucler]

The annotated tag, upstream/2011.1 has been created
at  71edc6ca7ff4eda3fd4e472b03c4848cae7b1578 (tag)
   tagging  269857a5458a63d0d55ecc48357ac456e51ae751 (commit)
  replaces  upstream/2010.1
 tagged by  Sylvain Beucler
on  Sun Feb 19 12:37:48 2012 +0100

- Shortlog 
Upstream version 2011.1

Sylvain Beucler (1):
  Imported Upstream version 2011.1

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, debian/2010.1-2, created. debian/2010.1-2

[Sylvain Beucler]

The annotated tag, debian/2010.1-2 has been created
at  6f692342b979b279a2c5d94b131b810af1325a2d (tag)
   tagging  2e0dfcf51b15820c8c890226ea7046a77cdfc70d (commit)
  replaces  debian/2009-08-25-1
 tagged by  Sylvain Beucler
on  Mon Feb 20 17:16:51 2012 +0100

- Shortlog 
Debian release 2010.1-2

Sylvain Beucler (18):
  Imported Upstream version 2009-08-25
  Imported Upstream version 2009-08-25
  Add Vcs-Git and Vcs-Browser tags
  Add gbp.conf to ignore .gitignore files automatically
  Fix missing 'not' in the package description
  manpage: Format variable name in italic
  Several small fixes
  Declare package source format
  Update e-mail
  Prepare changes for the next release (modify only debian/, not bothering 
to import the rc1 tarball in Git)
  More preperations for the next upstream release
  Imported Upstream version 2010.1
  Merge commit 'upstream/2010.1'
  Add copyright info about additional unused fonts present in the source 
tarball
  Menu entry
  Fix upstream desktop menu entry
  Re-upload experimental-unstable + minor fixes
  Include closed bug for libjpeg dependency fix

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, debian/2011.1-1, created. debian/2011.1-1

[Sylvain Beucler]

The annotated tag, debian/2011.1-1 has been created
at  c215874522671f0d2e800b6e1fcef15424c2ef70 (tag)
   tagging  2314d72465b4eca0f07d36219e662f349122e077 (commit)
  replaces  debian/2010.1-2
 tagged by  Sylvain Beucler
on  Mon Feb 20 17:16:10 2012 +0100

- Shortlog 
Debian release 2011.1-1

Sylvain Beucler (6):
  Status update on Alan license
  Prepare next release
  Imported Upstream version 2011.1
  Merge commit 'upstream/2011.1'
  Refresh patches and revamp debhelper
  Update debian/copyright

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-20-g93df41c

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 93df41cb9738ba57a987ddc8e3874a6d6abe1320
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Feb 19 12:23:29 2012 +0100

Prepare next release

diff --git a/debian/README.Debian b/debian/README.Debian
index 80409c0..e403c92 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
 gargoyle-free for Debian
 ---
 
-This version of gargoyle does not include the non-free Alan and Hugo
+This version of gargoyle does not include the non-free Alan 2 and Hugo
 interpreters, and use a different, free monospace font. See the
 'copyright' file for more information.
 
@@ -12,5 +12,4 @@ more games are free-as-in-freedom, some of them are listed at:
 
   http://ifwiki.org/index.php/Free_Software_IF
 
-
- -- Sylvain Beucler b...@beuc.net  Fri, 11 Sep 2009 20:09:43 +0200
+ -- Sylvain Beucler b...@debian.org, Sun, 19 Feb 2012 12:20:01 +0100
diff --git a/debian/README.source b/debian/README.source
index 1ad614b..e9cdce6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -54,3 +54,11 @@ Testing
 - Test HTML TADS (currently not working)
   http://www.ifwiki.org/index.php/Gun_Mute
   TADS3 + HTML TADS
+
+- The Treaty of Babel metadata is used to set the window title - it
+  displays the author's name and the story title instead of the file
+  name and interpreter.  For instance, The Moon Watch (release 4)
+  has moonwatch.blb - Git 1.2.9 as window title, while FloatPoint
+  has Floatpoint - Emily Short as window title.
+
+ -- Sylvain Beucler b...@debian.org, Sun, 19 Feb 2012 12:19:51 +0100
diff --git a/debian/changelog b/debian/changelog
index d4d43cb..c359700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gargoyle-free (2011.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Alan 3 interpreter is now Free Software, include it
+  * Add pkg-config as a direct build dependency
+
+ --
+
 gargoyle-free (2010.1-2) unstable; urgency=low
 
   * Depend on libjpeg-dev rather than libjpeg62-dev (Closes: #633939)
diff --git a/debian/control b/debian/control
index e65a7e7..34edf4c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev
+Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev, pkg-config
 Standards-Version: 3.9.2
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git
@@ -24,13 +24,13 @@ Description: graphical player for Interactive Fiction games
  .
  Gargoyle is based on the standard interpreters for the formats it
  supports: .taf (Adrift games, played with Scare), .dat (AdvSys),
- *.agx/.d$$ (AGiliTy), .asl/.cas (Quest games, played with Geas),
- *.jacl/.j2 (JACL), .l9/.sna (Level 9), .mag (Magnetic), .gam/.t3
- (TADS), .z1/.z2/.z3/.z4/.z5/.z6/.z7/.z8 (Inform Z-Machine games,
- played with Frotz or Nitfol), .ulx/.blb/.blorb/.glb/.gblorb (Inform
- or Superglús games compiled to the Glulxe VM in Blorb archives,
- played with Git or Glulxe), .zlb, .zblorb (Inform Z-Machine games in
- Blorb archives, played with Frotz).
+ *.agx/.d$$ (AGiliTy), .a3c (Alan3), .asl/.cas (Quest games, played
+ with Geas), *.jacl/.j2 (JACL), .l9/.sna (Level 9), .mag (Magnetic),
+ *.gam/.t3 (TADS), .z1/.z2/.z3/.z4/.z5/.z6/.z7/.z8 (Inform Z-Machine
+ games, played with Frotz or Nitfol), .ulx/.blb/.blorb/.glb/.gblorb
+ (Inform or Superglús games compiled to the Glulxe VM in Blorb
+ archives, played with Git or Glulxe), .zlb, .zblorb (Inform Z-Machine
+ games in Blorb archives, played with Frotz).
  .
  (note: do not confuse the Git Glux interpreter with the Git DVCS or
  the GNU Interactive Tools)
@@ -44,7 +44,7 @@ Description: graphical player for Interactive Fiction games
  .
  Limitations:
  .
- * This free version of gargoyle does not include the non-free Alan
+ * This free version of gargoyle does not include the non-free Alan2
  and Hugo interpreter (and use a different, free monospace font).
  .
  * While Gargoyle can display in-game pictures, it does not provide a
diff --git a/debian/copyright b/debian/copyright
index 48487fc..196e51e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,28 +11,15 @@ removed to create the -free tarball:
 
   - terps/alan2/: non-free license (need to register and cannot modify
 without author's permission), check
-http://www.alanif.se/uploads/v2download/alanmanual28.pdf
-section J.5
-
-  - terps/alan3/: non-free license (need to register and cannot modify
-without author's permission), check
-http://www.alanif.se/uploads/download

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-24-g2314d72

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 98797035467e7700c4a51d20755439811fe3d98e
Merge: 93df41cb9738ba57a987ddc8e3874a6d6abe1320 
269857a5458a63d0d55ecc48357ac456e51ae751
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Feb 19 12:37:48 2012 +0100

Merge commit 'upstream/2011.1'


-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-24-g2314d72

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 2314d72465b4eca0f07d36219e662f349122e077
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Feb 19 15:58:08 2012 +0100

Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index b61a69c..8628a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ gargoyle-free (2011.1-1) unstable; urgency=low
   * Remove helper-templates-in-copyright override as the lintian check is
 smarter now
   * Refresh patches
+  * Update debian/copyright
 
- -- Sylvain Beucler b...@debian.org  Sun, 19 Feb 2012 15:26:16 +0100
+ -- Sylvain Beucler b...@debian.org  Sun, 19 Feb 2012 15:57:30 +0100
 
 gargoyle-free (2010.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b305ec4..cc515de 100644
--- a/debian/control
+++ b/debian/control
@@ -25,12 +25,13 @@ Description: graphical player for Interactive Fiction games
  Gargoyle is based on the standard interpreters for the formats it
  supports: .taf (Adrift games, played with Scare), .dat (AdvSys),
  *.agx/.d$$ (AGiliTy), .a3c (Alan3), .asl/.cas (Quest games, played
- with Geas), *.jacl/.j2 (JACL), .l9/.sna (Level 9), .mag (Magnetic),
- *.gam/.t3 (TADS), .z1/.z2/.z3/.z4/.z5/.z6/.z7/.z8 (Inform Z-Machine
- games, played with Frotz or Nitfol), .ulx/.blb/.blorb/.glb/.gblorb
- (Inform or Superglús games compiled to the Glulxe VM in Blorb
- archives, played with Git or Glulxe), .zlb, .zblorb (Inform Z-Machine
- games in Blorb archives, played with Frotz).
+ with Geas), .jacl/.j2 (JACL), .l9/.sna (Level 9), .mag (Magnetic),
+ *.saga (Scott Adams Grand Adventures), .gam/.t3 (TADS),
+ *.z1/.z2/.z3/.z4/.z5/.z6/.z7/.z8 (Inform Z-Machine games, played with
+ Frotz, Nitfol or Bocfel), .ulx/.blb/.blorb/.glb/.gblorb (Inform or
+ Superglús games compiled to the Glulxe VM in Blorb archives, played
+ with Git or Glulxe), .zlb, .zblorb (Inform Z-Machine games in Blorb
+ archives, played with Frotz).
  .
  (note: do not confuse the Git Glux interpreter with the Git DVCS or
  the GNU Interactive Tools)
diff --git a/debian/copyright b/debian/copyright
index 47119ae..4d1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,25 +87,26 @@ Upstream Authors:
 Copyright:
 
 Copyright (C) 2006-2009 Tor Andersson
-Copyright (C) 2006-2009 Jesse McGrew
-Copyright (C) 2008-2010 Ben Cressey
+Copyright (C) 2006-2011 Jesse McGrew
+Copyright (C) 2008-2011 Ben Cressey
 Copyright (C) 2010 Sylvain Beucler
-Copyright (C) 2010 Chris Spiegel
+Copyright (C) 2009-2011 Chris Spiegel
 Copyright (C) 2010 Jörg Walter
 Copyright (C) 2002 Ben Hines
 Copyright (C) 1986, 2009 David Michael Betz
 Copyright (C) 1996-1999, 2001 Robert Masenten
-Copyright (C) 2002-2008 Simon Baldwin
+Copyright (C) 2002-2011 Simon Baldwin
 Copyright (C) 1995-1997 Stefan Jokisch
 Copyright (C) 2006 Mark Tilford
 Copyright (C) 2006 David Jones
 Copyright (C) 2003 Iain Merrick
-Copyright (C) 1998-2009 Andrew Plotkin
+Copyright (C) 1998-2011 Andrew Plotkin
 Copyright (C) 1992-2008 Stuart Allen
 Copyright (C) 1996, 2002, 2003, 2005, 2007 Glen Summers
-Copyright (C) 2002, 2003, 2005, 2007 David Kinder
+Copyright (C) 2002, 2003, 2005, 2007, 2011 David Kinder
 Copyright (C) 2005, 2007 Alan Staniforth
 Copyright (C) 2005, 2007 Dieter Baron
+Copyright (C) 2011 Andreas Scherrer
 Copyright (C) 1997-2008 Niclas Karlsson
 Copyright (C) 1999 Evin Robertson
 Copyright (C) 1987-2009 Michael J. Roberts
@@ -113,6 +114,7 @@ Copyright:
 Copyright: (C) 2007 Red Hat, Inc.
 Copyright: (C) 2003-2009 Philipp H. Poll 
philthel...@users.sourceforge.net
 Copyright (C) 1985-2011  Thomas Nilsson (ALAN)
+Copyright (C) 1995 Alan Cox (ScottFree)
 
 License:
 

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-24-g2314d72

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 747b06e51be189cfa6f2bd25080686bda457b89e
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Feb 19 12:59:43 2012 +0100

Refresh patches and revamp debhelper

diff --git a/debian/TODO b/debian/TODO
index d6283c9..eb4d718 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,9 +1,10 @@
-- Watch for Alan as this interpreter may be released under a free
-  license in the near future (as of 2009)
+- Contact Alan 2 author so the interpreter may be released under a
+  free, like Alan 3 (contact made in 2012-02)
 
 - Move binaries out of /usr/lib/gargole so they can be used from the
   command line; handle conflicts with existing, stand-alone
   interpreters (such as frotz)
+  Cf. fhs_locate_private_binaries.patch
 
 - See if there's a benefit in installing garglk.ini in /etc .
   I asked upstream at:
diff --git a/debian/changelog b/debian/changelog
index c359700..b61a69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ gargoyle-free (2011.1-1) unstable; urgency=low
   * New upstream release
   * Alan 3 interpreter is now Free Software, include it
   * Add pkg-config as a direct build dependency
+  * Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
+  * Remove helper-templates-in-copyright override as the lintian check is
+smarter now
+  * Refresh patches
 
- --
+ -- Sylvain Beucler b...@debian.org  Sun, 19 Feb 2012 15:26:16 +0100
 
 gargoyle-free (2010.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 34edf4c..b305ec4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev, pkg-config
+Build-Depends: quilt, debhelper (= 7.0.50~), jam, libgtk2.0-dev, 
libpng12-dev, libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, 
libsdl-mixer1.2-dev, libfreetype6-dev, libfontconfig1-dev, pkg-config
 Standards-Version: 3.9.2
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git
diff --git a/debian/copyright b/debian/copyright
index 196e51e..47119ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,7 +29,9 @@ removed to create the -free tarball:
   - support/: for the sake of convenience (e.g. no need to declare it
 in this file), these external libraries are excluded from the
 tarball, since they are only used for some developer builds, and
-are otherwise available in Debian already
+are otherwise available in Debian already.  Exception: 'babel/'
+(Treaty of Babel, http://babel.ifarchive.org/program.html, a
+meta-data library) which is not packaged in Debian.
 
   Shortcut:
 rm -rf \
diff --git a/debian/gargoyle-free.examples b/debian/examples
similarity index 100%
rename from debian/gargoyle-free.examples
rename to debian/examples
diff --git a/debian/gargoyle-free.lintian-overrides 
b/debian/gargoyle-free.lintian-overrides
index 9113afa..c088664 100644
--- a/debian/gargoyle-free.lintian-overrides
+++ b/debian/gargoyle-free.lintian-overrides
@@ -1,4 +1,2 @@
 # The list has one paragraph per item and is meant to be word-wrapped
 possible-unindented-list-in-extended-description
-# The SIL OPEN FONT LICENSE Version 1.0 contains author(s) - OMG!
-helper-templates-in-copyright
diff --git a/debian/install b/debian/install
index c9eda90..33b67f2 100644
--- a/debian/install
+++ b/debian/install
@@ -2,6 +2,8 @@
 
 build/dist/advsys   usr/lib/gargoyle/
 build/dist/agility  usr/lib/gargoyle/
+build/dist/alan3usr/lib/gargoyle/
+build/dist/bocfel   usr/lib/gargoyle/
 build/dist/frotzusr/lib/gargoyle/
 build/dist/geas usr/lib/gargoyle/
 build/dist/git  usr/lib/gargoyle/
@@ -11,9 +13,9 @@ build/dist/level9   usr/lib/gargoyle/
 build/dist/magnetic usr/lib/gargoyle/
 build/dist/nitfol   usr/lib/gargoyle/
 build/dist/scareusr/lib/gargoyle/
+build/dist/scottusr/lib/gargoyle/
 build/dist/tadsrusr/lib/gargoyle/
 #build/dist/alan2usr/lib/gargoyle/
-#build/dist/alan3usr/lib/gargoyle/
 #build/dist/hugo usr/lib/gargoyle/
 
 garglk/garglk.inietc/
diff --git a/debian/patches/desktop_menu_entry.patch 
b/debian/patches/desktop_menu_entry.patch
index 0f886ea..855d753 100644
--- a/debian/patches/desktop_menu_entry.patch
+++ b/debian/patches/desktop_menu_entry.patch
@@ -1,29 +1,16 @@
-Description: Fix issues in the .desktop file
-Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf
+Description: Rename executable 'gargoyle' - 'gargoyle-free'
+Forwarded: not-needed
 Author: Sylvain Beucler b...@beuc.net
-Last-Update: 2010-10-01
+Last-Update: 2012-02-19
 
 Index: gargoyle-free/garglk/gargoyle.desktop

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, pristine-tar, updated. 868c467805d9a4883aec22c1923a87565e587b95

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 868c467805d9a4883aec22c1923a87565e587b95
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Feb 19 12:37:48 2012 +0100

pristine-tar data for gargoyle-free_2011.1.orig.tar.gz

diff --git a/gargoyle-free_2011.1.orig.tar.gz.delta 
b/gargoyle-free_2011.1.orig.tar.gz.delta
new file mode 100644
index 000..49a6f29
Binary files /dev/null and b/gargoyle-free_2011.1.orig.tar.gz.delta differ
diff --git a/gargoyle-free_2011.1.orig.tar.gz.id 
b/gargoyle-free_2011.1.orig.tar.gz.id
new file mode 100644
index 000..56d32ba
--- /dev/null
+++ b/gargoyle-free_2011.1.orig.tar.gz.id
@@ -0,0 +1 @@
+269857a5458a63d0d55ecc48357ac456e51ae751

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-19-ga768338

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit a76833886931c493ecd3c399277af247551407d7
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Feb 18 17:47:17 2012 +

Status update on Alan license

diff --git a/debian/copyright b/debian/copyright
index ea92a5a..48487fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,13 @@ removed to create the -free tarball:
 
   Note: the license for the Alan and Hugo interpreters may change in
   the near future (as of 2009).  Authors were contacted again in 2010:
-  
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277
+
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277
+  The Alan3 3.0a9 (and upgoing) source code was made available under
+  the Artistic license 2.0 in 2010/2011:
+  Clearified licensing, read COPYING - COPYING being licenses/Artistic 
License 2.0.txt
+
http://groups.google.com/group/garglk-dev/browse_thread/thread/00f35c1cbc01f203
+
http://www.alanif.se/index.php?option=com_contentview=articleid=137:changes-in-v30alpha9catid=29Itemid=16
+  The Alan2 source code is not available as of 2012-02.
 
   - fonts/LuxiMonoBoldOblique.pfb,
 fonts/LuxiMonoBold.pfb, garglk/fonts/LuxiMonoOblique.pfb,
@@ -90,7 +96,7 @@ Copyright:
 Copyright (C) 2002-2008 Simon Baldwin
 Copyright (C) 1995-1997 Stefan Jokisch
 Copyright (C) 2006 Mark Tilford
-Copyrihgt (C) 2006 David Jones
+Copyright (C) 2006 David Jones
 Copyright (C) 2003 Iain Merrick
 Copyright (C) 1998-2009 Andrew Plotkin
 Copyright (C) 1992-2008 Stuart Allen
@@ -104,6 +110,7 @@ Copyright:
 Copyright (c) 1989-1992 Bistream Inc., Cambridge, MA
 Copyright: (C) 2007 Red Hat, Inc.
 Copyright: (C) 2003-2009 Philipp H. Poll 
philthel...@users.sourceforge.net
+Copyright (C) 1985-2011  Thomas Nilsson (ALAN)
 
 License:
 

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for freedink-data branch, master, updated. debian/1.08.20110723-1-3-g6c010fc

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 72ce9e44ccd7823e8cbbde8307d304c456f1
Merge: a59ac70fb2da8000a3522cf59e439e1565001ce9 
2b31a2fec9d98ab3317673d0d3dc75682ad12342
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Oct 16 20:59:14 2011 +0200

Merge commit 'upstream/1.08.20111016'


-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data branch, master, updated. debian/1.08.20110723-1-3-g6c010fc

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 6c010fc873cf03f5af4d712b667fbbd66ea6a2f7
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Oct 16 21:00:38 2011 +0200

New upstream release - v1.08.20111016

diff --git a/debian/changelog b/debian/changelog
index 5386388..e588e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freedink-data (1.08.20111016-1) unstable; urgency=low
+
+* New upstream release
+
+ -- Sylvain Beucler b...@debian.org  Sun, 16 Oct 2011 20:23:04 +0200
+
 freedink-data (1.08.20110723-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/copyright b/debian/copyright
index ae3d873..6256c3c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -92,8 +92,20 @@ Free sound replacements
   5.mid/Untitled3.mscz
 Copyright: Ofir Mo firewallsp...@gmail.com
 License: GPLv3+
+- 7.mid/clockwork.mid
+  7.mid/clockwork.rg
+Copyright (C) 2011 Joshua O'Leary
+License: GPLv3+
+- 12.mid/dink-castle.mid
+  12.mid/dink-castle.rg
+Copyright (C) 2011 Joshua O'Leary
+License: GPLv3+
 - 13.mid/CanonInD222.mid
 License: public domain
+- 18.mid/mystery-game.mid
+  18.mid/mystery-game.rg
+Copyright (C) 2011 Joshua O'Leary
+License: GPLv3+
 - 104.mid/serenade-d957.rg
   104.mid/serenade-d957.mid
 Copyright (C) 2008  Sylvain Beucler
@@ -196,13 +208,13 @@ Translations
 - dink/l10n/fr.po: Copyright (C) 2008, 2009  Free Software Foundation, Inc.
 - dink/l10n/mk.po: Copyright (C) 2008, 2009  Free Software Foundation, Inc.
 - dink/l10n/nl.po: Copyright (C) 2003  Nanette clubs_shetlandp...@hotmail.com
-   Copyright (C) 2010  Bas Wijnen she...@fmf.nl
+   Copyright (C) 2010, 2011  Bas Wijnen she...@fmf.nl
 
 
 Packaging
 =
 
-The Debian packaging is Copyright (C) 2008, 2009, 2010, Sylvain
+The Debian packaging is Copyright (C) 2008, 2009, 2010, 2011, Sylvain
 Beucler b...@beuc.net and is licensed under the GPL, either version
 3, or (at your option) any later version, see
 `/usr/share/common-licenses/GPL-3'.

-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data branch, pristine-tar, updated. b8b0d5f71fe21ff60a5fff364dd43d4b8f9483d6

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit b8b0d5f71fe21ff60a5fff364dd43d4b8f9483d6
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Oct 16 20:59:14 2011 +0200

pristine-tar data for freedink-data_1.08.20111016.orig.tar.gz

diff --git a/freedink-data_1.08.20111016.orig.tar.gz.delta 
b/freedink-data_1.08.20111016.orig.tar.gz.delta
new file mode 100644
index 000..e6a36c8
Binary files /dev/null and b/freedink-data_1.08.20111016.orig.tar.gz.delta 
differ
diff --git a/freedink-data_1.08.20111016.orig.tar.gz.id 
b/freedink-data_1.08.20111016.orig.tar.gz.id
new file mode 100644
index 000..0da72a6
--- /dev/null
+++ b/freedink-data_1.08.20111016.orig.tar.gz.id
@@ -0,0 +1 @@
+2b31a2fec9d98ab3317673d0d3dc75682ad12342

-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data annotated tag, debian/1.08.20111016-1, created. debian/1.08.20111016-1

[Sylvain Beucler]

The annotated tag, debian/1.08.20111016-1 has been created
at  f9be78281218ac73bdcc5d1b6e1c8cff6b9faa36 (tag)
   tagging  6c010fc873cf03f5af4d712b667fbbd66ea6a2f7 (commit)
  replaces  debian/1.08.20110723-1
 tagged by  Sylvain Beucler
on  Sun Oct 16 21:03:00 2011 +0200

- Shortlog 
Debian release 1.08.20111016-1

Sylvain Beucler (3):
  Imported Upstream version 1.08.20111016
  Merge commit 'upstream/1.08.20111016'
  New upstream release - v1.08.20111016

---

-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data annotated tag, upstream/1.08.20111016, created. upstream/1.08.20111016

[Sylvain Beucler]

The annotated tag, upstream/1.08.20111016 has been created
at  a10af018a4576b8e90c6d2ac62bc2f49790c3227 (tag)
   tagging  2b31a2fec9d98ab3317673d0d3dc75682ad12342 (commit)
  replaces  upstream/1.08.20110723
 tagged by  Sylvain Beucler
on  Sun Oct 16 20:59:14 2011 +0200

- Shortlog 
Upstream version 1.08.20111016

Sylvain Beucler (1):
  Imported Upstream version 1.08.20111016

---

-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data branch, master, updated. debian/1.08.20100103-1-6-ga59ac70

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 18ee6a3c526c3cedd9eee2dcf456e4d4d98bb0f1
Merge: 13eda7411f7bab67a7829f6d7a3f6f65e6941935 
0e1a9a9a5b5d3f047c7cb3c6080c107f8401bd67
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Jul 23 00:23:54 2011 +0200

Merge commit 'upstream/1.08.20110723'


-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data branch, pristine-tar, updated. 597229f69355f7b7737412ba77f906eade477a16

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 597229f69355f7b7737412ba77f906eade477a16
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Jul 23 00:23:54 2011 +0200

pristine-tar data for freedink-data_1.08.20110723.orig.tar.gz

diff --git a/freedink-data_1.08.20110723.orig.tar.gz.delta 
b/freedink-data_1.08.20110723.orig.tar.gz.delta
new file mode 100644
index 000..fe488ff
Binary files /dev/null and b/freedink-data_1.08.20110723.orig.tar.gz.delta 
differ
diff --git a/freedink-data_1.08.20110723.orig.tar.gz.id 
b/freedink-data_1.08.20110723.orig.tar.gz.id
new file mode 100644
index 000..b9f2cb7
--- /dev/null
+++ b/freedink-data_1.08.20110723.orig.tar.gz.id
@@ -0,0 +1 @@
+0e1a9a9a5b5d3f047c7cb3c6080c107f8401bd67

-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data branch, master, updated. debian/1.08.20100103-1-6-ga59ac70

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit a59ac70fb2da8000a3522cf59e439e1565001ce9
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Jul 23 00:24:46 2011 +0200

New upstream release - v1.08.20110723

diff --git a/debian/changelog b/debian/changelog
index 9aa9f66..5386388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,29 @@
-freedink-data (1.08.20100102-2) UNRELEASED; urgency=low
+freedink-data (1.08.20110723-1) unstable; urgency=low
 
+  * New upstream release
   * Use http: rather than ftp: in the watch file, as FTP sometimes doesn't
 work in some NAT'd networks
   * Remove old reference to .d files
   * Add README.source and point to upstream's doc/PACKAGING
+  * Use debhelper 7
+  * Use 3.0 source format
+  * Add gbp.conf to ignore .gitignore files automatically
+  * Ignore helper-templates-in-copyright due to the presence of
+author(s) in the license text
+
+ -- Sylvain Beucler b...@debian.org  Sat, 23 Jul 2011 00:17:33 +0200
+
+freedink-data (1.08.20100103-3) unstable; urgency=low
+
+  * More updates to the Dutch translation
+
+ -- Sylvain Beucler b...@debian.org  Mon, 25 Oct 2010 23:20:11 +0200
+
+freedink-data (1.08.20100103-2) unstable; urgency=low
+
+  * Update Dutch translation (Closes: #601245)
 
- -- Sylvain Beucler b...@beuc.net  Sun, 23 May 2010 22:39:38 +0200
+ -- Sylvain Beucler b...@debian.org  Sun, 24 Oct 2010 19:33:20 +0200
 
 freedink-data (1.08.20100102-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 596ec9f..3ca4a48 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: freedink-data
 Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
-Uploaders: Sylvain Beucler b...@beuc.net
-Build-Depends: debhelper (= 5)
-Standards-Version: 3.8.3
-Homepage: http://www.freedink.org/
+Uploaders: Sylvain Beucler b...@debian.org
+Build-Depends: debhelper (= 7.0.50~)
+Standards-Version: 3.9.2
+Homepage: http://www.gnu.org/software/freedink/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink-data.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/freedink-data.git
 
diff --git a/debian/copyright b/debian/copyright
index 0b17658..ae3d873 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -84,6 +84,16 @@ Free sound replacements
 - 1.mid/Ave_Maria.mid
 Copyright: Aryliin and TboWan arsouyes.org
 License: Art Libre
+- 1.mid/Ave_Maria.mid
+Copyright: Aryliin and TboWan arsouyes.org
+License: Art Libre
+- 5.mid/5.ogg
+  5.mid/sea.mid
+  5.mid/Untitled3.mscz
+Copyright: Ofir Mo firewallsp...@gmail.com
+License: GPLv3+
+- 13.mid/CanonInD222.mid
+License: public domain
 - 104.mid/serenade-d957.rg
   104.mid/serenade-d957.mid
 Copyright (C) 2008  Sylvain Beucler
@@ -98,8 +108,7 @@ Free sound replacements
 License: GPLv3+ | Art Libre | CC-BY-SA
 - 105.mid/IMSLP14012-Debussy_-_R__verie__piano_.pdf
 License: public domain
-- 
106.mid/Felix_Mendelssohn_-_Violinkonzert_e-moll_-_1._Allegro_molto_appassionato.ogg
-  
106.mid/Felix_Mendelssohn_-_Violinkonzert_e-moll_-_1._Allegro_molto_appassionato_0m_6s_0h__3m_18s_0h.ogg
+- 
106.mid/Felix_Mendelssohn_-_Violinkonzert_e-moll_-_1._Allegro_molto_appassionato_0m_6s_0h__3m_18s_0h.ogg
 Copyright (C) 2001  Fulda Symphonic Orchestra
 License: EFF: Open Audio License version 1
 - denube.mid/An_der_schönem_blauen_Donau.ogg
@@ -117,7 +126,7 @@ Sound effects
 =
 
 - intro.wav/intro.wav
-not copyrightable (1 frame of silence)
+  not copyrightable (1 frame of silence)
 - fire.wav/fire_long.wav
 Copyright (C) 1999-2007  The Berklee College of Music Sampling Archive
 License: CC-BY 3.0
@@ -132,7 +141,10 @@ Sound effects
 License: CC-BY 3.0
 - gold.wav/gold.ogg (orig: gold.ogg)
   bird1.wav (orig: bird2.ogg)
-(/usr/share/games/wesnoth/data/core/sounds/ from the Wesnoth project)
+  arrow.wav (orig: bow-hit.ogg)
+  bow1.wav (orig: bow-miss.ogg)
+  sword2.wav (orig: spear.ogg)
+  (/usr/share/games/wesnoth/data/core/sounds/ from the Wesnoth project)
 Copyright (C) 2003 - 2007 by David White d...@whitevine.net
 Copyright (C) 2004 - 2007 by Guillaume Melquiond 
guillaume.melqui...@gmail.com
 Copyright (C) 2004 - 2007 by Philippe Plantier a...@anathas.org
@@ -155,11 +167,36 @@ Sound effects
 - gold.wav/gold.aup
   gold.wav/gold_data
   gold.wav/gold.ogg
-Based on gold.wav above, plus:
+  Based on gold.wav above, plus:
 Copyright (C) 2008  Sylvain Beucler
+- arrow.wav
+  Based on arrow.wav above, plus:
+Copyright (C) 2010  Petteri Tolonen
+- bow1.wav
+  Based on arrow.wav above, plus:
+Copyright (C) 2010  Petteri Tolonen
+- sword2.wav
+  Based on arrow.wav above, plus:
+Copyright (C) 2010  Petteri Tolonen
 - high2.wav
 Copyright (C) 2009  Sylvain Beucler
 License: GPLv3+ | Art Libre | CC-BY-SA
+- wscream.wav
+Copyright (C) 2009  Fernando Carmona Varo
+License: WTFPL
+
+
+Translations
+
+
+- dink/l10n/da.po

[SCM] Packaging for freedink-data annotated tag, debian/1.08.20110723-1, created. debian/1.08.20110723-1

[Sylvain Beucler]

The annotated tag, debian/1.08.20110723-1 has been created
at  23196db8c9d8b6eba7b0182968451de35398fe92 (tag)
   tagging  a59ac70fb2da8000a3522cf59e439e1565001ce9 (commit)
  replaces  debian/1.08.20100103-1
 tagged by  Sylvain Beucler
on  Sat Jul 23 00:52:41 2011 +0200

- Shortlog 
Debian release 1.08.20110723-1

Sylvain Beucler (6):
  Doc fixes
  Clarify GPL version used for packaging
  Imported Upstream version 1.08.20110723
  Imported Upstream version 1.08.20110723
  Merge commit 'upstream/1.08.20110723'
  New upstream release - v1.08.20110723

---

-- 
Packaging for freedink-data

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

[SCM] Packaging for freedink-data annotated tag, upstream/1.08.20110723, created. upstream/1.08.20110723

[Sylvain Beucler]

The annotated tag, upstream/1.08.20110723 has been created
at  e6d053a3809d0d5f9e746e821789ce81a8739a8e (tag)
   tagging  0e1a9a9a5b5d3f047c7cb3c6080c107f8401bd67 (commit)
  replaces  upstream/1.08.20100103
 tagged by  Sylvain Beucler
on  Sat Jul 23 00:23:54 2011 +0200

- Shortlog 
Upstream version 1.08.20110723

Sylvain Beucler (2):
  Imported Upstream version 1.08.20110723
  Imported Upstream version 1.08.20110723

---

-- 
Packaging for freedink-data

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-18-g2e0dfcf

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 8910349485f5c75dee698416399e0c94d6b1d3d4
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Jul 23 00:55:21 2011 +0200

Re-upload experimental-unstable + minor fixes

diff --git a/debian/changelog b/debian/changelog
index 9407925..44e0df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gargoyle-free (2010.1-2) unstable; urgency=low
+
+  * Depend on libjpeg-dev rather than libjpeg62-dev
+  Cf. http://lists.debian.org/debian-devel-announce/2010/02/msg6.html
+  Thanks to Bill Allombert
+  * Bump Standards-Version to 3.9.2
+  * Ignore helper-templates-in-copyright due to the presence of
+author(s) in the license text
+
+ -- Sylvain Beucler b...@debian.org  Sat, 23 Jul 2011 00:02:01 +0200
+
 gargoyle-free (2010.1-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 54f24ff..e65a7e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg62-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev
-Standards-Version: 3.9.1.0
+Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev
+Standards-Version: 3.9.2
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/gargoyle-free.git
diff --git a/debian/gargoyle-free.lintian-overrides 
b/debian/gargoyle-free.lintian-overrides
index c088664..9113afa 100644
--- a/debian/gargoyle-free.lintian-overrides
+++ b/debian/gargoyle-free.lintian-overrides
@@ -1,2 +1,4 @@
 # The list has one paragraph per item and is meant to be word-wrapped
 possible-unindented-list-in-extended-description
+# The SIL OPEN FONT LICENSE Version 1.0 contains author(s) - OMG!
+helper-templates-in-copyright

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-18-g2e0dfcf

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 2e0dfcf51b15820c8c890226ea7046a77cdfc70d
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Jul 23 01:24:05 2011 +0200

Include closed bug for libjpeg dependency fix

diff --git a/debian/changelog b/debian/changelog
index 44e0df7..d4d43cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 gargoyle-free (2010.1-2) unstable; urgency=low
 
-  * Depend on libjpeg-dev rather than libjpeg62-dev
+  * Depend on libjpeg-dev rather than libjpeg62-dev (Closes: #633939)
   Cf. http://lists.debian.org/debian-devel-announce/2010/02/msg6.html
   Thanks to Bill Allombert
   * Bump Standards-Version to 3.9.2

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] ballz (platform/puzzle game) branch, master, updated. debian/1.0.1-1-14-gaa6c912

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit aa6c912cb9e190756b8500bc7420e1ab4c1a5584
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Jun 5 22:47:42 2011 +0200

Ready for pushing

diff --git a/debian/changelog b/debian/changelog
index 633aeb4..128224e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ballz (1.0.2-1) UNRELEASED; urgency=low
+ballz (1.0.2-1) unstable; urgency=low
 
   [ Sylvain Beucler ]
   * New upstream release (Closes: #626765).
@@ -18,7 +18,7 @@ ballz (1.0.2-1) UNRELEASED; urgency=low
   * Add the Vcs-Git and Vcs-Browser source control fields
   * Bump the debhelper compat level to 8 and reorder the dh parameters
   
- -- Sylvain Beucler b...@debian.org  Mon, 16 May 2011 21:50:52 +0200
+ -- Sylvain Beucler b...@debian.org  Sun, 05 Jun 2011 22:47:16 +0200
 
 ballz (1.0.1-2) unstable; urgency=low
 

-- 
ballz (platform/puzzle game)

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

[SCM] ballz (platform/puzzle game) branch, master, updated. debian/1.0.1-1-14-gaa6c912

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 9a475e83c1a36904d888c1580f1c348c471b649d
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Jun 5 22:37:09 2011 +0200

Fix reference to GPL 2

diff --git a/debian/copyright b/debian/copyright
index be44d95..9c5bfe5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,7 +42,7 @@ Copyright: (C) 2008, 2011 Sylvain Beucler b...@debian.org
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
  .
  On Debian systems, the complete text of the GNU General Public License

-- 
ballz (platform/puzzle game)

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

[SCM] ballz (platform/puzzle game) branch, master, updated. debian/1.0.1-1-14-gaa6c912

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit e71af09c48f7e3e4101822d82851d4dc98f9761e
Merge: 9a475e83c1a36904d888c1580f1c348c471b649d 
edef255c91deb72fbeff389845329c1a3f54cf2e
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Jun 5 22:38:08 2011 +0200

Merge commit 'upstream/1.0.2'


-- 
ballz (platform/puzzle game)

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

[SCM] ballz (platform/puzzle game) branch, pristine-tar, updated. 4dbc94de2aaa0c4ab983b6b26703a59a650160fc

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 4dbc94de2aaa0c4ab983b6b26703a59a650160fc
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Jun 5 22:38:08 2011 +0200

pristine-tar data for ballz_1.0.2.orig.tar.gz

diff --git a/ballz_1.0.2.orig.tar.gz.delta b/ballz_1.0.2.orig.tar.gz.delta
new file mode 100644
index 000..ee88581
Binary files /dev/null and b/ballz_1.0.2.orig.tar.gz.delta differ
diff --git a/ballz_1.0.2.orig.tar.gz.id b/ballz_1.0.2.orig.tar.gz.id
new file mode 100644
index 000..59ac2ad
--- /dev/null
+++ b/ballz_1.0.2.orig.tar.gz.id
@@ -0,0 +1 @@
+edef255c91deb72fbeff389845329c1a3f54cf2e

-- 
ballz (platform/puzzle game)

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

[SCM] ballz (platform/puzzle game) annotated tag, upstream/1.0.2, created. upstream/1.0.2

[Sylvain Beucler]

The annotated tag, upstream/1.0.2 has been created
at  ae4d5e08c1b8b15c2a73b9fdfb48c5ab95c19f79 (tag)
   tagging  edef255c91deb72fbeff389845329c1a3f54cf2e (commit)
  replaces  upstream/1.0.1
 tagged by  Sylvain Beucler
on  Sun Jun 5 22:38:08 2011 +0200

- Shortlog 
Upstream version 1.0.2

Sylvain Beucler (1):
  Imported Upstream version 1.0.2

---

-- 
ballz (platform/puzzle game)

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-9-g4f30ce4

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 4f30ce4d0a8c8ef900cbee132f544bf2d64aea82
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Mar 26 10:02:51 2011 +0100

Upgrade packaging to debhelper 7 and source format 3.0 (quilt)

diff --git a/debian/changelog b/debian/changelog
index ac801c0..60ba74f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freedink (1.08.20110229-1) UNRELEASED; urgency=low
+
+  * New Upstream Version
+  * Upgrade packaging to debhelper 7 and source format 3.0 (quilt)
+
+ -- Sylvain Beucler b...@debian.org  Sat, 26 Mar 2011 08:11:34 +0100
+
 freedink (1.08.20101114-1) experimental; urgency=low
 
   * Precise licenses versions in debian/copyright, fixes
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/copyright b/debian/copyright
index 8f175d4..e006288 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ The original source can always be found at:
http://ftp.gnu.org/gnu/freedink/
 
 Copyright (C) 1997, 1998, 1999, 2002, 2003  Seth A. Robinson
-Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010  Sylvain Beucler
+Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011  Sylvain Beucler
 Copyright (C) 2005, 2006  Dan Walma
 Copyright (C) 2003  Shawn Betts
 Copyright (C) 2001  Guido Draheim
@@ -22,6 +22,7 @@ de - public domain
 el - Copyright (C) 2010  Michael Kotsarinis
 it - Copyright (C) 2010  Vincenzo Campanella
 cs - Copyright (C) 2010  Marek Černocký
+eo - Copyright (C) 2011  Felipe Castro
 
 License:
 
@@ -182,7 +183,7 @@ in ./src and ./test/sdl are covered by the ZLIB license:
   3. This notice may not be removed or altered from any source distribution.
 
 
-The Debian packaging is Copyright (C) 2008, 2009, 2010, Sylvain
+The Debian packaging is Copyright (C) 2008, 2009, 2010, 2011, Sylvain
 Beucler b...@beuc.net and is licensed under the GPL, either version
 3, or (at your option) any later version, see
 `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/rules b/debian/rules
index f8f8423..180cd43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,108 +1,50 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-
-# It was built from:
-#   dh_make --single --native --email b...@beuc.net --copyright gpl \
-# --packagename freedink
-# then modified.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-SRC := $(CURDIR)
-BUILD   := $(CURDIR)/debian/build.tmp
-# default dh_make target
-TARGET  := $(CURDIR)/debian/freedink-engine
-
-#CFLAGS = -Wall -g
-CFLAGS = -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-   CFLAGS += -O0
-else
-   CFLAGS += -O2
-endif
-
-$(BUILD)/config.status: configure
-   dh_testdir
-   [ -d $(BUILD) ] || mkdir $(BUILD)
 
+%:
+   dh $@ --parallel --with autotools_dev
#Install autotools-dev's config.sub and config.guess, if newer:
-   chmod 755 debian/update-autotools-config.sh
-   debian/update-autotools-config.sh autotools/
+   #chmod 755 debian/update-autotools-config.sh
+   #debian/update-autotools-config.sh autotools/
 
+override_dh_auto_configure:
# Using '--bindir=/usr/games' by Debian policy
#   (e.g. not the case for Fedora)
# Using '--disable-embedded-resources' because 'dh_strip' will remove
#   them anyway, and we need it for the -dbg package -- too bad :/
-   cd $(BUILD)  $(SRC)/configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games 
--datadir=/usr/share/games --disable-embedded-resources CFLAGS=$(CFLAGS) 
LDFLAGS=-Wl,-z,defs
-
-
-build: debian/build-stamp
-
-debian/build-stamp:  $(BUILD)/config.status
-   dh_testdir
-
-   # Add here commands to compile the package.
-   $(MAKE) -C $(BUILD)
-
-   touch $@
+   dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games 
--disable-embedded-resources 
 
-clean:
-   dh_testdir
-   dh_testroot
-   rm -f debian/build-stamp 
-
-   # Add here commands to clean up after the build process.
-   [ ! -e $(BUILD) ] || $(MAKE) -C $(BUILD) distclean

[SCM] Packaging for DFArc branch, master, updated. debian/3.8-1-3-gfb0d809

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit fb0d809d04a805211cd1264118f07bb253227bb6
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 11:08:01 2010 +0100

New upstream release - v3.8.1

diff --git a/debian/changelog b/debian/changelog
index 2ecd327..be09ff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freedink-dfarc (3.8.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sylvain Beucler b...@debian.org  Sun, 14 Nov 2010 10:10:10 +0100
+
 freedink-dfarc (3.8-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/copyright b/debian/copyright
index 2e37dc3..d2d8202 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,7 @@ fr - Copyright (C) 2008, 2009, 2010  Free Software Foundation
 it - Copyright (C) 2008  Davide Prina
  Copyright (C) 2010  Vincenzo Campanella
 mk - Copyright (C) 2008  Free Software Foundation
+nl - Copyright (C) 2010  Free Software Foundation
 pl - Copyright (C) 2008  GOKUSSJ6
  Copyright (C) 2009, 2010  Michał Trzebiatowski
 vi - Copyright (C) 2009, 2010  Free Software Foundation

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc branch, master, updated. debian/3.8-1-3-gfb0d809

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit e06e796897ce9d1b2dbddb7eb60f2e3deff78a38
Merge: 4dc7ea619b6e73fbb3dd76f3a06e0b5f68f2179d 
ffbb2b1b5735b428c15eb1049f7f41a5f75505e6
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 11:06:57 2010 +0100

Merge commit 'upstream/3.8.1'


-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc branch, pristine-tar, updated. 943569f2a6822b1d9fac6be2694f576eccb4edb7

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 943569f2a6822b1d9fac6be2694f576eccb4edb7
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 11:06:57 2010 +0100

pristine-tar data for freedink-dfarc_3.8.1.orig.tar.gz

diff --git a/freedink-dfarc_3.8.1.orig.tar.gz.delta 
b/freedink-dfarc_3.8.1.orig.tar.gz.delta
new file mode 100644
index 000..e29e4ce
Binary files /dev/null and b/freedink-dfarc_3.8.1.orig.tar.gz.delta differ
diff --git a/freedink-dfarc_3.8.1.orig.tar.gz.id 
b/freedink-dfarc_3.8.1.orig.tar.gz.id
new file mode 100644
index 000..1e5b409
--- /dev/null
+++ b/freedink-dfarc_3.8.1.orig.tar.gz.id
@@ -0,0 +1 @@
+ffbb2b1b5735b428c15eb1049f7f41a5f75505e6

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc annotated tag, debian/3.8.1-1, created. debian/3.8.1-1

[Sylvain Beucler]

The annotated tag, debian/3.8.1-1 has been created
at  1f6b96c880b3e45a6c3f74ed11dfe1a3c30223d8 (tag)
   tagging  fb0d809d04a805211cd1264118f07bb253227bb6 (commit)
  replaces  debian/3.8-1
 tagged by  Sylvain Beucler
on  Sun Nov 14 11:09:01 2010 +0100

- Shortlog 
Debian release 3.8.1-1

Sylvain Beucler (3):
  Imported Upstream version 3.8.1
  Merge commit 'upstream/3.8.1'
  New upstream release - v3.8.1

---

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc annotated tag, upstream/3.8.1, created. upstream/3.8.1

[Sylvain Beucler]

The annotated tag, upstream/3.8.1 has been created
at  a7dad2feea0ad77c0449a5070183c1c556064869 (tag)
   tagging  ffbb2b1b5735b428c15eb1049f7f41a5f75505e6 (commit)
  replaces  upstream/3.8
 tagged by  Sylvain Beucler
on  Sun Nov 14 11:06:57 2010 +0100

- Shortlog 
Upstream version 3.8.1

Sylvain Beucler (1):
  Imported Upstream version 3.8.1

---

-- 
Packaging for DFArc

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-8-g214cb44

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit b58074615e38cc6dc873c495a8b224646d752c98
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 00:44:09 2010 +0100

Sync upstream's debian/

diff --git a/debian/changelog b/debian/changelog
index 7784f6b..138d5b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ freedink (1.08.20100420-2) UNRELEASED; urgency=low
   * Precise licenses versions in debian/copyright, fixes
 copyright-refers-to-symlink-license lintian warning
   * Update copyright about new translations
-  * Symlink 'freedink' documentation to 'freedink-engine'
+  * Symlink 'freedink' documentation to 'freedink-engine' (requires
+debhelper = 7.4.2)
 
- -- Sylvain Beucler b...@debian.org  Sat, 30 Oct 2010 15:30:07 +0200
+ -- Sylvain Beucler b...@debian.org  Fri, 12 Nov 2010 19:41:35 +0100
 
 freedink (1.08.20100420-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d87d647..49a5f9b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@beuc.net
-Build-Depends: debhelper (= 5), autotools-dev, pkg-config, libsdl1.2-dev, 
libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, 
libfontconfig1-dev
+Build-Depends: debhelper (= 7.4.2), autotools-dev, pkg-config, libsdl1.2-dev, 
libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, 
libfontconfig1-dev
 Standards-Version: 3.8.4
 Homepage: http://www.freedink.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink.git
diff --git a/debian/copyright b/debian/copyright
index 492e3ae..8f175d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,7 @@ id - Copyright (C) 2009  Erwid M Jadied
 de - public domain
 el - Copyright (C) 2010  Michael Kotsarinis
 it - Copyright (C) 2010  Vincenzo Campanella
+cs - Copyright (C) 2010  Marek Černocký
 
 License:
 
diff --git a/debian/rules b/debian/rules
index 6903181..f8f8423 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,7 @@ binary-indep: build install
 binary-arch: build install
dh_testdir
dh_testroot
+   # --link-doc requires debhelper 7.4.2
dh_installdocs --link-doc=freedink-engine
dh_installchangelogs ChangeLog
 #  dh_installexamples

-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-8-g214cb44

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit e8997a37f8de330550448e07a398421280649d4c
Merge: b58074615e38cc6dc873c495a8b224646d752c98 
29bca32709150676557cda240e4d80b1f9ad
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 00:45:06 2010 +0100

Merge commit 'upstream/1.08.20101114'


-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-8-g214cb44

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit fdf6580f848aa7e2d5d6816270c71343c28d060d
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 00:50:16 2010 +0100

Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index 138d5b3..d45e2c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-freedink (1.08.20100420-2) UNRELEASED; urgency=low
+freedink (1.08.20100420-2) experimental; urgency=low
 
   * Precise licenses versions in debian/copyright, fixes
 copyright-refers-to-symlink-license lintian warning
   * Update copyright about new translations
   * Symlink 'freedink' documentation to 'freedink-engine' (requires
 debhelper = 7.4.2)
+  * Bump Standards-Version to 3.9.1
 
- -- Sylvain Beucler b...@debian.org  Fri, 12 Nov 2010 19:41:35 +0100
+ -- Sylvain Beucler b...@debian.org  Sun, 14 Nov 2010 00:49:26 +0100
 
 freedink (1.08.20100420-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 49a5f9b..55ed610 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@beuc.net
 Build-Depends: debhelper (= 7.4.2), autotools-dev, pkg-config, libsdl1.2-dev, 
libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, 
libfontconfig1-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.freedink.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/freedink.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/freedink.git

-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-8-g214cb44

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 944f2ea55a1f6ac045b358bc8eb391624198a412
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 00:54:49 2010 +0100

Fix new version

diff --git a/debian/changelog b/debian/changelog
index d45e2c7..a9d6289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-freedink (1.08.20100420-2) experimental; urgency=low
+freedink (1.08.20101114-1) experimental; urgency=low
 
   * Precise licenses versions in debian/copyright, fixes
 copyright-refers-to-symlink-license lintian warning

-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-8-g214cb44

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 214cb4405388c8dc64ea7a46e38f7f11b69329af
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 01:00:09 2010 +0100

Update e-mail address

diff --git a/debian/changelog b/debian/changelog
index a9d6289..ac801c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ freedink (1.08.20101114-1) experimental; urgency=low
   * Symlink 'freedink' documentation to 'freedink-engine' (requires
 debhelper = 7.4.2)
   * Bump Standards-Version to 3.9.1
+  * Update my email address in Uploaders
 
- -- Sylvain Beucler b...@debian.org  Sun, 14 Nov 2010 00:49:26 +0100
+ -- Sylvain Beucler b...@debian.org  Sun, 14 Nov 2010 00:59:28 +0100
 
 freedink (1.08.20100420-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 55ed610..66c457d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: freedink
 Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
-Uploaders: Sylvain Beucler b...@beuc.net
+Uploaders: Sylvain Beucler b...@debian.org
 Build-Depends: debhelper (= 7.4.2), autotools-dev, pkg-config, libsdl1.2-dev, 
libsdl-gfx1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, 
libfontconfig1-dev
 Standards-Version: 3.9.1
 Homepage: http://www.freedink.org/

-- 
Packaging for freedink

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

[SCM] Packaging for freedink branch, pristine-tar, updated. 085eb6ab04046085e533155448eaf1076fb4c919

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 085eb6ab04046085e533155448eaf1076fb4c919
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 00:45:06 2010 +0100

pristine-tar data for freedink_1.08.20101114.orig.tar.gz

diff --git a/freedink_1.08.20101114.orig.tar.gz.delta 
b/freedink_1.08.20101114.orig.tar.gz.delta
new file mode 100644
index 000..21026cf
Binary files /dev/null and b/freedink_1.08.20101114.orig.tar.gz.delta differ
diff --git a/freedink_1.08.20101114.orig.tar.gz.id 
b/freedink_1.08.20101114.orig.tar.gz.id
new file mode 100644
index 000..e0e04e7
--- /dev/null
+++ b/freedink_1.08.20101114.orig.tar.gz.id
@@ -0,0 +1 @@
+29bca32709150676557cda240e4d80b1f9ad

-- 
Packaging for freedink

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

[SCM] Packaging for freedink annotated tag, upstream/1.08.20101114, created. upstream/1.08.20101114

[Sylvain Beucler]

The annotated tag, upstream/1.08.20101114 has been created
at  b30dc306c023389ea74c96251d082879fa174ea2 (tag)
   tagging  29bca32709150676557cda240e4d80b1f9ad (commit)
  replaces  upstream/1.08.20100420
 tagged by  Sylvain Beucler
on  Sun Nov 14 00:45:06 2010 +0100

- Shortlog 
Upstream version 1.08.20101114

Sylvain Beucler (1):
  Imported Upstream version 1.08.20101114

---

-- 
Packaging for freedink

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

[SCM] Packaging for freedink tag, debian/1.08.20101114-1, created. debian/1.08.20100420-1-8-g214cb44

[Sylvain Beucler]

The tag, debian/1.08.20101114-1 has been created
at  214cb4405388c8dc64ea7a46e38f7f11b69329af (commit)

- Shortlog 
commit 214cb4405388c8dc64ea7a46e38f7f11b69329af
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Nov 14 01:00:09 2010 +0100

Update e-mail address
---

-- 
Packaging for freedink

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

[SCM] Packaging for DFArc branch, master, updated. debian/3.6-1-4-g4dc7ea6

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 5898ca4510caa78954aa021d7251760e7ccba62d
Merge: 0f8b91586c4a3a2474d49c8870f1d24cf5bdeb46 
f9131f813edc469698ae248bec306c1d6b80e285
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Oct 30 08:36:41 2010 +0200

Merge commit 'upstream/3.8'


-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc branch, pristine-tar, updated. 3353e2a0e76f36c99d8334563fb9ab7a6d46f2ff

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit 3353e2a0e76f36c99d8334563fb9ab7a6d46f2ff
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Oct 30 08:36:41 2010 +0200

pristine-tar data for freedink-dfarc_3.8.orig.tar.gz

diff --git a/freedink-dfarc_3.8.orig.tar.gz.delta 
b/freedink-dfarc_3.8.orig.tar.gz.delta
new file mode 100644
index 000..c9a163f
Binary files /dev/null and b/freedink-dfarc_3.8.orig.tar.gz.delta differ
diff --git a/freedink-dfarc_3.8.orig.tar.gz.id 
b/freedink-dfarc_3.8.orig.tar.gz.id
new file mode 100644
index 000..aede8c1
--- /dev/null
+++ b/freedink-dfarc_3.8.orig.tar.gz.id
@@ -0,0 +1 @@
+f9131f813edc469698ae248bec306c1d6b80e285

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc annotated tag, upstream/3.8, created. upstream/3.8

[Sylvain Beucler]

The annotated tag, upstream/3.8 has been created
at  da2467098d695f7897c1f3a8a108651326a18123 (tag)
   tagging  f9131f813edc469698ae248bec306c1d6b80e285 (commit)
  replaces  upstream/3.6
 tagged by  Sylvain Beucler
on  Sat Oct 30 08:36:41 2010 +0200

- Shortlog 
Upstream version 3.8

Sylvain Beucler (1):
  Imported Upstream version 3.8

---

-- 
Packaging for DFArc

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

[SCM] Packaging for DFArc annotated tag, debian/3.8-1, created. debian/3.8-1

[Sylvain Beucler]

The annotated tag, debian/3.8-1 has been created
at  fb10c3479bdeacba7b08fee6f9561cd60f532268 (tag)
   tagging  4dc7ea619b6e73fbb3dd76f3a06e0b5f68f2179d (commit)
  replaces  debian/3.6-1
 tagged by  Sylvain Beucler
on  Sat Oct 30 09:18:35 2010 +0200

- Shortlog 
Debian release 3.8-1

Sylvain Beucler (4):
  Doc fixes
  Imported Upstream version 3.8
  Merge commit 'upstream/3.8'
  New upstream release - v3.8

---

-- 
Packaging for DFArc

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

[SCM] Packaging for freedink branch, master, updated. debian/1.08.20100420-1-2-g6a40242

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 6a4024293bd86fd07c3596604db0840b5b35cd7d
Author: Sylvain Beucler b...@beuc.net
Date:   Sat Oct 30 15:33:20 2010 +0200

Update copyright; symlink meta-package documentation

diff --git a/debian/changelog b/debian/changelog
index 13ab381..7784f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ freedink (1.08.20100420-2) UNRELEASED; urgency=low
 
   * Precise licenses versions in debian/copyright, fixes
 copyright-refers-to-symlink-license lintian warning
+  * Update copyright about new translations
+  * Symlink 'freedink' documentation to 'freedink-engine'
 
- -- Sylvain Beucler b...@beuc.net  Sat, 01 May 2010 10:11:19 +0200
+ -- Sylvain Beucler b...@debian.org  Sat, 30 Oct 2010 15:30:07 +0200
 
 freedink (1.08.20100420-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index da3f13e..492e3ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,8 @@ da - public domain
 vi - Copyright (C) 2009  Free Software Foundation.
 id - Copyright (C) 2009  Erwid M Jadied
 de - public domain
+el - Copyright (C) 2010  Michael Kotsarinis
+it - Copyright (C) 2010  Vincenzo Campanella
 
 License:
 
diff --git a/debian/rules b/debian/rules
index 317df24..6903181 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,8 +86,8 @@ binary-indep: build install
 binary-arch: build install
dh_testdir
dh_testroot
+   dh_installdocs --link-doc=freedink-engine
dh_installchangelogs ChangeLog
-   dh_installdocs
 #  dh_installexamples
dh_install
dh_installmenu

-- 
Packaging for freedink

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

[SCM] Packaging for freedink-data tag, debian/1.08.20100103-2, created. debian/1.08.20100103-1-1-gdc56387

[Sylvain Beucler]

The tag, debian/1.08.20100103-2 has been created
at  dc56387d7a32855a8adcaf06580b5f2a6357922a (commit)

- Shortlog 
commit dc56387d7a32855a8adcaf06580b5f2a6357922a
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Oct 24 19:45:43 2010 +0200

Update Dutch translation
---

-- 
Packaging for freedink-data

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games tag, debian/2010.1-1, created. debian/2009-08-25-1-16-g3235a19

[Sylvain Beucler]

The tag, debian/2010.1-1 has been created
at  3235a19d0f80873977fbede1a77047a07d791e9c (commit)

- Shortlog 
commit 3235a19d0f80873977fbede1a77047a07d791e9c
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Oct 1 21:15:19 2010 +0200

Fix upstream desktop menu entry
---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, upstream/2010.1, created. upstream/2010.1

[Sylvain Beucler]

The annotated tag, upstream/2010.1 has been created
at  f716d7338bb5b96c3bd6ff1af7da881bfad8 (tag)
   tagging  688386833eae144876d2488a511400b8cda95907 (commit)
 tagged by  Sylvain Beucler
on  Fri Oct 1 19:44:40 2010 +0200

- Shortlog 
Upstream version 2010.1

Sylvain Beucler (4):
  Imported Upstream version 2009-08-25
  Imported Upstream version 2009-08-25
  Imported Upstream version 2009-08-25
  Imported Upstream version 2010.1

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-14-g289860f

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 735b3f99efd0ff4c98893c792084ac8bd687e2d5
Merge: a86877a07e23446ce3b90a7ec4b12bfeec01d833 
688386833eae144876d2488a511400b8cda95907
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Oct 1 19:44:40 2010 +0200

Merge commit 'upstream/2010.1'


-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-14-g289860f

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 289860f642bd01f38d82141984223a079011d2e9
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Oct 1 20:30:01 2010 +0200

Add copyright info about additional unused fonts present in the source 
tarball

diff --git a/debian/changelog b/debian/changelog
index d82821e..117e425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gargoyle-free (2010.1-1) experimental; urgency=low
 
   * New upstream release
+  * Update debian/copyright
   * Adjust font dependencies to use the new default fonts (Liberation Mono
 and Linux Libertine O instead of DejaVu Sans)
   * Build convenience library statically
@@ -12,7 +13,7 @@ gargoyle-free (2010.1-1) experimental; urgency=low
 than in the executable's directory - following upstream's advice)
   * Remove patches merged upstream or obsoleted
 
- -- Sylvain Beucler b...@debian.org  Tue, 28 Sep 2010 21:45:55 +0200
+ -- Sylvain Beucler b...@debian.org  Fri, 01 Oct 2010 20:28:01 +0200
 
 gargoyle-free (2009-08-25-2) unstable; urgency=high
 
diff --git a/debian/copyright b/debian/copyright
index 3d3d31b..ea92a5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -102,6 +102,8 @@ Copyright:
 Copyright (C) 1999 Evin Robertson
 Copyright (C) 1987-2009 Michael J. Roberts
 Copyright (c) 1989-1992 Bistream Inc., Cambridge, MA
+Copyright: (C) 2007 Red Hat, Inc.
+Copyright: (C) 2003-2009 Philipp H. Poll 
philthel...@users.sourceforge.net
 
 License:
 
@@ -221,3 +223,201 @@ released under the following license:
 below on all unmodified copies of the 4 Charter Type 1
 fonts. BITSTREAM CHARTER is a registered trademark of Bitstream
 Inc.
+
+The Liberation fonts (not used but included in the source release)
+(LIBERATION is a trademark of Red Hat, Inc.) are released under the
+following license:
+
+ This agreement governs the use of the Software and any updates to the 
Software,
+ regardless of the delivery mechanism. Subject to the following terms, Red 
Hat, Inc.
+ (Red Hat) grants to the user (Client) a license to this work pursuant to 
+ the GNU General Public License v.2 with the exceptions set forth below and 
such 
+ other terms as our set forth in this End User License Agreement.
+
+ 1. The Software and License Exception. LIBERATION font software  (the 
Software)
+ consists of TrueType-OpenType formatted font software for rendering LIBERATION
+ typefaces in sans serif, serif, and monospaced character styles. You are 
licensed 
+ to  use, modify, copy, and distribute the Software pursuant to the GNU General
+ Public License v.2 with the following exceptions:  
+
+ (a) As a special exception, if you create a document which uses this font, 
and 
+ embed this font or unaltered portions of this font into the document, this
+ font does not by itself cause the resulting document to be covered by the 
+ GNU General Public License.  This exception does not however invalidate 
any
+ other reasons why the document might be covered by the GNU General Public 
+ License.  If you modify this font, you may extend this exception to your 
+ version of the font, but you are not obligated to do so. If you do not 
+ wish to do so, delete this exception statement from your version.
+
+ (b) As a further exception, any distribution of the object code of the 
Software 
+ in a physical product must provide you the right to access and modify the
+ source code for the Software and to reinstall that modified version of 
the 
+ Software in object code form on the same physical product on which you 
+ received it.
+
+ 2. Intellectual Property Rights. The Software and each of its components, 
including 
+the source code, documentation, appearance, structure and organization are 
owned 
+by Red Hat and others and are protected under copyright and other laws. 
Title to 
+the Software and any component, or to any copy, modification, or merged 
portion
+shall remain with the aforementioned, subject to the applicable license. 
+The LIBERATION trademark is a trademark of Red Hat, Inc. in the U.S. and 
other
+countries. This agreement does not permit Client to distribute modified 
versions 
+of the Software using Red Hat's trademarks. If Client makes a 
redistribution of 
+a modified version of the Software, then Client must modify the files 
names to 
+remove any reference to the Red Hat trademarks and must not use the Red 
Hat 
+trademarks in any way to reference or promote the modified Software. 
+
+ 3. Limited Warranty. To the maximum extent permitted under applicable law, 
the 
+Software is provided and licensed as is without warranty of any kind, 
+expressed or implied, including the implied warranties of merchantability, 
+non-infringement or fitness for a particular purpose. Red Hat does not 
warrant
+that the functions contained in the Software will meet Client's 
requirements

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, pristine-tar, updated. d84d1485e13683e322f6d3463b769f3a8699a40b

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit d84d1485e13683e322f6d3463b769f3a8699a40b
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Oct 1 19:44:39 2010 +0200

pristine-tar data for gargoyle-free_2010.1.orig.tar.gz

diff --git a/gargoyle-free_2010.1.orig.tar.gz.delta 
b/gargoyle-free_2010.1.orig.tar.gz.delta
new file mode 100644
index 000..6410c72
Binary files /dev/null and b/gargoyle-free_2010.1.orig.tar.gz.delta differ
diff --git a/gargoyle-free_2010.1.orig.tar.gz.id 
b/gargoyle-free_2010.1.orig.tar.gz.id
new file mode 100644
index 000..e50255b
--- /dev/null
+++ b/gargoyle-free_2010.1.orig.tar.gz.id
@@ -0,0 +1 @@
+688386833eae144876d2488a511400b8cda95907

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-15-g25bc3b1

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 25bc3b1073f3374a9e4570a457fb599c48e19fea
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Oct 1 21:03:35 2010 +0200

Menu entry

diff --git a/debian/changelog b/debian/changelog
index 117e425..9407925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ gargoyle-free (2010.1-1) experimental; urgency=low
   * Hard-code lookup path to interpreters in /usr/lib/gargoyle/ (rather
 than in the executable's directory - following upstream's advice)
   * Remove patches merged upstream or obsoleted
+  * Install new desktop menu entry and icon
 
  -- Sylvain Beucler b...@debian.org  Fri, 01 Oct 2010 20:28:01 +0200
 
diff --git a/debian/install b/debian/install
index 24b1b90..c9eda90 100644
--- a/debian/install
+++ b/debian/install
@@ -17,3 +17,6 @@ build/dist/tadsrusr/lib/gargoyle/
 #build/dist/hugo usr/lib/gargoyle/
 
 garglk/garglk.inietc/
+
+garglk/gargoyle.desktop usr/share/applications/
+garglk/gargoyle-house.png usr/share/pixmaps/
diff --git a/debian/patches/naming.patch b/debian/patches/naming.patch
new file mode 100644
index 000..a952dc9
--- /dev/null
+++ b/debian/patches/naming.patch
@@ -0,0 +1,11 @@
+Index: gargoyle-free/garglk/gargoyle.desktop
+===
+--- gargoyle-free.orig/garglk/gargoyle.desktop 2010-10-01 20:55:15.0 
+0200
 gargoyle-free/garglk/gargoyle.desktop  2010-10-01 20:55:21.0 
+0200
+@@ -6,5 +6,5 @@
+ GenericName=Interactive Fiction interpreter
+ Comment=Interactive Fiction multi-interpreter that supports all major IF 
formats
+ Icon=gargoyle-house.png
+-Exec=gargoyle
++Exec=gargoyle-free
+ Categories=Game;
diff --git a/debian/patches/series b/debian/patches/series
index 7d99cdf..95c60a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ ignore_bundled_libraries.patch
 dfsg_disable_alan.patch
 dfsg_disable_hugo.patch
 dfsg_replace_luximono_font.patch
+naming.patch

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-16-g3235a19

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 3235a19d0f80873977fbede1a77047a07d791e9c
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Oct 1 21:15:19 2010 +0200

Fix upstream desktop menu entry

diff --git a/debian/patches/desktop_menu_entry.patch 
b/debian/patches/desktop_menu_entry.patch
new file mode 100644
index 000..0f886ea
--- /dev/null
+++ b/debian/patches/desktop_menu_entry.patch
@@ -0,0 +1,29 @@
+Description: Fix issues in the .desktop file
+Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf
+Author: Sylvain Beucler b...@beuc.net
+Last-Update: 2010-10-01
+
+Index: gargoyle-free/garglk/gargoyle.desktop
+===
+--- gargoyle-free.orig/garglk/gargoyle.desktop 2010-10-01 21:11:32.0 
+0200
 gargoyle-free/garglk/gargoyle.desktop  2010-10-01 21:13:25.0 
+0200
+@@ -1,10 +1,9 @@
+-#!/usr/bin/env xdg-open
+-[Desktop Entry]
+-Version=1.0
+-Type=Application
+-Name=Gargoyle
+-GenericName=Interactive Fiction interpreter
+-Comment=Interactive Fiction multi-interpreter that supports all major IF 
formats
+-Icon=gargoyle-house.png
+-Exec=gargoyle
+-Categories=Game;
++[Desktop Entry]
++Version=1.0
++Type=Application
++Name=Gargoyle
++GenericName=Interactive Fiction interpreter
++Comment=Interactive Fiction multi-interpreter that supports all major IF 
formats
++Icon=gargoyle-house.png
++Exec=gargoyle-free
++Categories=Game;
diff --git a/debian/patches/fhs_locate_private_binaries.patch 
b/debian/patches/fhs_locate_private_binaries.patch
index 7dff077..0fdd688 100644
--- a/debian/patches/fhs_locate_private_binaries.patch
+++ b/debian/patches/fhs_locate_private_binaries.patch
@@ -6,7 +6,7 @@ Description: look for sub-binaries in /usr/lib/gargoyle/
   There are mixing feelings towards this approach on the list.
 Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277
 Author: Sylvain Beucler b...@beuc.net
-Last-Update: 2010-10-28
+Last-Update: 2010-09-28
 
 Index: gargoyle-free-2010.1/garglk/launchgtk.c
 ===
diff --git a/debian/patches/naming.patch b/debian/patches/naming.patch
deleted file mode 100644
index a952dc9..000
--- a/debian/patches/naming.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: gargoyle-free/garglk/gargoyle.desktop
-===
 gargoyle-free.orig/garglk/gargoyle.desktop 2010-10-01 20:55:15.0 
+0200
-+++ gargoyle-free/garglk/gargoyle.desktop  2010-10-01 20:55:21.0 
+0200
-@@ -6,5 +6,5 @@
- GenericName=Interactive Fiction interpreter
- Comment=Interactive Fiction multi-interpreter that supports all major IF 
formats
- Icon=gargoyle-house.png
--Exec=gargoyle
-+Exec=gargoyle-free
- Categories=Game;
diff --git a/debian/patches/series b/debian/patches/series
index 95c60a3..3de4fc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@ ignore_bundled_libraries.patch
 dfsg_disable_alan.patch
 dfsg_disable_hugo.patch
 dfsg_replace_luximono_font.patch
-naming.patch
+desktop_menu_entry.patch

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-8-gc7dcca0

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit c7dcca001f43e831d17038fde48d062a1df33af3
Author: Sylvain Beucler b...@beuc.net
Date:   Tue Sep 28 09:19:45 2010 +0200

Prepare changes for the next release (modify only debian/, not bothering to 
import the rc1 tarball in Git)

diff --git a/debian/README.source b/debian/README.source
index 05ac520..1ad614b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,3 +1,10 @@
+Origin
+==
+
+Gargoyle-free is a version of Gargoyle that only contains the
+DFSG-compliant files, cf. 'debian/copyright'.
+
+
 Patching
 
 
diff --git a/debian/changelog b/debian/changelog
index d655a84..51befa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gargoyle-free (2010.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Adjust font dependencies to use the new default fonts (Liberation Mono
+and Linux Libertine O instead of DejaVu Sans)
+  * Build convenience library statically
+  * Embed the text of BSD in debian/copyright (lintian
+copyright-refers-to-deprecated-bsd-license-file)
+  * Bump Standards-Version
+  * Use the googlecode.debian.net redirector in debian/watch
+
+ -- Sylvain Beucler b...@debian.org  Mon, 27 Sep 2010 20:12:07 +0200
+
 gargoyle-free (2009-08-25-2) unstable; urgency=high
 
   * Fix security issue in the shell wrapper, where LD_LIBRARY_PATH may be
diff --git a/debian/control b/debian/control
index 41b1f68..54f24ff 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
 Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg62-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1.0
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/gargoyle-free.git
 
 Package: gargoyle-free
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-core, ttf-dejavu-extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-liberation, 
ttf-linux-libertine
 Provides: zcode-interpreter, tads2-interpreter, tads3-interpreter
 Description: graphical player for Interactive Fiction games
  Gargoyle is an Interactive Fiction (text adventure) player that
diff --git a/debian/copyright b/debian/copyright
index 2060035..3d3d31b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,18 +18,19 @@ removed to create the -free tarball:
 without author's permission), check
 http://www.alanif.se/uploads/download/manual.pdf section L.5.
 
-  Note: the license for the Alan interpreter may change in the near
-  future (as of 2009).
-
   - terps/hugo, licenses/HUGO License.txt: non-free license
 (non-commercial use only and cannot modify the source code), it's
 displayed in the Windows installer available at
 http://www.generalcoffee.com/hugo/gethugo.html
 
-  - garglk/fonts/LuxiMonoBoldOblique.pfb,
-garglk/fonts/LuxiMonoBold.pfb, garglk/fonts/LuxiMonoOblique.pfb,
-garglk/fonts/LuxiMonoRegular.pfb, garglk/LuxiMono.txt,
-licenses/LUXI License.txt: non-free license (cannot modify the
+  Note: the license for the Alan and Hugo interpreters may change in
+  the near future (as of 2009).  Authors were contacted again in 2010:
+  
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277
+
+  - fonts/LuxiMonoBoldOblique.pfb,
+fonts/LuxiMonoBold.pfb, garglk/fonts/LuxiMonoOblique.pfb,
+fonts/LuxiMonoRegular.pfb, garglk/LuxiMono.txt,
+LUXI License.txt: non-free license (cannot modify the
 font)
 
   - support/: for the sake of convenience (e.g. no need to declare it
@@ -43,7 +44,7 @@ removed to create the -free tarball:
 
   Shortcut:
 rm -rf terps/alan?/ terps/hugo/ \
-  garglk/LuxiMono.txt garglk/fonts/LuxiMono* \
+  garglk/LuxiMono.txt fonts/LuxiMono* \
   garglk/lm?.hex support/ \
   licenses/LUXI* licenses/HUGO* \
   terps/nitfol/z_io.c.orig
@@ -52,6 +53,9 @@ Upstream Authors:
 
 Tor Andersson d91...@update.uu.se
 Ben Cressey bcres...@gmail.com
+Sylvain Beucler
+Chris Spiegel
+Jörg Walter
 David Michael Betz
 Robert Masenten rcm-m...@pacbell.net
 Simon Baldwin simon_bald...@yahoo.com
@@ -75,7 +79,11 @@ Upstream Authors:
 Copyright:
 
 Copyright (C) 2006-2009 Tor Andersson
-Copyright (C) 2008-2009 Ben Cressey
+Copyright (C) 2006-2009 Jesse McGrew
+Copyright (C) 2008-2010 Ben Cressey
+Copyright (C) 2010 Sylvain Beucler
+Copyright (C) 2010 Chris Spiegel
+Copyright (C) 2010 Jörg Walter
 Copyright (C) 2002 Ben Hines
 Copyright (C) 1986, 2009 David Michael Betz
 Copyright (C) 1996-1999, 2001 Robert Masenten
@@ -128,10 +136,31 @@ The Debian packaging

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-9-ga86877a

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit a86877a07e23446ce3b90a7ec4b12bfeec01d833
Author: Sylvain Beucler b...@beuc.net
Date:   Tue Sep 28 21:49:49 2010 +0200

More preperations for the next upstream release

diff --git a/debian/changelog b/debian/changelog
index 51befa8..d82821e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ gargoyle-free (2010.1-1) experimental; urgency=low
 copyright-refers-to-deprecated-bsd-license-file)
   * Bump Standards-Version
   * Use the googlecode.debian.net redirector in debian/watch
+  * Hard-code lookup path to interpreters in /usr/lib/gargoyle/ (rather
+than in the executable's directory - following upstream's advice)
+  * Remove patches merged upstream or obsoleted
 
- -- Sylvain Beucler b...@debian.org  Mon, 27 Sep 2010 20:12:07 +0200
+ -- Sylvain Beucler b...@debian.org  Tue, 28 Sep 2010 21:45:55 +0200
 
 gargoyle-free (2009-08-25-2) unstable; urgency=high
 
diff --git a/debian/install b/debian/install
index 2a3f494..24b1b90 100644
--- a/debian/install
+++ b/debian/install
@@ -1,7 +1,5 @@
 #build/dist/libgarglk.so usr/lib/gargoyle/
 
-build/dist/gargoyle usr/games/gargoyle-free
-
 build/dist/advsys   usr/lib/gargoyle/
 build/dist/agility  usr/lib/gargoyle/
 build/dist/frotzusr/lib/gargoyle/
diff --git a/debian/patches/dfsg_replace_luximono_font.patch 
b/debian/patches/dfsg_replace_luximono_font.patch
index ce496f4..34286ec 100644
--- a/debian/patches/dfsg_replace_luximono_font.patch
+++ b/debian/patches/dfsg_replace_luximono_font.patch
@@ -1,17 +1,11 @@
 Description: replace the non-free LuxiMono font
- Currently I'm trying DejaVu Sans Mono, though a Serif
- font may be more appropriate.  Since DejaVu Sans Mono's license is not
- compatible with the GNU GPL, it cannot be bundled in the executable,
- so here's a patch to locate and load it using FontConfig.
- .
- Games such as The Moon Watch refer to the original builtin fonts
- in their .ini configuration: LuxiMonoRegular, LuxiMonoBold,
- LuxiMonoOblique, LuxiMonoBoldOblique. In such case, we probably
- should keep the internal font names as-is (not rename them) and
- silently remap them to the free font.
-Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/62a038ac4986d2a
+ Gargoyle uses embedded fonts by default, and one of them is non-free.
+ Upstream otherwise included a Debian patch to load fonts from the
+ system, we now just have to turn that on :)
+Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/62a038ac4986d2a#87dfa1bb9c476409
+Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#258aa808e6365073
 Author: Sylvain Beucler b...@beuc.net
-Last-Update: 2009-09-13
+Last-Update: 2010-10-28
 
 Index: gargoyle-free/Jamrules
 ===
diff --git a/debian/patches/fhs_locate_private_binaries.patch 
b/debian/patches/fhs_locate_private_binaries.patch
new file mode 100644
index 000..7dff077
--- /dev/null
+++ b/debian/patches/fhs_locate_private_binaries.patch
@@ -0,0 +1,31 @@
+Description: look for sub-binaries in /usr/lib/gargoyle/
+  It might be better to link the binaries with
+  rpath=/usr/lib/gargoyle, since the binaries may be used
+  independently; however this may conflict with existing packages,
+  such as 'frotz', which would need to be divert'd.
+  There are mixing feelings towards this approach on the list.
+Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277
+Author: Sylvain Beucler b...@beuc.net
+Last-Update: 2010-10-28
+
+Index: gargoyle-free-2010.1/garglk/launchgtk.c
+===
+--- gargoyle-free-2010.1.orig/garglk/launchgtk.c   2010-09-28 
21:21:17.0 +0200
 gargoyle-free-2010.1/garglk/launchgtk.c2010-09-28 21:23:39.0 
+0200
+@@ -146,6 +146,8 @@
+ 
+ void winpath(char *buffer)
+ {
++strcpy(buffer, /usr/lib/gargoyle/);
++/*
+ char exepath[MaxBuffer] = {0};
+ unsigned int exelen;
+ 
+@@ -163,6 +165,7 @@
+ *dirpos = '\0';
+ 
+return;
++*/
+ }
+ 
+ int winexec(const char *cmd, char **args)
diff --git a/debian/patches/fhs_locate_private_library.patch 
b/debian/patches/fhs_locate_private_library.patch
deleted file mode 100644
index 4af22de..000
--- a/debian/patches/fhs_locate_private_library.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: install sub-binaries and libraries in /usr/lib/gargoyle/
-  It would be better to link the binaries with
-  rpath=/usr/lib/gargoyle, since the binaries may be used
-  independently; however this may conflict with existing packages,
-  such as 'frotz', which would need to be divert'd.
-  Upstream plans to write a new launcher either in C or zenity.
-Forwarded: 
http://groups.google.com/group/garglk-dev/browse_thread/thread/5a1aff855da9d9d8
-Author: Sylvain Beucler b...@beuc.net
-
-Index

[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-15-ge9737bb

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 20c0d12c0f7cdc52b2426a5a09c081d542548c2b
Merge: df689a5fc0354d115f785654924c69186db26ec2 
9af435503ecc2c24b4de1c431283793f227d9567
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Jul 2 21:13:49 2010 +0200

Merge commit 'upstream/1.0.1'


-- 
cytadela: old-school first person shooter

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

[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-15-ge9737bb

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit e9737bb86c4667939bcca554567ab8f32e799681
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Jul 2 21:23:33 2010 +0200

Depend on libvlc-dev = 1.1 (not 1.0)

diff --git a/debian/changelog b/debian/changelog
index 0b5c2af..537ac77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cytadela (1.0.1-1) unstable; urgency=low
+
+  * New upstream release (supports new libvlc-dev 1.1 and hence fixes
+FBTFS in latest sid)
+
+ -- Sylvain Beucler b...@debian.org  Fri, 02 Jul 2010 21:22:14 +0200
+
 cytadela (1.0.0-2) unstable; urgency=low
 
   * Fix FTBFS when building only the architecture-dependent package.
diff --git a/debian/control b/debian/control
index d550146..0757258 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@debian.org
-Build-Depends: debhelper (= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, 
mesa-common-dev, libglu1-mesa-dev, libvlc-dev
+Build-Depends: debhelper (= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, 
mesa-common-dev, libglu1-mesa-dev, libvlc-dev (= 1.1)
 Standards-Version: 3.8.4
 Homepage: http://cytadela.sf.net/
 Vcs-Git: git://git.debian.org/git/pkg-games/cytadela.git

-- 
cytadela: old-school first person shooter

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

[SCM] cytadela: old-school first person shooter branch, pristine-tar, updated. e3af6af86786cde47494b0a0e80742345402d843

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit e3af6af86786cde47494b0a0e80742345402d843
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Jul 2 21:13:44 2010 +0200

pristine-tar data for cytadela-1.0.1.tar.bz2

diff --git a/cytadela-1.0.1.tar.bz2.delta b/cytadela-1.0.1.tar.bz2.delta
new file mode 100644
index 000..3817a25
Binary files /dev/null and b/cytadela-1.0.1.tar.bz2.delta differ
diff --git a/cytadela-1.0.1.tar.bz2.id b/cytadela-1.0.1.tar.bz2.id
new file mode 100644
index 000..1a3fed0
--- /dev/null
+++ b/cytadela-1.0.1.tar.bz2.id
@@ -0,0 +1 @@
+9af435503ecc2c24b4de1c431283793f227d9567

-- 
cytadela: old-school first person shooter

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

[SCM] cytadela: old-school first person shooter tag, debian/1.0.0-1, created. upstream/0.9-10-g15689be

[Sylvain Beucler]

The tag, debian/1.0.0-1 has been created
at  15689be45a9ebe18ddc2716d9e34111759fe8f76 (commit)

- Shortlog 
commit 15689be45a9ebe18ddc2716d9e34111759fe8f76
Author: Sylvain Beucler b...@beuc.net
Date:   Mon Jun 7 15:10:47 2010 +0200

Move to 'contrib' because there's no tools to modify the game levels
---

-- 
cytadela: old-school first person shooter

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

[SCM] cytadela: old-school first person shooter tag, upstream/1.0.0, created. upstream/0.9-1-ge46f891

[Sylvain Beucler]

The tag, upstream/1.0.0 has been created
at  e46f891ab1565b722f12f854e9dd12f43e2e16a2 (commit)

- Shortlog 
commit e46f891ab1565b722f12f854e9dd12f43e2e16a2
Author: Sylvain Beucler b...@beuc.net
Date:   Sun May 16 12:34:03 2010 +0200

Imported Upstream version 1.0.0
---

-- 
cytadela: old-school first person shooter

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

[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-12-gdf689a5

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 450214a179ca4a5865a29e8173a482f6e3b94c96
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Jun 18 13:58:24 2010 +0200

Fix FTBFS when -B

diff --git a/debian/changelog b/debian/changelog
index 4d4eca9..7421787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cytadela (1.0.0-2) unstable; urgency=low
+
+  * Fix FTBFS when building only the architecture-dependent package.
+DH7's overrides and multiple Architecture: don't mix well.
+
+ -- Sylvain Beucler b...@debian.org  Fri, 18 Jun 2010 13:57:15 +0200
+
 cytadela (1.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #578703)
diff --git a/debian/rules b/debian/rules
index 3a9cf0a..a484679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,5 +35,8 @@ override_dh_installdocs:
# Group all documentation in the -data arch-indep package
dh_installdocs --link-doc=cytadela-data
# lintian extra-license-file
-   rm debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
-   rm debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
+   # Using '-f' so that build don't fail if we're just building
+   # the architecture-dependent package and not the
+   # architecture-independent one (dpkg-buildpackage -B).
+   rm -f debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
+   rm -f debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL

-- 
cytadela: old-school first person shooter

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

[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-12-gdf689a5

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit df689a5fc0354d115f785654924c69186db26ec2
Author: Sylvain Beucler b...@beuc.net
Date:   Fri Jun 18 14:17:57 2010 +0200

Detect binary-indep build differently

diff --git a/debian/changelog b/debian/changelog
index 7421787..0b5c2af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 cytadela (1.0.0-2) unstable; urgency=low
 
   * Fix FTBFS when building only the architecture-dependent package.
-DH7's overrides and multiple Architecture: don't mix well.
 
  -- Sylvain Beucler b...@debian.org  Fri, 18 Jun 2010 13:57:15 +0200
 
diff --git a/debian/rules b/debian/rules
index a484679..748db23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,9 +34,9 @@ override_dh_install:
 override_dh_installdocs:
# Group all documentation in the -data arch-indep package
dh_installdocs --link-doc=cytadela-data
+# dh_listpackages uses DH_INTERNAL_OPTIONS that is set to '-a'/'-i'/''
+ifneq (,$(findstring cytadela-data, $(shell dh_listpackages)))
# lintian extra-license-file
-   # Using '-f' so that build don't fail if we're just building
-   # the architecture-dependent package and not the
-   # architecture-independent one (dpkg-buildpackage -B).
-   rm -f debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
-   rm -f debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
+   rm debian/cytadela-data/usr/share/doc/cytadela-data/COPYING
+   rm debian/cytadela-data/usr/share/doc/cytadela-data/GNUFDL
+endif

-- 
cytadela: old-school first person shooter

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-7-g38752f0

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 766a74d1de30e2ccf08fa46b7fb9db774805abb1
Author: Sylvain Beucler b...@beuc.net
Date:   Fri May 28 18:25:15 2010 +0200

Declare package source format

diff --git a/debian/changelog b/debian/changelog
index 21ae111..e07acec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ gargoyle-free (2009-08-25-2) unstable; urgency=high
 other packaged interpreters do (Closes: #579618)
   * Remove comments from the watch file because taste differs among DDs
   * Bump Standards-Version
+  * Declare package source format (1.0)
 
- -- Sylvain Beucler b...@beuc.net  Thu, 27 May 2010 21:31:47 +0200
+ -- Sylvain Beucler b...@beuc.net  Fri, 28 May 2010 18:24:56 +0200
 
 gargoyle-free (2009-08-25-1) unstable; urgency=low
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-7-g38752f0

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 38752f0632ad6d24eaf3dcae5047fe91e67823ec
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Jun 6 21:03:47 2010 +0200

Update e-mail

diff --git a/debian/changelog b/debian/changelog
index e07acec..d655a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ gargoyle-free (2009-08-25-2) unstable; urgency=high
   * Bump Standards-Version
   * Declare package source format (1.0)
 
- -- Sylvain Beucler b...@beuc.net  Fri, 28 May 2010 18:24:56 +0200
+ -- Sylvain Beucler b...@debian.org  Thu, 03 Jun 2010 15:59:02 +0200
 
 gargoyle-free (2009-08-25-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 73156bf..41b1f68 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gargoyle-free
 Section: games
 Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
-Uploaders: Sylvain Beucler b...@beuc.net
+Uploaders: Sylvain Beucler b...@debian.org
 Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg62-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev
 Standards-Version: 3.8.4
 Homepage: http://ccxvii.net/gargoyle/

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, pristine-tar, updated. b5d104e5eff14b0289181c794353e62c8ea94b93

[Sylvain Beucler]

The following commit has been merged in the pristine-tar branch:
commit b5d104e5eff14b0289181c794353e62c8ea94b93
Author: Sylvain Beucler b...@beuc.net
Date:   Fri May 28 07:45:15 2010 +0200

pristine-tar data for gargoyle-free_2009-08-25.orig.tar.gz

Curiously, the tarball in the official Debian archive was not the same
than the one in the pristine-tar branch: some empty directories were
pruned.

diff --git a/gargoyle-free_2009-08-25.orig.tar.gz.delta 
b/gargoyle-free_2009-08-25.orig.tar.gz.delta
index a2fcb70..0cb7b68 100644
Binary files a/gargoyle-free_2009-08-25.orig.tar.gz.delta and 
b/gargoyle-free_2009-08-25.orig.tar.gz.delta differ

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games tag, upstream/2009-08-25, updated. f35d837d8e0d1542bf7819d71c41a97eef6fa341

[Sylvain Beucler]

The tag, upstream/2009-08-25 has been updated
to  f35d837d8e0d1542bf7819d71c41a97eef6fa341 (commit)
  from  e1f825cbad6a8d22bf03fdb8991c22b3b8da0263

- Shortlog 
commit f35d837d8e0d1542bf7819d71c41a97eef6fa341
Author: Sylvain Beucler b...@beuc.net
Date:   Sun Sep 13 14:16:10 2009 +0200

Imported Upstream version 2009-08-25
---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games annotated tag, debian/2009-08-25-1, created. debian/2009-08-25-1

[Sylvain Beucler]

The annotated tag, debian/2009-08-25-1 has been created
at  e3c3611df66949101fd5083fae840066fc5958dc (tag)
   tagging  5cdfd31bf438565eb5a6c48157a63cab7b465609 (commit)
 tagged by  Sylvain Beucler
on  Wed Sep 23 19:38:03 2009 +0200

- Shortlog 
Debian release 2009-08-25-1

Sylvain Beucler (18):
  Imported Upstream version 2009-08-25
  Imported Debian patch 2009-08-25-1
  Set maintainer to the Debian Games Team
  - Renamed patches for clarity
  Don't link to -lsmpeg -lvorbisfile directly
  Doc fixes
  Remove unused auto-deleted source file
  Remove dfsg-irrelevant licenses
  Add missing dependencies + doc fixes
  Add zcode-interpreter alternative + doc fixes
  Replace non-free monospace font
  Add garglk.ini to the examples
  Typo
  Remove hexdumps of the luximono font
  Add missing fontconfig dependency
  Reference fontconfig in the build system
  Doc fixes: mention git-buildpackage in BUILD, Unicode support in control, 
and summarize the patches in changelog
  Move BUILD in README.source

---

-- 
Packaging for Gargoyle - graphical player for Interactive Fiction games

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

[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. upstream/2009-08-25-22-gcc62bb4

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit cc62bb4f63f621bb30b96c3b31ee3d48e38dad6e
Author: Sylvain Beucler b...@beuc.net
Date:   Thu May 27 21:17:56 2010 +0200

Several small fixes

  * Fix security issue in the shell wrapper, where LD_LIBRARY_PATH may be
modified to include an empty directory (which means current
directory)
  * Fix missing 'not' in the package description: it does not provide a
way to display the cover art
  * Fix download URL in debian/copyright
  * Fix a couple typos
  * Fix FTBFS with binutils-gold: specify -lm explicitly in the build
system (patch sent upstream) (Closes: #554390)
  * Provide: zcode-interpreter, tads2-interpreter, tads3-interpreter as
other packaged interpreters do (Closes: #579618)
  * Remove comments from the watch file because taste differs among DDs
  * Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index ebe2e23..21ae111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
-gargoyle-free (2009-08-25-2) UNRELEASED; urgency=low
+gargoyle-free (2009-08-25-2) unstable; urgency=high
 
+  * Fix security issue in the shell wrapper, where LD_LIBRARY_PATH may be
+modified to include an empty directory (which means current
+directory)
   * Fix missing 'not' in the package description: it does not provide a
-  way to display the cover art
+way to display the cover art
+  * Fix download URL in debian/copyright
+  * Fix a couple typos
+  * Fix FTBFS with binutils-gold: specify -lm explicitly in the build
+system (patch sent upstream) (Closes: #554390)
+  * Provide: zcode-interpreter, tads2-interpreter, tads3-interpreter as
+other packaged interpreters do (Closes: #579618)
+  * Remove comments from the watch file because taste differs among DDs
+  * Bump Standards-Version
 
- -- Sylvain Beucler b...@beuc.net  Wed, 07 Oct 2009 21:53:38 +0200
+ -- Sylvain Beucler b...@beuc.net  Thu, 27 May 2010 21:31:47 +0200
 
 gargoyle-free (2009-08-25-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a61e505..73156bf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
 Uploaders: Sylvain Beucler b...@beuc.net
 Build-Depends: quilt, debhelper (= 7), jam, libgtk2.0-dev, libpng12-dev, 
libjpeg62-dev, libsdl1.2-dev, libsdl-sound1.2-dev, libsdl-mixer1.2-dev, 
libfreetype6-dev, libfontconfig1-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://ccxvii.net/gargoyle/
 Vcs-Git: git://git.debian.org/git/pkg-games/gargoyle-free.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/gargoyle-free.git
@@ -12,6 +12,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-games/gargoyle-free.git
 Package: gargoyle-free
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-core, ttf-dejavu-extra
+Provides: zcode-interpreter, tads2-interpreter, tads3-interpreter
 Description: graphical player for Interactive Fiction games
  Gargoyle is an Interactive Fiction (text adventure) player that
  supports all the major interactive fiction formats.
diff --git a/debian/copyright b/debian/copyright
index 7c0ccc8..2060035 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,10 +4,10 @@ This package was debianized by:
 
 It was downloaded from:
 
-http://ccxvii.net/gargoyle/
+http://code.google.com/p/garglk/
 
-To comply with the DSFG, the following directories and files were
-removed to create the -dsfg tarball:
+To comply with the DFSG, the following directories and files were
+removed to create the -free tarball:
 
   - terps/alan2/: non-free license (need to register and cannot modify
 without author's permission), check
@@ -34,7 +34,7 @@ removed to create the -dsfg tarball:
 
   - support/: for the sake of convenience (e.g. no need to declare it
 in this file), these external libraries are excluded from the
-tarball, since they are only used for some developper builds, and
+tarball, since they are only used for some developer builds, and
 are otherwise available in Debian already
 
   - terps/nitfol/z_io.c.orig: this source file is removed by 'jam
diff --git a/debian/patches/fhs_locate_private_library.patch 
b/debian/patches/fhs_locate_private_library.patch
index 79a9770..4af22de 100644
--- a/debian/patches/fhs_locate_private_library.patch
+++ b/debian/patches/fhs_locate_private_library.patch
@@ -2,8 +2,9 @@ Description: install sub-binaries and libraries in 
/usr/lib/gargoyle/
   It would be better to link the binaries with
   rpath=/usr/lib/gargoyle, since the binaries may be used
   independently; however this may conflict with existing packages,
-  such as frotz, so I'm not sure
-Forwarded: not yet
+  such as 'frotz', which would need to be divert'd.
+  Upstream plans to write a new launcher either in C or zenity.
+Forwarded: 
http://groups.google.com/group