[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-8-gc7dcca0
Sylvain Beucler
beuc at beuc.net
Tue Sep 28 07:20:00 UTC 2010
The following commit has been merged in the master branch:
commit c7dcca001f43e831d17038fde48d062a1df33af3
Author: Sylvain Beucler <beuc at 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 <beuc at 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-devel at lists.alioth.debian.org>
Uploaders: Sylvain Beucler <beuc at 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 <d91tan at Update.uu.se>
Ben Cressey <bcressey at gmail.com>
+ Sylvain Beucler
+ Chris Spiegel
+ Jörg Walter
David Michael Betz
Robert Masenten <rcm-math at pacbell.net>
Simon Baldwin <simon_baldwin at 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 is:
and is licensed under the GPL version 3, see above.
-AdvSys is released under the terms of the BSD license. On Debian
-systems, the complete text of the BSD license can be found in
-`/usr/share/common-licenses/BSD'.
+AdvSys is released under the terms of the BSD license:
+ AdvSys is copyright (c) 2009 David Betz.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Garglk is partially based on the reference Glk implementation:
diff --git a/debian/install b/debian/install
index dab6345..2a3f494 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,6 @@
-build/dist/libgarglk.so usr/lib/gargoyle/
+#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/
@@ -15,3 +17,5 @@ build/dist/tadsr usr/lib/gargoyle/
#build/dist/alan2 usr/lib/gargoyle/
#build/dist/alan3 usr/lib/gargoyle/
#build/dist/hugo usr/lib/gargoyle/
+
+garglk/garglk.ini etc/
diff --git a/debian/patches/dfsg_replace_luximono_font.patch b/debian/patches/dfsg_replace_luximono_font.patch
index 589f5ca..ce496f4 100644
--- a/debian/patches/dfsg_replace_luximono_font.patch
+++ b/debian/patches/dfsg_replace_luximono_font.patch
@@ -13,135 +13,16 @@ Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/62a038
Author: Sylvain Beucler <beuc at beuc.net>
Last-Update: 2009-09-13
-Index: gargoyle-free/garglk/fontdata.c
-===================================================================
---- gargoyle-free.orig/garglk/fontdata.c 2009-09-13 14:29:45.000000000 +0200
-+++ gargoyle-free/garglk/fontdata.c 2009-09-13 14:30:09.000000000 +0200
-@@ -1,6 +1,7 @@
- /******************************************************************************
- * *
- * Copyright (C) 2006-2009 by Tor Andersson. *
-+ * Copyright (C) 2008, 2009 Sylvain Beucler *
- * *
- * This file is part of Gargoyle. *
- * *
-@@ -22,10 +23,12 @@
-
- /* include hex-dumped font files */
-
-+/* Excluding non-free Luxi fonts
- #include "lmr.hex"
- #include "lmb.hex"
- #include "lmi.hex"
- #include "lmz.hex"
-+*/
-
- #include "cbr.hex"
- #include "cbb.hex"
-@@ -37,21 +40,17 @@
- switch (idx)
- {
- case 0:
-- *ptr = LuxiMonoRegular_pfb;
-- *len = LuxiMonoRegular_pfb_len;
-- break;
-+ gli_get_system_font("DejaVu Sans Mono:style=Book", ptr, len);
-+ break;
- case 1:
-- *ptr = LuxiMonoBold_pfb;
-- *len = LuxiMonoBold_pfb_len;
-- break;
-+ gli_get_system_font("DejaVu Sans Mono:style=Bold", ptr, len);
-+ break;
- case 2:
-- *ptr = LuxiMonoOblique_pfb;
-- *len = LuxiMonoOblique_pfb_len;
-- break;
-+ gli_get_system_font("DejaVu Sans Mono:style=Oblique", ptr, len);
-+ break;
- case 3:
-- *ptr = LuxiMonoBoldOblique_pfb;
-- *len = LuxiMonoBoldOblique_pfb_len;
-- break;
-+ gli_get_system_font("DejaVu Sans Mono:style=Bold Oblique", ptr, len);
-+ break;
-
- case 4:
- *ptr = CharterBT_Roman_ttf;
-@@ -76,3 +75,63 @@
- }
- }
-
-+#include <fontconfig/fontconfig.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+/* Get filename for canonical font name 'fontname'. Return NULL if the
-+ font cannot be found (for correctness, no alternate font will be
-+ provided). */
-+int gli_get_system_font(char* fontname, unsigned char **ptr, unsigned int *len)
-+{
-+ *ptr = 0;
-+ *len = 0;
-+
-+ char* filename = NULL;
-+ FcPattern* p = NULL;
-+ FcChar8* strval = NULL;
-+ FcObjectSet *attr = NULL;
-+
-+ if (!FcInit())
-+ {
-+ winabort("Internal error: cannot initialize fontconfig");
-+ return 0;
-+ }
-+
-+ p = FcNameParse((FcChar8*)fontname);
-+ if (p == NULL)
-+ {
-+ winabort("Internal error: invalid font pattern: %s", fontname);
-+ return 0;
-+ }
-+ /* Grab filename attribute */
-+ attr = FcObjectSetBuild (FC_FILE, (char *) 0);
-+
-+ FcFontSet *fs = FcFontList (0, p, attr);
-+ if (fs->nfont == 0)
-+ {
-+ winabort("gli_get_system_font: no matching font for %s", fontname);
-+ return 0;
-+ }
-+ if (FcPatternGetString(fs->fonts[0], FC_FILE, 0, &strval) == FcResultTypeMismatch
-+ || strval == NULL)
-+ {
-+ winabort("get_fontconfig_path: cannot find font filename for %s", fontname);
-+ return 0;
-+ }
-+
-+ FILE* fp = fopen(strval, "rb");
-+ fseek(fp, 0L, SEEK_END);
-+ *len = ftell(fp);
-+ fseek(fp, 0L, SEEK_SET);
-+
-+ *ptr = malloc(*len);
-+ fread(*ptr, 1, *len, fp);
-+ fclose(fp);
-+
-+ FcFontSetDestroy(fs);
-+ FcObjectSetDestroy(attr);
-+ FcPatternDestroy(p);
-+ FcFini();
-+
-+ return 1;
-+}
Index: gargoyle-free/Jamrules
===================================================================
---- gargoyle-free.orig/Jamrules 2009-09-13 14:46:10.000000000 +0200
-+++ gargoyle-free/Jamrules 2009-09-13 14:46:13.000000000 +0200
-@@ -44,7 +44,7 @@
+--- gargoyle-free.orig/Jamrules 2010-09-27 20:42:17.000000000 +0200
++++ gargoyle-free/Jamrules 2010-09-27 20:43:00.000000000 +0200
+@@ -4,7 +4,7 @@
+
+ BUILD ?= RELEASE ;
+ USESDL = yes ;
+-BUNDLEFONTS = yes ;
++BUNDLEFONTS = no ;
- case LINUX :
- Echo "OS is LINUX (gtk+)" ;
-- PKGCONFIG = "pkg-config freetype2 gtk+-2.0 gdk-x11-2.0 gobject-2.0" ;
-+ PKGCONFIG = "pkg-config freetype2 gtk+-2.0 gdk-x11-2.0 gobject-2.0 fontconfig" ;
- #PKGCONFIG = "pkg-config freetype2 gtk+" ;
- SHELLHEADER = "#!/bin/bash" ;
- GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" -fPIC ;
+ CC = gcc ;
+ C++ = g++ ;
diff --git a/debian/patches/ftbfs_binutils-gold.patch b/debian/patches/ftbfs_binutils-gold.patch
deleted file mode 100644
index fe7edbb..0000000
--- a/debian/patches/ftbfs_binutils-gold.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: fix compilation with binutils-gold
- Cf. #554390
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554390
-Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/693c4f32a655da56
-Author: Sylvain Beucler <beuc at beuc.net>
-Last-Update: 2010-10-27
-
-Index: gargoyle-free/Jamrules
-===================================================================
---- gargoyle-free.orig/Jamrules 2010-05-27 20:25:25.000000000 +0200
-+++ gargoyle-free/Jamrules 2010-05-27 20:25:34.000000000 +0200
-@@ -49,7 +49,7 @@
- SHELLHEADER = "#!/bin/bash" ;
- GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" -fPIC ;
- SHRLINKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
-- LINKLIBS = -lz ;
-+ LINKLIBS = -lz -lm ;
-
- if $(USESDL)
- {
diff --git a/debian/patches/sdl_sound_debian.patch b/debian/patches/sdl_sound_debian.patch
deleted file mode 100644
index 4f88f2b..0000000
--- a/debian/patches/sdl_sound_debian.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: dynamically link SDL_sound
- Should be used upstream in the next release, since statically linking
- was only used to work-around an old bug in SDL_sound.
- I'm discussing a refinement with them.
-Origin: http://groups.google.com/group/garglk-dev/browse_thread/thread/62a038ac4986d2a
-Author: Ben Cressey <bcressey at gmail.com>, Sylvain Beucler <beuc at beuc.net>
-
-Index: gargoyle-free/Jamrules
-===================================================================
---- gargoyle-free.orig/Jamrules 2009-09-12 11:56:00.000000000 +0200
-+++ gargoyle-free/Jamrules 2009-09-12 12:10:54.000000000 +0200
-@@ -54,7 +54,7 @@
- if $(USESDL)
- {
- GARGLKCCFLAGS += -I/usr/include/SDL ;
-- SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
-+ SHRLINKLIBS += -lSDL_mixer -lSDL -lSDL_sound ;
- }
-
- case SOLARIS :
-Index: gargoyle-free/garglk/Jamfile
-===================================================================
---- gargoyle-free.orig/garglk/Jamfile 2009-09-12 11:56:00.000000000 +0200
-+++ gargoyle-free/garglk/Jamfile 2009-09-12 12:10:30.000000000 +0200
-@@ -14,11 +14,6 @@
- SubDirHdrs $(TOP) support sdl-1.2.13 ;
- }
-
--if $(USESDL)
--{
-- SubDirHdrs $(TOP) support sdl_sound-1.0.3 ;
--}
--
- GARGSRCS =
- gi_blorb.c gi_dispa.c
- cggestal.c cgblorb.c cgfref.c cgmisc.c cgstyle.c cgstream.c cgunicod.c
-@@ -47,9 +42,3 @@
-
- Library libgarglkmain : main.c ;
- SharedLibrary libgarglk : $(GARGSRCS) ;
--
--if ( $(OS) = LINUX || $(OS) = SOLARIS ) && $(USESDL)
--{
-- LinkLibrariesOnSharedLibrary libgarglk : SDL_sound_static ;
--}
--
diff --git a/debian/patches/security_ld_preload.patch b/debian/patches/security_ld_preload.patch
deleted file mode 100644
index 4aae26b..0000000
--- a/debian/patches/security_ld_preload.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: don't look for libgarglk.so in the current directory
-Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/1c92ab6f24d5ebe6
-Author: Sylvain Beucler <beuc at beuc.net>
-
-Index: gargoyle-free/garglk/launcher.sh
-===================================================================
---- gargoyle-free.orig/garglk/launcher.sh 2010-05-27 20:54:36.000000000 +0200
-+++ gargoyle-free/garglk/launcher.sh 2010-05-27 20:58:15.000000000 +0200
-@@ -10,7 +10,15 @@
- # Modified in Debian to use /usr/lib/gargoyle instead of the
- # current directory:
- dirpath=/usr/lib/gargoyle # get directory part
-- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dirpath
-+ if [ -z "$LD_LIBRARY_PATH" ]; then
-+ # Don't add an empty path (== current directory) to
-+ # LD_LIBRARY_PATH, this would allow a user to trick another
-+ # user into running gargoyle in a directory with a cracked
-+ # libgarglk.so, and gain access to his/her account.
-+ export LD_LIBRARY_PATH=$dirpath
-+ else
-+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dirpath
-+ fi
- else
- dirpath=`dirname $0`
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 9eb794e..37e3840 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
ignore_bundled_libraries.patch
-sdl_sound_debian.patch
dfsg_disable_alan.patch
dfsg_disable_hugo.patch
dfsg_replace_luximono_font.patch
-fhs_locate_private_library.patch
-ftbfs_binutils-gold.patch
-security_ld_preload.patch
diff --git a/debian/rules b/debian/rules
index 8f5de57..85c38a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+# Tell 'jam' to statically link private libraries; the convenience
+# library is pretty small and it's much simpler in jam than trying to
+# install to a private library prefix directory (would be
+# /usr/lib/gargoyle) - or using a LD_LIBRARY_PATH wrapper.
+export STATIC=1
+
TARGET := $(CURDIR)/debian/gargoyle-free
include /usr/share/quilt/quilt.make
@@ -41,7 +48,6 @@ install: build
# install the package into debian/gargoyle-free.
jam install # to build/dist/
- install -m 755 build/dist/gargoyle $(TARGET)/usr/games/gargoyle-free
# dh_install (cf. binary-arch target, configured in the
# 'install' file) will take of installing files in
diff --git a/debian/watch b/debian/watch
index fecceb1..f005462 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-http://code.google.com/p/garglk/downloads/list \
- http://garglk.googlecode.com/files/gargoyle-(.*)-sources\.zip
+http://googlecode.debian.net/p/garglk \
+ /p/garglk/gargoyle-(.*)-sources\.zip
--
Packaging for Gargoyle - graphical player for Interactive Fiction games
More information about the Pkg-games-commits
mailing list