Author: jmtd-guest
Date: 2007-06-30 15:23:03 +0000 (Sat, 30 Jun 2007)
New Revision: 3153
Added:
packages/trunk/freedoom/debian/freedm.install
packages/trunk/freedoom/debian/freedoom.dirs
packages/trunk/freedoom/debian/freedoom.docs
packages/trunk/freedoom/debian/freedoom.install
packages/trunk/freedoom/debian/freedoom.postinst
packages/trunk/freedoom/debian/freedoom.prerm
Removed:
packages/trunk/freedoom/debian/dirs
packages/trunk/freedoom/debian/docs
packages/trunk/freedoom/debian/postinst
packages/trunk/freedoom/debian/prerm
Modified:
packages/trunk/freedoom/debian/control
packages/trunk/freedoom/debian/rules
Log:
merge the freedm_binary branch
Modified: packages/trunk/freedoom/debian/control
===================================================================
--- packages/trunk/freedoom/debian/control 2007-06-30 15:17:57 UTC (rev
3152)
+++ packages/trunk/freedoom/debian/control 2007-06-30 15:23:03 UTC (rev
3153)
@@ -22,3 +22,13 @@
.
Combined with the GPL-licensed Doom source code this will result in a
complete Free Doom-based game.
+
+Package: freedm
+Architecture: all
+Recommends: prboom | doom-engine
+Description: multiplayer-oriented maps for Doom
+ Freedoom is a project to create a complete Doom II-compatible IWAD file
+ which is Free Software.
+ .
+ FreeDM is a sub-project to create a set of levels designed for deathmatch
+ play.
Deleted: packages/trunk/freedoom/debian/dirs
===================================================================
--- packages/trunk/freedoom/debian/dirs 2007-06-30 15:17:57 UTC (rev 3152)
+++ packages/trunk/freedoom/debian/dirs 2007-06-30 15:23:03 UTC (rev 3153)
@@ -1,2 +0,0 @@
-usr/share/games/doom
-usr/share/games/freedoom
Deleted: packages/trunk/freedoom/debian/docs
===================================================================
--- packages/trunk/freedoom/debian/docs 2007-06-30 15:17:57 UTC (rev 3152)
+++ packages/trunk/freedoom/debian/docs 2007-06-30 15:23:03 UTC (rev 3153)
@@ -1,3 +0,0 @@
-CREDITS
-NEWS
-README
Copied: packages/trunk/freedoom/debian/freedm.install (from rev 3152,
packages/branches/freedoom/freedm_binary/debian/freedm.install)
===================================================================
--- packages/trunk/freedoom/debian/freedm.install
(rev 0)
+++ packages/trunk/freedoom/debian/freedm.install 2007-06-30 15:23:03 UTC
(rev 3153)
@@ -0,0 +1 @@
+wads/freedm.wad usr/share/games/freedoom
Copied: packages/trunk/freedoom/debian/freedoom.dirs (from rev 3152,
packages/branches/freedoom/freedm_binary/debian/freedoom.dirs)
===================================================================
--- packages/trunk/freedoom/debian/freedoom.dirs
(rev 0)
+++ packages/trunk/freedoom/debian/freedoom.dirs 2007-06-30 15:23:03 UTC
(rev 3153)
@@ -0,0 +1,2 @@
+usr/share/games/doom
+usr/share/games/freedoom
Copied: packages/trunk/freedoom/debian/freedoom.docs (from rev 3152,
packages/branches/freedoom/freedm_binary/debian/freedoom.docs)
===================================================================
--- packages/trunk/freedoom/debian/freedoom.docs
(rev 0)
+++ packages/trunk/freedoom/debian/freedoom.docs 2007-06-30 15:23:03 UTC
(rev 3153)
@@ -0,0 +1,3 @@
+CREDITS
+NEWS
+README
Copied: packages/trunk/freedoom/debian/freedoom.install (from rev 3152,
packages/branches/freedoom/freedm_binary/debian/freedoom.install)
===================================================================
--- packages/trunk/freedoom/debian/freedoom.install
(rev 0)
+++ packages/trunk/freedoom/debian/freedoom.install 2007-06-30 15:23:03 UTC
(rev 3153)
@@ -0,0 +1 @@
+wads/doom2.wad usr/share/games/freedoom
Copied: packages/trunk/freedoom/debian/freedoom.postinst (from rev 3152,
packages/branches/freedoom/freedm_binary/debian/freedoom.postinst)
===================================================================
--- packages/trunk/freedoom/debian/freedoom.postinst
(rev 0)
+++ packages/trunk/freedoom/debian/freedoom.postinst 2007-06-30 15:23:03 UTC
(rev 3153)
@@ -0,0 +1,26 @@
+#! /bin/sh
+# postinst script for freedoom
+
+set -e
+
+case "$1" in
+ configure|abort-upgrade)
+ update-alternatives --install /usr/share/games/doom/doom2.wad \
+ doom2.wad \
+ /usr/share/games/freedoom/doom2.wad \
+ 50
+ ;;
+
+ abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Copied: packages/trunk/freedoom/debian/freedoom.prerm (from rev 3152,
packages/branches/freedoom/freedm_binary/debian/freedoom.prerm)
===================================================================
--- packages/trunk/freedoom/debian/freedoom.prerm
(rev 0)
+++ packages/trunk/freedoom/debian/freedoom.prerm 2007-06-30 15:23:03 UTC
(rev 3153)
@@ -0,0 +1,21 @@
+#! /bin/sh
+# prerm script for nodm
+
+set -e
+
+case "$1" in
+ remove)
+ update-alternatives --remove doom2.wad \
+ /usr/share/games/freedoom/doom2.wad
+ ;;
+ upgrade|deconfigure|failed-upgrade)
+ ;;
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Deleted: packages/trunk/freedoom/debian/postinst
===================================================================
--- packages/trunk/freedoom/debian/postinst 2007-06-30 15:17:57 UTC (rev
3152)
+++ packages/trunk/freedoom/debian/postinst 2007-06-30 15:23:03 UTC (rev
3153)
@@ -1,26 +0,0 @@
-#! /bin/sh
-# postinst script for freedoom
-
-set -e
-
-case "$1" in
- configure|abort-upgrade)
- update-alternatives --install /usr/share/games/doom/doom2.wad \
- doom2.wad \
- /usr/share/games/freedoom/doom2.wad \
- 50
- ;;
-
- abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/trunk/freedoom/debian/prerm
===================================================================
--- packages/trunk/freedoom/debian/prerm 2007-06-30 15:17:57 UTC (rev
3152)
+++ packages/trunk/freedoom/debian/prerm 2007-06-30 15:23:03 UTC (rev
3153)
@@ -1,21 +0,0 @@
-#! /bin/sh
-# prerm script for nodm
-
-set -e
-
-case "$1" in
- remove)
- update-alternatives --remove doom2.wad \
- /usr/share/games/freedoom/doom2.wad
- ;;
- upgrade|deconfigure|failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: packages/trunk/freedoom/debian/rules
===================================================================
--- packages/trunk/freedoom/debian/rules 2007-06-30 15:17:57 UTC (rev
3152)
+++ packages/trunk/freedoom/debian/rules 2007-06-30 15:23:03 UTC (rev
3153)
@@ -11,6 +11,7 @@
build-stamp:
dh_testdir
$(MAKE) wads/doom2.wad
+ $(MAKE) wads/freedm.wad
touch build-stamp
clean:
@@ -25,9 +26,8 @@
dh_testroot
dh_clean -k
dh_installdirs
+ dh_install
- install -m 644 wads/doom2.wad debian/freedoom/usr/share/games/freedoom
-
binary: binary-indep
binary-arch:
@@ -35,7 +35,7 @@
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs
+ dh_installdocs -A
dh_installchangelogs ChangeLog
dh_compress
dh_fixperms
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
