Author: arand-guest
Date: 2011-05-17 13:57:51 +0000 (Tue, 17 May 2011)
New Revision: 12398
Added:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.docs
non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.install
non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.links
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
Modified:
non-free/packages/trunk/assaultcube-data/debian/control
non-free/packages/trunk/assaultcube-data/debian/rules
non-free/packages/trunk/assaultcube-data/debian/scripts/assaultcube-server-anticheat
Log:
switch to dh7, use links in scripts
* Majority of installation now via .* files instead of in d/rules
* Execute server in lib dir and use links to share instead
* Rename server binaries and put in d/tmp in first install step.
Added: non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.docs
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.docs
(rev 0)
+++ non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.docs
2011-05-17 13:57:51 UTC (rev 12398)
@@ -0,0 +1 @@
+docs README.html
Added: non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.install
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.install
(rev 0)
+++ non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.install
2011-05-17 13:57:51 UTC (rev 12398)
@@ -0,0 +1,2 @@
+config usr/share/games/assaultcube
+packages usr/share/games/assaultcube
Added: non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.links
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.links
(rev 0)
+++ non-free/packages/trunk/assaultcube-data/debian/assaultcube-data.links
2011-05-17 13:57:51 UTC (rev 12398)
@@ -0,0 +1,2 @@
+usr/share/games/assaultcube/config usr/lib/games/assaultcube/config
+usr/share/games/assaultcube/packages usr/lib/games/assaultcube/packages
Added:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
===================================================================
---
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
(rev 0)
+++
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
2011-05-17 13:57:51 UTC (rev 12398)
@@ -0,0 +1,2 @@
+amd64/ac_server-anticheat usr/lib/games/assaultcube
+debian/scripts/assaultcube-server-anticheat usr/games
Added:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
===================================================================
---
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
(rev 0)
+++
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
2011-05-17 13:57:51 UTC (rev 12398)
@@ -0,0 +1,2 @@
+debian/tmp/i386/ac_server-anticheat usr/lib/games/assaultcube
+debian/scripts/assaultcube-server-anticheat usr/games
Modified: non-free/packages/trunk/assaultcube-data/debian/control
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/control 2011-05-17
13:04:35 UTC (rev 12397)
+++ non-free/packages/trunk/assaultcube-data/debian/control 2011-05-17
13:57:51 UTC (rev 12398)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <[email protected]>
Uploaders: Arand Nash <[email protected]>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.9.2
Vcs-Svn:
svn://svn.debian.org/svn/pkg-games/non-free/packages/trunk/assaultcube-data/
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/non-free/packages/trunk/assaultcube-data/?op=log
Modified: non-free/packages/trunk/assaultcube-data/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/rules 2011-05-17
13:04:35 UTC (rev 12397)
+++ non-free/packages/trunk/assaultcube-data/debian/rules 2011-05-17
13:57:51 UTC (rev 12398)
@@ -1,5 +1,17 @@
#!/usr/bin/make -f
+# -*- makefile -*-
+%:
+ dh $@
+override_dh_auto_install:
+ install -D bin_unix/linux_64_server debian/tmp/amd64/ac_server-anticheat
+ install -D bin_unix/linux_server debian/tmp/i386/ac_server-anticheat
+ dh_auto_install
+
+override_dh_install:
+ dh_install --exclude="license.txt"
+ find debian/assaultcube-data -type f ! -name 'rules' -exec chmod 644 {}
\;
+
DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version:
([^-+]+).*,\1,p')
DEB_UPSTREAM_REPACK_VERSION=$(shell dpkg-parsechangelog | sed -rne
's,^Version: ([^-]+).*,\1,p')
get-orig-source:
@@ -14,68 +26,3 @@
assaultcube-data-$(DEB_UPSTREAM_REPACK_VERSION).orig
rm -r assaultcube-data-$(DEB_UPSTREAM_REPACK_VERSION).orig
-build:
- # nothing
-
-build-arch:
- # nothing
-
-build-indep:
- # nothing
-
-clean:
- dh_testdir
- dh_testroot
- dh_clean
-
-install:
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- dh_install -passaultcube-data config usr/share/games/assaultcube
- dh_install -passaultcube-data packages usr/share/games/assaultcube
- dh_install -passaultcube-server-anticheat
debian/scripts/assaultcube-server-anticheat usr/games
- find debian/assaultcube-data -type f ! -name 'rules' -exec chmod 644 {}
\;
- find debian/assaultcube-data -name 'license.txt' -exec rm {} \;
-
-# We want to rename and install the arch-dependent server binaries
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdocs -a
- dh_installchangelogs -a
-ifeq ($(DEB_HOST_ARCH),i386)
- install -D bin_unix/linux_server
debian/assaultcube-server-anticheat/usr/lib/games/assaultcube/ac_server-anticheat
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
- install -D bin_unix/linux_64_server
debian/assaultcube-server-anticheat/usr/lib/games/assaultcube/ac_server-anticheat
-endif
- dh_strip -a
- dh_shlibdeps -a
debian/assaultcube-server-anticheat/usr/lib/games/assaultcube/ac_server-anticheat
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i -passaultcube-data docs README.html
- dh_installexamples -i
- dh_installchangelogs -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary: binary-indep binary-arch
-
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary
install
Modified:
non-free/packages/trunk/assaultcube-data/debian/scripts/assaultcube-server-anticheat
===================================================================
---
non-free/packages/trunk/assaultcube-data/debian/scripts/assaultcube-server-anticheat
2011-05-17 13:04:35 UTC (rev 12397)
+++
non-free/packages/trunk/assaultcube-data/debian/scripts/assaultcube-server-anticheat
2011-05-17 13:57:51 UTC (rev 12398)
@@ -8,6 +8,6 @@
done
AC_OPTIONS=""
-cd /usr/share/games/assaultcube
-exec /usr/lib/games/assaultcube/ac_server-anticheat ${AC_OPTIONS} ${1+"$@"}
+cd /usr/lib/games/assaultcube
+exec ./ac_server-anticheat ${AC_OPTIONS} ${1+"$@"}
# ${1+"$@"} is a portability hack, keyword "wrapper script"
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
