[SCM] Packaging for Gargoyle - graphical player for Interactive Fiction games branch, master, updated. debian/2009-08-25-1-24-g2314d72
Sylvain Beucler
beuc at beuc.net
Sun Feb 19 15:20:21 UTC 2012
The following commit has been merged in the master branch:
commit 747b06e51be189cfa6f2bd25080686bda457b89e
Author: Sylvain Beucler <beuc at 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 <beuc at 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-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, 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/alan3 usr/lib/gargoyle/
+build/dist/bocfel usr/lib/gargoyle/
build/dist/frotz usr/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/scare usr/lib/gargoyle/
+build/dist/scott 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/
garglk/garglk.ini etc/
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 <beuc at beuc.net>
-Last-Update: 2010-10-01
+Last-Update: 2012-02-19
Index: gargoyle-free/garglk/gargoyle.desktop
===================================================================
---- gargoyle-free.orig/garglk/gargoyle.desktop 2010-10-01 21:11:32.000000000 +0200
-+++ gargoyle-free/garglk/gargoyle.desktop 2010-10-01 21:13:25.000000000 +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
+--- gargoyle-free.orig/garglk/gargoyle.desktop 2012-02-19 13:39:02.000000000 +0100
++++ gargoyle-free/garglk/gargoyle.desktop 2012-02-19 13:39:21.000000000 +0100
+@@ -5,5 +5,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;
+ Categories=Game;
diff --git a/debian/patches/desktop_menu_entry.patch b/debian/patches/desktop_menu_entry_crs.patch
similarity index 61%
copy from debian/patches/desktop_menu_entry.patch
copy to debian/patches/desktop_menu_entry_crs.patch
index 0f886ea..badb1ae 100644
--- a/debian/patches/desktop_menu_entry.patch
+++ b/debian/patches/desktop_menu_entry_crs.patch
@@ -1,14 +1,13 @@
-Description: Fix issues in the .desktop file
-Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812060c426caf
+Description: dos2unix
+Forwarded: TODO
Author: Sylvain Beucler <beuc at beuc.net>
-Last-Update: 2010-10-01
+Last-Update: 2012-02-19
Index: gargoyle-free/garglk/gargoyle.desktop
===================================================================
---- gargoyle-free.orig/garglk/gargoyle.desktop 2010-10-01 21:11:32.000000000 +0200
-+++ gargoyle-free/garglk/gargoyle.desktop 2010-10-01 21:13:25.000000000 +0200
-@@ -1,10 +1,9 @@
--#!/usr/bin/env xdg-open
+--- gargoyle-free.orig/garglk/gargoyle.desktop 2012-02-19 13:38:35.000000000 +0100
++++ gargoyle-free/garglk/gargoyle.desktop 2012-02-19 13:39:02.000000000 +0100
+@@ -1,9 +1,9 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
@@ -25,5 +24,5 @@ Index: gargoyle-free/garglk/gargoyle.desktop
+GenericName=Interactive Fiction interpreter
+Comment=Interactive Fiction multi-interpreter that supports all major IF formats
+Icon=gargoyle-house.png
-+Exec=gargoyle-free
++Exec=gargoyle
+Categories=Game;
diff --git a/debian/patches/dfsg_disable_alan.patch b/debian/patches/dfsg_disable_alan.patch
deleted file mode 100644
index b8aef25..0000000
--- a/debian/patches/dfsg_disable_alan.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: disable non-free alan interpreter
-Forwarded: not-needed
-Author: Sylvain Beucler <beuc at beuc.net>
-
-Index: gargoyle-2009.08.25/terps/Jamfile
-===================================================================
---- gargoyle-2009.08.25.orig/terps/Jamfile 2009-09-12 00:43:38.000000000 +0200
-+++ gargoyle-2009.08.25/terps/Jamfile 2009-09-12 00:43:55.000000000 +0200
-@@ -8,8 +8,8 @@
-
- MAKE_ADVSYS ?= yes ;
- MAKE_AGILITY ?= yes ;
--MAKE_ALAN2 ?= yes ;
--MAKE_ALAN3 ?= yes ;
-+MAKE_ALAN2 ?= no ;
-+MAKE_ALAN3 ?= no ;
- MAKE_FROTZ ?= yes ;
- MAKE_GEAS ?= yes ;
- MAKE_GIT ?= yes ;
diff --git a/debian/patches/dfsg_disable_alan2.patch b/debian/patches/dfsg_disable_alan2.patch
new file mode 100644
index 0000000..ed43e8a
--- /dev/null
+++ b/debian/patches/dfsg_disable_alan2.patch
@@ -0,0 +1,18 @@
+Description: disable non-free alan2 interpreter
+Forwarded: not-needed
+Author: Sylvain Beucler <beuc at beuc.net>
+Last-Update: 2012-02-19
+
+Index: gargoyle-free/terps/Jamfile
+===================================================================
+--- gargoyle-free.orig/terps/Jamfile 2012-02-19 12:48:12.000000000 +0100
++++ gargoyle-free/terps/Jamfile 2012-02-19 12:53:56.000000000 +0100
+@@ -8,7 +8,7 @@
+
+ MAKE_ADVSYS ?= yes ;
+ MAKE_AGILITY ?= yes ;
+-MAKE_ALAN2 ?= yes ;
++MAKE_ALAN2 ?= no ;
+ MAKE_ALAN3 ?= yes ;
+ MAKE_BOCFEL ?= yes ;
+ MAKE_FROTZ ?= yes ;
diff --git a/debian/patches/dfsg_disable_hugo.patch b/debian/patches/dfsg_disable_hugo.patch
index 1ab9483..fae84cf 100644
--- a/debian/patches/dfsg_disable_hugo.patch
+++ b/debian/patches/dfsg_disable_hugo.patch
@@ -1,17 +1,18 @@
Description: disable non-free hugo interpreter
Forwarded: not-needed
Author: Sylvain Beucler <beuc at beuc.net>
+Last-Update: 2012-02-19
-Index: gargoyle-2009.08.25/terps/Jamfile
+Index: gargoyle-free/terps/Jamfile
===================================================================
---- gargoyle-2009.08.25.orig/terps/Jamfile 2009-09-12 00:44:09.000000000 +0200
-+++ gargoyle-2009.08.25/terps/Jamfile 2009-09-12 00:44:15.000000000 +0200
-@@ -14,7 +14,7 @@
+--- gargoyle-free.orig/terps/Jamfile 2012-02-19 12:37:48.000000000 +0100
++++ gargoyle-free/terps/Jamfile 2012-02-19 12:48:12.000000000 +0100
+@@ -15,7 +15,7 @@
MAKE_GEAS ?= yes ;
MAKE_GIT ?= yes ;
MAKE_GLULXE ?= yes ;
-MAKE_HUGO ?= yes ;
+MAKE_HUGO ?= no ;
+ MAKE_JACL ?= yes ;
MAKE_LEVEL9 ?= yes ;
MAKE_MAGNETIC ?= yes ;
- MAKE_NITFOL ?= yes ;
diff --git a/debian/patches/dfsg_replace_luximono_font.patch b/debian/patches/dfsg_replace_luximono_font.patch
index 34286ec..b877e42 100644
--- a/debian/patches/dfsg_replace_luximono_font.patch
+++ b/debian/patches/dfsg_replace_luximono_font.patch
@@ -9,14 +9,14 @@ Last-Update: 2010-10-28
Index: gargoyle-free/Jamrules
===================================================================
---- 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 @@
-
+--- gargoyle-free.orig/Jamrules 2012-02-19 12:37:48.000000000 +0100
++++ gargoyle-free/Jamrules 2012-02-19 12:49:09.000000000 +0100
+@@ -5,7 +5,7 @@
BUILD ?= RELEASE ;
- USESDL = yes ;
--BUNDLEFONTS = yes ;
-+BUNDLEFONTS = no ;
+ USESDL ?= yes ;
+ USEBABEL ?= yes ;
+-BUNDLEFONTS ?= yes ;
++BUNDLEFONTS ?= no ;
- CC = gcc ;
- C++ = g++ ;
+ # jam -sGUILIB=EFL
+ GUILIB ?= gtk+ ;
diff --git a/debian/patches/fhs_locate_private_binaries.patch b/debian/patches/fhs_locate_private_binaries.patch
index 0fdd688..ec86dcb 100644
--- a/debian/patches/fhs_locate_private_binaries.patch
+++ b/debian/patches/fhs_locate_private_binaries.patch
@@ -8,24 +8,24 @@ Forwarded: http://groups.google.com/group/garglk-dev/browse_thread/thread/ade812
Author: Sylvain Beucler <beuc at beuc.net>
Last-Update: 2010-09-28
-Index: gargoyle-free-2010.1/garglk/launchgtk.c
+Index: gargoyle-free/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)
+--- gargoyle-free.orig/garglk/launchgtk.c 2012-02-19 12:44:34.000000000 +0100
++++ gargoyle-free/garglk/launchgtk.c 2012-02-19 12:45:37.000000000 +0100
+@@ -149,6 +149,8 @@
+
+ void winpath(char *buffer)
+ {
++ strcpy(buffer, "/usr/lib/gargoyle/");
++ /*
+ char exepath[MaxBuffer] = {0};
+ unsigned int exelen;
+
+@@ -167,6 +169,7 @@
+ *dirpos = '\0';
+
+ return;
++ */
+ }
+
+ int winexec(const char *cmd, char **args)
diff --git a/debian/patches/ignore_bundled_libraries.patch b/debian/patches/ignore_bundled_libraries.patch
index 668f031..68e144b 100644
--- a/debian/patches/ignore_bundled_libraries.patch
+++ b/debian/patches/ignore_bundled_libraries.patch
@@ -1,17 +1,57 @@
-Description: don't search the unused 'support' directory with bundled libraries
+Description: don't build the (deleted) bundled libraries in the 'support' directory
Forwarded: not-needed
Author: Sylvain Beucler <beuc at beuc.net>
+Last-Update: 2012-02-19
-Index: gargoyle-free-2009-08-25/Jamfile
+Index: gargoyle-free/support/Jamfile
===================================================================
---- gargoyle-free-2009-08-25.orig/Jamfile 2009-09-12 01:52:30.000000000 +0200
-+++ gargoyle-free-2009-08-25/Jamfile 2009-09-12 01:52:40.000000000 +0200
-@@ -8,7 +8,7 @@
- SubInclude TOP garglk ;
- SubInclude TOP terps ;
- SubInclude TOP tads ;
--SubInclude TOP support ;
-+#SubInclude TOP support ;
-
- # If SYSTEM is set, use values for a system wide install
- if $(SYSTEM)
+--- gargoyle-free.orig/support/Jamfile 2012-02-19 12:37:48.000000000 +0100
++++ gargoyle-free/support/Jamfile 2012-02-19 12:50:45.000000000 +0100
+@@ -24,47 +24,3 @@
+ level9.c magscrolls.c tads.c tads2.c tads3.c zcode.c
+ ;
+ }
+-
+-#
+-# SDL Sound
+-#
+-
+-if $(USESDL) = yes
+-{
+- SubDir TOP support ;
+- ObjDir SDL_sound ;
+-
+- SubDirCcFlags
+- -DSOUND_SUPPORTS_OGG
+- -DSOUND_SUPPORTS_SMPEG
+- #-DSOUND_USE_ALTCVT
+- ;
+-
+- if $(OS) = MINGW { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; }
+- if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; }
+- if $(OS) = MACOSX { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; }
+-
+- SEARCH_SOURCE =
+- [ FDirName $(TOP) support sdl_sound ]
+- [ FDirName $(TOP) support sdl_sound decoders ]
+- ;
+-
+- if $(OS) = MINGW
+- {
+- SEARCH_SOURCE += [ FDirName $(SUBDIR) sdl ] ;
+-
+- SharedLibrary SDL_sound :
+- ogg.c smpeg.c audio_convert.c alt_audio_convert.c extra_rwops.c SDL_sound.c
+- ;
+-
+- SharedLinkLibrariesOnSharedLibrary SDL_sound : smpeg libvorbisfile-3 ;
+- }
+-
+- if $(OS) = SOLARIS || $(OS) = MACOSX
+- {
+- Library SDL_sound_static :
+- ogg.c smpeg.c audio_convert.c extra_rwops.c SDL_sound.c
+- ;
+- }
+-}
+-
diff --git a/debian/patches/series b/debian/patches/series
index 3de4fc2..c55f421 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
-fhs_locate_private_binaries.patch
-ignore_bundled_libraries.patch
-dfsg_disable_alan.patch
dfsg_disable_hugo.patch
+dfsg_disable_alan2.patch
dfsg_replace_luximono_font.patch
+ignore_bundled_libraries.patch
+desktop_menu_entry_crs.patch
desktop_menu_entry.patch
+fhs_locate_private_binaries.patch
diff --git a/debian/rules b/debian/rules
index 5c16fca..7c38e13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,20 @@
#!/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
+
# Tell 'jam' to statically link private libraries; the convenience
# library is pretty small and it's much simpler in jam than trying to
@@ -17,79 +24,19 @@ export STATIC=1
TARGET := $(CURDIR)/debian/gargoyle-free
-include /usr/share/quilt/quilt.make
-
-build: build-stamp
-
-build-stamp: $(QUILT_STAMPFN)
- dh_testdir
-
- # compile the package.
- jam
+%:
+ dh $@ --parallel
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # clean up after the build process.
- jam clean
- rm -rf build/
+override_dh_auto_build:
+ jam -j$$(nproc)
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # install the package into debian/gargoyle-free.
+override_dh_auto_install:
+# install the package into debian/gargoyle-free.
jam install # to build/dist/
- # 'debian/install' doesn't support renaming files:
+# 'debian/install' doesn't support renaming files:
+# (last field is always a directory, even without a trailing '/')
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
- # debian/gargoyle-free/
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_lintian
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps -l"$(TARGET)/usr/lib/gargoyle/"
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_clean:
+ jam clean
+ rm -rf build/
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
Packaging for Gargoyle - graphical player for Interactive Fiction games
More information about the Pkg-games-commits
mailing list