[SCM] Packaging for Gargoyle, IF player branch, master, updated. upstream/2009-08-25-3-gd882a48

Sylvain Beucler beuc at beuc.net
Sat Sep 12 09:56:07 UTC 2009 

The following commit has been merged in the master branch:
commit d882a482758c2ea33ac6bd062f97ea155077e552
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sat Sep 12 11:23:46 2009 +0200

    - Renamed patches for clarity
    
    - Fixed binaries lookup in the wrapper
    
    - Updated TODO
    
    - Fixed wrapper installation
    
    - Add .gitignore

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..0f5e82a
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,6 @@
+*~
+files
+stamp-patched
+gargoyle-free.debhelper.log
+gargoyle-free.substvars
+gargoyle-free/
diff --git a/debian/TODO b/debian/TODO
index cc88279..bc80a05 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,7 +1,10 @@
 - Replace LuxiMono with a _monospace_ font (_not_ BitStream Charter)
 
-- Patch the gargoyle wrapper so that LD_LIBRARY_PATH +=
-  /usr/lib/gargoyle
-
 - Watch for Alan as this interpreter may be released under a free
   license in the near future (as of 2009)
+
+- Add an alternative for zcode-interpreter (look in the Frotz Debian
+  package so see how)
+
+- Move binaries out of /usr/lib/gargole so they can be used from the
+  command line; handle conflicts (such as frotz)
diff --git a/debian/copyright b/debian/copyright
index d17e8ac..71a2981 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,6 +34,11 @@ removed to create the -dsfg tarball:
     are excluded from the tarball, since they are only used for some
     developper builds, and are otherwise available in Debian already
 
+  Shortcut:
+    rm -rf terps/alan?/ terps/hugo/ \
+      garglk/LuxiMono.txt garglk/fonts/LuxiMono* \
+      support/
+
 Upstream Authors:
 
     Tor Andersson <d91tan at Update.uu.se>
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..33359b8
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/games
diff --git a/debian/install b/debian/install
index 0bb67bf..dab6345 100644
--- a/debian/install
+++ b/debian/install
@@ -1,18 +1,17 @@
-build/dist/gargoyle /usr/games/gargoyle-free
-build/dist/libgarglk.so /usr/lib/gargoyle/
+build/dist/libgarglk.so usr/lib/gargoyle/
 
-build/dist/advsys   /usr/lib/gargoyle/
-build/dist/agility  /usr/lib/gargoyle/
-build/dist/frotz    /usr/lib/gargoyle/
-build/dist/geas     /usr/lib/gargoyle/
-build/dist/git      /usr/lib/gargoyle/
-build/dist/glulxe   /usr/lib/gargoyle/
-build/dist/jacl     /usr/lib/gargoyle/
-build/dist/level9   /usr/lib/gargoyle/
-build/dist/magnetic /usr/lib/gargoyle/
-build/dist/nitfol   /usr/lib/gargoyle/
-build/dist/scare    /usr/lib/gargoyle/
-build/dist/tadsr    /usr/lib/gargoyle/
-#build/dist/alan2    /usr/lib/gargoyle/
-#build/dist/alan3    /usr/lib/gargoyle/
-#build/dist/hugo     /usr/lib/gargoyle/
+build/dist/advsys   usr/lib/gargoyle/
+build/dist/agility  usr/lib/gargoyle/
+build/dist/frotz    usr/lib/gargoyle/
+build/dist/geas     usr/lib/gargoyle/
+build/dist/git      usr/lib/gargoyle/
+build/dist/glulxe   usr/lib/gargoyle/
+build/dist/jacl     usr/lib/gargoyle/
+build/dist/level9   usr/lib/gargoyle/
+build/dist/magnetic usr/lib/gargoyle/
+build/dist/nitfol   usr/lib/gargoyle/
+build/dist/scare    usr/lib/gargoyle/
+build/dist/tadsr    usr/lib/gargoyle/
+#build/dist/alan2    usr/lib/gargoyle/
+#build/dist/alan3    usr/lib/gargoyle/
+#build/dist/hugo     usr/lib/gargoyle/
diff --git a/debian/patches/disable_alan.patch b/debian/patches/dfsg_disable_alan.patch
similarity index 100%
rename from debian/patches/disable_alan.patch
rename to debian/patches/dfsg_disable_alan.patch
diff --git a/debian/patches/disable_hugo.patch b/debian/patches/dfsg_disable_hugo.patch
similarity index 100%
rename from debian/patches/disable_hugo.patch
rename to debian/patches/dfsg_disable_hugo.patch
diff --git a/debian/patches/disable_luximono_font.patch b/debian/patches/dfsg_replace_luximono_font.patch
similarity index 100%
rename from debian/patches/disable_luximono_font.patch
rename to debian/patches/dfsg_replace_luximono_font.patch
diff --git a/debian/patches/fhs_locate_private_library.patch b/debian/patches/fhs_locate_private_library.patch
new file mode 100644
index 0000000..79a9770
--- /dev/null
+++ b/debian/patches/fhs_locate_private_library.patch
@@ -0,0 +1,24 @@
+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
+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/gargorle 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/private_library.patch b/debian/patches/private_library.patch
deleted file mode 100644
index c7120d8..0000000
--- a/debian/patches/private_library.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gargoyle-free-2009-08-25/garglk/launcher.sh
-===================================================================
---- gargoyle-free-2009-08-25.orig/garglk/launcher.sh	2009-09-12 02:36:40.000000000 +0200
-+++ gargoyle-free-2009-08-25/garglk/launcher.sh	2009-09-12 02:36:55.000000000 +0200
-@@ -9,7 +9,7 @@
- then
-     abspath=`readlink -f $0`	# get the full path of this script
-     dirpath=`dirname $abspath`	# get directory part
--    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dirpath
-+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dirpath:/usr/lib/gargoyle
- else
-     dirpath=`dirname $0`
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 20c2b1b..957dbec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-sdl_sound_debian.patch
-disable_alan.patch
-disable_hugo.patch
-disable_luximono_font.patch
+dfsg_disable_alan.patch
+dfsg_disable_hugo.patch
+dfsg_replace_luximono_font.patch
 ignore_bundled_libraries.patch
-private_library.patch
+sdl_sound_debian.patch
+fhs_locate_private_library.patch
diff --git a/debian/rules b/debian/rules
index 335576e..0e5da41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
 # 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.
@@ -42,8 +41,11 @@ 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
 
-	# now cf. dh_install, namely the 'install' file
+	# dh_install (cf. binary-arch target, configured in the
+	# 'install' file) will take of installing files in
+	# debian/gargoyle-free/
 
 # Build architecture-independent files here.
 binary-indep: install

-- 
Packaging for Gargoyle, IF player

More information about the Pkg-games-commits mailing list