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

Sylvain Beucler beuc at beuc.net
Tue Sep 28 19:59:19 UTC 2010 

The following commit has been merged in the master branch:
commit a86877a07e23446ce3b90a7ec4b12bfeec01d833
Author: Sylvain Beucler <beuc at 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 <beuc at debian.org>  Mon, 27 Sep 2010 20:12:07 +0200
+ -- Sylvain Beucler <beuc at 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/frotz    usr/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 <beuc at 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 0000000..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 <beuc at 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.000000000 +0200
++++ gargoyle-free-2010.1/garglk/launchgtk.c	2010-09-28 21:23:39.000000000 +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..0000000
--- 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 <beuc at beuc.net>
-
-Index: gargoyle-free/garglk/launcher.sh
-===================================================================
---- gargoyle-free.orig/garglk/launcher.sh	2009-09-12 02:55:13.000000000 +0200
-+++ gargoyle-free/garglk/launcher.sh	2009-09-12 10:23:00.000000000 +0200
-@@ -7,8 +7,9 @@
- 
- if [ `uname` != Darwin ]
- then
--    abspath=`readlink -f $0`	# get the full path of this script
--    dirpath=`dirname $abspath`	# get directory part
-+    # 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
- else
-     dirpath=`dirname $0`
diff --git a/debian/patches/series b/debian/patches/series
index 37e3840..7d99cdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fhs_locate_private_binaries.patch
 ignore_bundled_libraries.patch
 dfsg_disable_alan.patch
 dfsg_disable_hugo.patch
diff --git a/debian/rules b/debian/rules
index 85c38a4..5c16fca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,8 @@ install: build
 
 	# install the package into debian/gargoyle-free.
 	jam install  # to build/dist/
+	# 'debian/install' doesn't support renaming files:
+	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

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

More information about the Pkg-games-commits mailing list