[Pkg-allegro-commits] r20 - in unstable/kq/debian: . patches

Sam Hocevar sho at costa.debian.org
Sun May 28 22:02:13 UTC 2006


Author: sho
Date: 2006-05-28 22:02:12 +0000 (Sun, 28 May 2006)
New Revision: 20

Added:
   unstable/kq/debian/kq-data.install
   unstable/kq/debian/kq-data.preinst
   unstable/kq/debian/kq.install
   unstable/kq/debian/kq.postinst
   unstable/kq/debian/patches/000_luac50.diff
   unstable/kq/debian/patches/000_scripts_in_pkglibdir.diff
   unstable/kq/debian/patches/010_rebootstrap.diff
Removed:
   unstable/kq/debian/patches/010_luac50.diff
Modified:
   unstable/kq/debian/changelog
   unstable/kq/debian/control
   unstable/kq/debian/patches/020_usr_share_games.diff
   unstable/kq/debian/patches/series
   unstable/kq/debian/rules
Log:
kq (0.99.cvs20060528-3) unstable; urgency=low

  * debian/control:
    + Removed the kq/kq-data circular dependency.

  * debian/patches/000_scripts_in_pkglibdir.diff:
    + New patch -- install scripts in pkglibdir instead of pkgdatadir.

  * debian/patches/010_rebootstrap.diff:
    + New patch -- rebootstrap package in a separate patch.


Modified: unstable/kq/debian/changelog
===================================================================
--- unstable/kq/debian/changelog	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/changelog	2006-05-28 22:02:12 UTC (rev 20)
@@ -1,3 +1,16 @@
+kq (0.99.cvs20060528-3) unstable; urgency=low
+
+  * debian/control:
+    + Removed the kq/kq-data circular dependency.
+
+  * debian/patches/000_scripts_in_pkglibdir.diff:
+    + New patch -- install scripts in pkglibdir instead of pkgdatadir.
+
+  * debian/patches/010_rebootstrap.diff:
+    + New patch -- rebootstrap package in a separate patch.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 28 May 2006 07:54:39 +0200
+
 kq (0.99.cvs20060528-2) unstable; urgency=low
 
   * debian/control:

Modified: unstable/kq/debian/control
===================================================================
--- unstable/kq/debian/control	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/control	2006-05-28 22:02:12 UTC (rev 20)
@@ -8,7 +8,7 @@
 
 Package: kq
 Architecture: any
-Depends: kq-data (>= 0.99.cvs20060528-1), ${shlibs:Depends}
+Depends: kq-data (= ${Source-Version}), ${shlibs:Depends}
 Description: adventure game in the spirit of Final Fantasy
  KQ is an adventure game in the spirit of old console games such as Secret of
  Mana, Final Fantasy or Zelda.
@@ -19,7 +19,6 @@
 
 Package: kq-data
 Architecture: all
-Depends: kq (= ${Source-Version})
 Conflicts: kq (<< 0.98+cvs.20030528-3)
 Replaces: kq (<< 0.98+cvs.20030528-3)
 Description: graphics and audio data for kq

Added: unstable/kq/debian/kq-data.install
===================================================================
--- unstable/kq/debian/kq-data.install	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/kq-data.install	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,3 @@
+usr/share/games/kq/data
+usr/share/games/kq/maps
+usr/share/games/kq/music

Added: unstable/kq/debian/kq-data.preinst
===================================================================
--- unstable/kq/debian/kq-data.preinst	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/kq-data.preinst	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+DOCDIR="/usr/share/doc/kq-data"
+
+if [ -L "$DOCDIR" ]; then
+  rm -f "$DOCDIR"
+fi
+
+#DEBHELPER#
+

Added: unstable/kq/debian/kq.install
===================================================================
--- unstable/kq/debian/kq.install	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/kq.install	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,3 @@
+usr/games/kq
+usr/lib/games
+usr/share/man

Added: unstable/kq/debian/kq.postinst
===================================================================
--- unstable/kq/debian/kq.postinst	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/kq.postinst	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+DOCDIR="/usr/share/doc/kq"
+
+if [ -d "$DOCDIR" -a ! -L "$DOCDIR" ]; then
+  rmdir --ignore-fail-on-non-empty "$DOCDIR"
+  if [ ! -d "$DOCDIR" ]; then
+    ln -s kq-data "$DOCDIR"
+  fi
+fi
+
+#DEBHELPER#
+

Copied: unstable/kq/debian/patches/000_luac50.diff (from rev 17, unstable/kq/debian/patches/010_luac50.diff)
===================================================================
--- unstable/kq/debian/patches/010_luac50.diff	2006-05-27 22:38:58 UTC (rev 17)
+++ unstable/kq/debian/patches/000_luac50.diff	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,78 @@
+Index: kq-0.99.cvs20060528/mkfiles/makefile.cfg
+===================================================================
+--- kq-0.99.cvs20060528.orig/mkfiles/makefile.cfg	2005-11-12 10:32:24.000000000 +0100
++++ kq-0.99.cvs20060528/mkfiles/makefile.cfg	2006-05-28 00:16:59.000000000 +0200
+@@ -74,7 +74,7 @@
+ #  DFLAGS are the flags used to build the dependencies.                       #
+ #                                                                             #
+ CXXFLAGS := -Wall -Werror -W -I $(INC_DIR) -finline
+-CFLAGS   := -Wall -W -I $(INC_DIR)
++CFLAGS   := -Wall -W -I $(INC_DIR) -I /usr/include/lua50
+ DEPFLAGS := -MM -MG -I$(INC_DIR)
+ LDFLAGS  :=
+ TGZFLAGS := cvzf
+@@ -99,7 +99,7 @@
+ #                                                                             #
+ #  The extra libraries we need to compile the program. Just the base name.    #
+ #                                                                             #
+-LIBRARY  := lua
++LIBRARY  := lua50
+ ifdef KQ_USE_JGMOD
+ 	LIBRARY += jgmod
+ else
+Index: kq-0.99.cvs20060528/readme.txt
+===================================================================
+--- kq-0.99.cvs20060528.orig/readme.txt	2006-03-30 12:57:58.000000000 +0200
++++ kq-0.99.cvs20060528/readme.txt	2006-05-28 00:16:59.000000000 +0200
+@@ -132,7 +132,7 @@
+ script into a .lob file, do the following if you have perl:
+ 
+ perl prep.pl < filename.lua > temp.tmp
+-luac -o filename.lob temp.tmp
++luac50 -o filename.lob temp.tmp
+ 
+ I tried piping under DOS, but it wasn't working quite right.  Just
+ try it yourself if you like.
+@@ -141,7 +141,7 @@
+ 'scripts' directory that contains all of the .lua files, but without
+ macros in them.  Then you can compile these by just doing this:
+ 
+-luac -o filename.lob filename.lua
++luac50 -o filename.lob filename.lua
+ 
+ If you don't use DOS for doing this, things might be slightly
+ different for you.
+Index: kq-0.99.cvs20060528/scripts/compall.sh
+===================================================================
+--- kq-0.99.cvs20060528.orig/scripts/compall.sh	2002-09-03 23:13:53.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/compall.sh	2006-05-28 00:16:59.000000000 +0200
+@@ -1,5 +1,5 @@
+ for a in `cat allsc.txt`
+ do
+   echo "Processing $a"
+-  perl prep.pl < $a.lua | ./luac.exe -o $a.lob -
++  perl prep.pl < $a.lua | ./luac50.exe -o $a.lob -
+ done  
+Index: kq-0.99.cvs20060528/scripts/comp.bat
+===================================================================
+--- kq-0.99.cvs20060528.orig/scripts/comp.bat	2002-09-03 23:13:53.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/comp.bat	2006-05-28 00:16:59.000000000 +0200
+@@ -1,4 +1,4 @@
+ perl prep.pl < %1.lua > _tmpfile.$$$
+-luac -o %1.lob _tmpfile.$$$
++luac50 -o %1.lob _tmpfile.$$$
+ erase _tmpfile.$$$
+ 
+Index: kq-0.99.cvs20060528/scripts/Makefile.am
+===================================================================
+--- kq-0.99.cvs20060528.orig/scripts/Makefile.am	2006-05-28 00:12:34.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/Makefile.am	2006-05-28 00:16:59.000000000 +0200
+@@ -15,7 +15,7 @@
+ all-am: Makefile confirm-dir $(LOBS)
+ 
+ %.lob: pscripts/%.lua $(INCLUDES)
+-	luac -o $@ $<
++	luac50 -o $@ $<
+ 
+ 
+ pscripts/%.lua: $(srcdir)/%.lua

Added: unstable/kq/debian/patches/000_scripts_in_pkglibdir.diff
===================================================================
--- unstable/kq/debian/patches/000_scripts_in_pkglibdir.diff	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/patches/000_scripts_in_pkglibdir.diff	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,74 @@
+Index: kq-0.99.cvs20060528/Makefile.am
+===================================================================
+--- kq-0.99.cvs20060528.orig/Makefile.am	2006-05-28 00:12:23.000000000 +0200
++++ kq-0.99.cvs20060528/Makefile.am	2006-05-28 08:23:02.000000000 +0200
+@@ -82,7 +82,7 @@
+ 	scripts/pass.lob scripts/tunnel.lob scripts/cult.lob \
+ 	scripts/shrine.lob
+ MOSTLYCLEANFILES = $(cscripts_DATA)
+-cscriptsdir = $(pkgdatadir)/scripts
++cscriptsdir = $(pkglibdir)/scripts
+ 
+ EXTRA_DIST = scripts/bridge2.lua scripts/dville.lua \
+ 	scripts/starting.lua scripts/bridge.lua scripts/estate.lua \
+@@ -115,7 +115,7 @@
+ 
+ dist_man_MANS = debian/kq.6
+ 
+-AM_CFLAGS = -I$(top_srcdir)/include -DKQ_BIN=\"$(bindir)/KQ$(EXEEXT)\" -DKQ_DATA=\"$(pkgdatadir)\"
++AM_CFLAGS = -I$(top_srcdir)/include -DKQ_BIN=\"$(bindir)/kq$(EXEEXT)\" -DKQ_DATA=\"$(pkgdatadir)\" -DKQ_LIB=\"$(pkglibdir)\"
+ 
+ if BUNDLE
+ all-local: KQ.app
+Index: kq-0.99.cvs20060528/src/unix.c
+===================================================================
+--- kq-0.99.cvs20060528.orig/src/unix.c	2006-05-28 00:12:35.000000000 +0200
++++ kq-0.99.cvs20060528/src/unix.c	2006-05-28 07:43:17.000000000 +0200
+@@ -37,7 +37,8 @@
+ 
+ static int init_path = 0;
+ static char user_dir[PATH_MAX];
+-static char game_dir[PATH_MAX];
++static char data_dir[PATH_MAX];
++static char lib_dir[PATH_MAX];
+ 
+ 
+ 
+@@ -78,29 +79,31 @@
+       get_executable_name (exe, sizeof (exe));
+       if (strcmp (exe, KQ_BIN) == 0) {
+          /* It's in its proper installed location */
+-         strcpy (game_dir, KQ_DATA);
++         strcpy (data_dir, KQ_DATA);
++         strcpy (lib_dir, KQ_LIB);
+       } else {
+          /* Not installed, development version */
+-         strcpy (game_dir, ".");
++         strcpy (data_dir, ".");
++         strcpy (lib_dir, ".");
+       }
+       init_path = 1;
+    }
+    switch (dir) {
+    case DATA_DIR:
+-      sprintf (ans, "%s/data/%s", game_dir, file);
++      sprintf (ans, "%s/data/%s", data_dir, file);
+       break;
+    case MUSIC_DIR:
+-      sprintf (ans, "%s/music/%s", game_dir, file);
++      sprintf (ans, "%s/music/%s", data_dir, file);
+       break;
+    case MAP_DIR:
+-      sprintf (ans, "%s/maps/%s", game_dir, file);
++      sprintf (ans, "%s/maps/%s", data_dir, file);
+       break;
+    case SAVE_DIR:
+    case SETTINGS_DIR:
+       sprintf (ans, "%s/%s", user_dir, file);
+       break;
+    case SCRIPT_DIR:
+-      sprintf (ans, "%s/scripts/%s", game_dir, file);
++      sprintf (ans, "%s/scripts/%s", lib_dir, file);
+       break;
+    default:
+       return NULL;

Deleted: unstable/kq/debian/patches/010_luac50.diff
===================================================================
--- unstable/kq/debian/patches/010_luac50.diff	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/patches/010_luac50.diff	2006-05-28 22:02:12 UTC (rev 20)
@@ -1,91 +0,0 @@
-Index: kq-0.99.cvs20060528/mkfiles/makefile.cfg
-===================================================================
---- kq-0.99.cvs20060528.orig/mkfiles/makefile.cfg	2005-11-12 10:32:24.000000000 +0100
-+++ kq-0.99.cvs20060528/mkfiles/makefile.cfg	2006-05-28 00:16:59.000000000 +0200
-@@ -74,7 +74,7 @@
- #  DFLAGS are the flags used to build the dependencies.                       #
- #                                                                             #
- CXXFLAGS := -Wall -Werror -W -I $(INC_DIR) -finline
--CFLAGS   := -Wall -W -I $(INC_DIR)
-+CFLAGS   := -Wall -W -I $(INC_DIR) -I /usr/include/lua50
- DEPFLAGS := -MM -MG -I$(INC_DIR)
- LDFLAGS  :=
- TGZFLAGS := cvzf
-@@ -99,7 +99,7 @@
- #                                                                             #
- #  The extra libraries we need to compile the program. Just the base name.    #
- #                                                                             #
--LIBRARY  := lua
-+LIBRARY  := lua50
- ifdef KQ_USE_JGMOD
- 	LIBRARY += jgmod
- else
-Index: kq-0.99.cvs20060528/readme.txt
-===================================================================
---- kq-0.99.cvs20060528.orig/readme.txt	2006-03-30 12:57:58.000000000 +0200
-+++ kq-0.99.cvs20060528/readme.txt	2006-05-28 00:16:59.000000000 +0200
-@@ -132,7 +132,7 @@
- script into a .lob file, do the following if you have perl:
- 
- perl prep.pl < filename.lua > temp.tmp
--luac -o filename.lob temp.tmp
-+luac50 -o filename.lob temp.tmp
- 
- I tried piping under DOS, but it wasn't working quite right.  Just
- try it yourself if you like.
-@@ -141,7 +141,7 @@
- 'scripts' directory that contains all of the .lua files, but without
- macros in them.  Then you can compile these by just doing this:
- 
--luac -o filename.lob filename.lua
-+luac50 -o filename.lob filename.lua
- 
- If you don't use DOS for doing this, things might be slightly
- different for you.
-Index: kq-0.99.cvs20060528/scripts/compall.sh
-===================================================================
---- kq-0.99.cvs20060528.orig/scripts/compall.sh	2002-09-03 23:13:53.000000000 +0200
-+++ kq-0.99.cvs20060528/scripts/compall.sh	2006-05-28 00:16:59.000000000 +0200
-@@ -1,5 +1,5 @@
- for a in `cat allsc.txt`
- do
-   echo "Processing $a"
--  perl prep.pl < $a.lua | ./luac.exe -o $a.lob -
-+  perl prep.pl < $a.lua | ./luac50.exe -o $a.lob -
- done  
-Index: kq-0.99.cvs20060528/scripts/comp.bat
-===================================================================
---- kq-0.99.cvs20060528.orig/scripts/comp.bat	2002-09-03 23:13:53.000000000 +0200
-+++ kq-0.99.cvs20060528/scripts/comp.bat	2006-05-28 00:16:59.000000000 +0200
-@@ -1,4 +1,4 @@
- perl prep.pl < %1.lua > _tmpfile.$$$
--luac -o %1.lob _tmpfile.$$$
-+luac50 -o %1.lob _tmpfile.$$$
- erase _tmpfile.$$$
- 
-Index: kq-0.99.cvs20060528/scripts/Makefile.am
-===================================================================
---- kq-0.99.cvs20060528.orig/scripts/Makefile.am	2006-05-28 00:12:34.000000000 +0200
-+++ kq-0.99.cvs20060528/scripts/Makefile.am	2006-05-28 00:16:59.000000000 +0200
-@@ -15,7 +15,7 @@
- all-am: Makefile confirm-dir $(LOBS)
- 
- %.lob: pscripts/%.lua $(INCLUDES)
--	luac -o $@ $<
-+	luac50 -o $@ $<
- 
- 
- pscripts/%.lua: $(srcdir)/%.lua
-Index: kq-0.99.cvs20060528/scripts/Makefile.in
-===================================================================
---- kq-0.99.cvs20060528.orig/scripts/Makefile.in	2006-05-28 00:14:30.000000000 +0200
-+++ kq-0.99.cvs20060528/scripts/Makefile.in	2006-05-28 00:16:59.000000000 +0200
-@@ -317,7 +317,7 @@
- all-am: Makefile confirm-dir $(LOBS)
- 
- %.lob: pscripts/%.lua $(INCLUDES)
--	luac -o $@ $<
-+	luac50 -o $@ $<
- 
- pscripts/%.lua: $(srcdir)/%.lua
- 	$(CPP) $(foreach X, $(INCLUDES), -include $(X)) $< > $@

Added: unstable/kq/debian/patches/010_rebootstrap.diff
===================================================================
--- unstable/kq/debian/patches/010_rebootstrap.diff	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/patches/010_rebootstrap.diff	2006-05-28 22:02:12 UTC (rev 20)
@@ -0,0 +1,35 @@
+Index: kq-0.99.cvs20060528/Makefile.in
+===================================================================
+--- kq-0.99.cvs20060528.orig/Makefile.in	2006-05-28 00:14:31.000000000 +0200
++++ kq-0.99.cvs20060528/Makefile.in	2006-05-28 08:23:18.000000000 +0200
+@@ -316,7 +316,7 @@
+ 	scripts/shrine.lob
+ 
+ MOSTLYCLEANFILES = $(cscripts_DATA)
+-cscriptsdir = $(pkgdatadir)/scripts
++cscriptsdir = $(pkglibdir)/scripts
+ EXTRA_DIST = scripts/bridge2.lua scripts/dville.lua \
+ 	scripts/starting.lua scripts/bridge.lua scripts/estate.lua \
+ 	scripts/temple1.lua scripts/camp.lua scripts/esteria.lua \
+@@ -345,7 +345,7 @@
+ 
+ musicdir = $(pkgdatadir)/music
+ dist_man_MANS = debian/kq.6
+-AM_CFLAGS = -I$(top_srcdir)/include -DKQ_BIN=\"$(bindir)/KQ$(EXEEXT)\" -DKQ_DATA=\"$(pkgdatadir)\"
++AM_CFLAGS = -I$(top_srcdir)/include -DKQ_BIN=\"$(bindir)/kq$(EXEEXT)\" -DKQ_DATA=\"$(pkgdatadir)\" -DKQ_LIB=\"$(pkglibdir)\"
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+Index: kq-0.99.cvs20060528/scripts/Makefile.in
+===================================================================
+--- kq-0.99.cvs20060528.orig/scripts/Makefile.in	2006-05-28 00:14:30.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/Makefile.in	2006-05-28 08:23:09.000000000 +0200
+@@ -317,7 +317,7 @@
+ all-am: Makefile confirm-dir $(LOBS)
+ 
+ %.lob: pscripts/%.lua $(INCLUDES)
+-	luac -o $@ $<
++	luac50 -o $@ $<
+ 
+ pscripts/%.lua: $(srcdir)/%.lua
+ 	$(CPP) $(foreach X, $(INCLUDES), -include $(X)) $< > $@

Modified: unstable/kq/debian/patches/020_usr_share_games.diff
===================================================================
--- unstable/kq/debian/patches/020_usr_share_games.diff	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/patches/020_usr_share_games.diff	2006-05-28 22:02:12 UTC (rev 20)
@@ -1,52 +1,27 @@
 Index: kq-0.99.cvs20060528/scripts/cult.lua
 ===================================================================
 --- kq-0.99.cvs20060528.orig/scripts/cult.lua	2006-05-28 00:12:34.000000000 +0200
-+++ kq-0.99.cvs20060528/scripts/cult.lua	2006-05-28 00:17:31.000000000 +0200
++++ kq-0.99.cvs20060528/scripts/cult.lua	2006-05-28 07:47:32.000000000 +0200
 @@ -363,7 +363,7 @@
    local a, b, dx, dy
    local ax, ay, z
  
 -  create_df("data/mpcx.dat", "LFLAME_PCX")
-+  create_df("/usr/share/games/kq/data/mpcx.dat", "LFLAME_PCX")
++  create_df("mpcx.dat", "LFLAME_PCX")
    create_bmp(0, 24, 24)
    df2bmp(0, 0, 16, 0, 0, 24, 24)
    create_bmp(1, 64, 16)
-Index: kq-0.99.cvs20060528/src/unix.c
+Index: kq-0.99.cvs20060528/src/intrface.c
 ===================================================================
---- kq-0.99.cvs20060528.orig/src/unix.c	2006-05-28 00:12:35.000000000 +0200
-+++ kq-0.99.cvs20060528/src/unix.c	2006-05-28 00:20:42.000000000 +0200
-@@ -41,6 +41,9 @@
+--- kq-0.99.cvs20060528.orig/src/intrface.c	2006-05-28 07:45:55.000000000 +0200
++++ kq-0.99.cvs20060528/src/intrface.c	2006-05-28 07:47:09.000000000 +0200
+@@ -2359,7 +2359,8 @@
  
+ static int KQ_create_df (lua_State * L)
+ {
+-   g_df = load_datafile_object (lua_tostring (L, 1), lua_tostring (L, 2));
++   g_df = load_datafile_object (kqres(DATA_DIR, lua_tostring (L, 1)),
++                                lua_tostring (L, 2));
+    return 0;
+ }
  
- 
-+#define LIB_DIR "/usr/lib/games/kq"
-+#define SHARE_DIR "/usr/share/games/kq"
-+
- /*! \brief Return the name of 'significant' directories.
-  *
-  * Checks to see if the exe is in its correct, install location (set
-@@ -75,14 +78,7 @@
-          strcpy (user_dir, ".");
-       }
-       /* Now the data directory */
--      get_executable_name (exe, sizeof (exe));
--      if (strcmp (exe, KQ_BIN) == 0) {
--         /* It's in its proper installed location */
--         strcpy (game_dir, KQ_DATA);
--      } else {
--         /* Not installed, development version */
--         strcpy (game_dir, ".");
--      }
-+      strcpy(game_dir, SHARE_DIR);
-       init_path = 1;
-    }
-    switch (dir) {
-@@ -100,7 +96,7 @@
-       sprintf (ans, "%s/%s", user_dir, file);
-       break;
-    case SCRIPT_DIR:
--      sprintf (ans, "%s/scripts/%s", game_dir, file);
-+      sprintf (ans, "%s/scripts/%s", LIB_DIR, file);
-       break;
-    default:
-       return NULL;

Modified: unstable/kq/debian/patches/series
===================================================================
--- unstable/kq/debian/patches/series	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/patches/series	2006-05-28 22:02:12 UTC (rev 20)
@@ -1,4 +1,6 @@
-010_luac50.diff 
+000_luac50.diff 
+000_scripts_in_pkglibdir.diff
+010_rebootstrap.diff
 020_alternate_keys.diff
 020_cosmetic_credits.diff
 020_stretch_view.diff

Modified: unstable/kq/debian/rules
===================================================================
--- unstable/kq/debian/rules	2006-05-28 02:53:44 UTC (rev 19)
+++ unstable/kq/debian/rules	2006-05-28 22:02:12 UTC (rev 20)
@@ -9,7 +9,7 @@
 	touch configure
 	touch config.h.in
 	touch `find . -name Makefile.in`
-	./configure --prefix=/usr
+	./configure --prefix=/usr --bindir=/usr/games --libdir=/usr/lib/games --datadir=/usr/share/games CFLAGS="-Wall -g -O2"
 	$(MAKE)
 	touch build-stamp
 
@@ -27,32 +27,18 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs -pkq usr/games \
-		usr/share/games/kq \
-		usr/lib/games/kq/scripts
-	dh_installdirs -pkq-data usr/share/doc \
-		usr/share/games/kq/data \
-		usr/share/games/kq/maps \
-		usr/share/games/kq/music
+	dh_installdirs -pkq usr/share/games/kq usr/share/doc
+	dh_installdirs -pkq-data usr/share/doc
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	dh_install --sourcedir=debian/tmp --list-missing
+	install -m 644 debian/kq.xpm debian/kq/usr/share/games/kq/
+	ln -s kq-data `pwd`/debian/kq/usr/share/doc/kq
 
-	install -m 755 kq `pwd`/debian/kq/usr/games/
-	install -m 644 debian/kq.xpm `pwd`/debian/kq/usr/share/games/kq/
-
-	install -m 644 `find data -name '*.dat' -o -name '*.mon' -o -name '*.kq'` \
-		`pwd`/debian/kq-data/usr/share/games/kq/data/
-	install -m 644 `find maps -name '*.map'` \
-		`pwd`/debian/kq-data/usr/share/games/kq/maps/
-	install -m 644 `find music -name '*.*m*'` \
-		`pwd`/debian/kq-data/usr/share/games/kq/music/
-	# Hahaha! luac-compiled files are not fully portable!
-	install -m 644 `find scripts -name '*.lob'` \
-		`pwd`/debian/kq/usr/lib/games/kq/scripts/
-
-	ln -s kq `pwd`/debian/kq-data/usr/share/doc/kq-data
-
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
+	dh_installdocs -i readme.txt
+	dh_installchangelogs -i ChangeLog
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -64,10 +50,8 @@
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_installdocs -a readme.txt
 	dh_installmenu -a
 	dh_installman -a debian/kq.6
-	dh_installchangelogs -a ChangeLog
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a




More information about the Pkg-allegro-commits mailing list