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

Sun Feb 19 11:34:52 UTC 2012

The following commit has been merged in the master branch:
commit 93df41cb9738ba57a987ddc8e3874a6d6abe1320
Author: Sylvain Beucler <beuc at 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 <beuc at beuc.net>  Fri, 11 Sep 2009 20:09:43 +0200
+ -- Sylvain Beucler <beuc at 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 <beuc at 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-devel at lists.alioth.debian.org>
 Uploaders: Sylvain Beucler <beuc at 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/manual.pdf section L.5.
+    http://www.alanif.se/files/v2manual/copying.html#pgfId=122
+    The source code is not available as of 2012-02 (truncated file).
+    I contacted the author on 2012-02-19 about those two points.
 
   - 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
 
-  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
-  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_content&view=article&id=137:changes-in-v30alpha9&catid=29&Itemid=16
-  The Alan2 source code is not available as of 2012-02.
-
   - fonts/LuxiMonoBoldOblique.pfb,
     fonts/LuxiMonoBold.pfb, garglk/fonts/LuxiMonoOblique.pfb,
     fonts/LuxiMonoRegular.pfb, garglk/LuxiMono.txt,
@@ -44,16 +31,29 @@ removed to create the -free tarball:
     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
-    clean' and causes git-buildpackage errors. For the sake of
-    convenience, we removed it too.
-
   Shortcut:
-    rm -rf terps/alan?/ terps/hugo/ \
-      garglk/LuxiMono.txt fonts/LuxiMono* \
-      garglk/lm?.hex support/ \
+    rm -rf \
+      garglk/LuxiMono.txt fonts/LuxiMono* garglk/lm?.hex \
       licenses/LUXI* licenses/HUGO* \
-      terps/nitfol/z_io.c.orig
+      terps/alan2/ terps/hugo/ \
+      support/freetype support/libpng support/sdl support/zlib \
+      support/dylibs support/iplinux support/libjpeg \
+      support/README support/sdl_sound
+
+Changes in upstream licenses:
+
+  The Alan 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_content&view=article&id=137:changes-in-v30alpha9&catid=29&Itemid=16
+  It used to be non-free (needed to register and could not modify
+  without author's permission).
+
+  The license for the Alan 2 and Hugo interpreters may change in the
+  future.  Authors were contacted again in 2010:
+  http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf#16a03dba1a255277
 
 Upstream Authors:
 
@@ -140,7 +140,7 @@ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 The Debian packaging is:
 
-    Copyright (C) 2009 Sylvain Beucler <beuc at beuc.net>
+    Copyright (C) 2009-2012  Sylvain Beucler <beuc at beuc.net>
 
 and is licensed under the GPL version 3, see above.
 

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

