Author: arand-guest
Date: 2011-11-02 09:50:53 +0000 (Wed, 02 Nov 2011)
New Revision: 12769
Removed:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.lintian-overrides
Modified:
non-free/packages/trunk/assaultcube-data/debian/changelog
non-free/packages/trunk/assaultcube-data/debian/control
non-free/packages/trunk/assaultcube-data/debian/rules
non-free/packages/trunk/assaultcube-data/debian/watch
Log:
Revert all rename, norepack, anticheat
* Even though it's non-free anyways, it seems unnecessary to dump
in proprietary items which, as far as I can see, are not highly
requested.
* I assume that those who wants the anticheat feature, will be ok
with getting it from upstream, rather than Debian.
Therefore I'm reverting the creation of the anticheat package, the
source package rename, and the no-repacking changes.
Deleted:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
===================================================================
---
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
2011-11-02 08:16:44 UTC (rev 12768)
+++
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.amd64
2011-11-02 09:50:53 UTC (rev 12769)
@@ -1,2 +0,0 @@
-amd64/ac_server-anticheat usr/lib/games/assaultcube
-debian/scripts/assaultcube-server-anticheat usr/games
Deleted:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
===================================================================
---
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
2011-11-02 08:16:44 UTC (rev 12768)
+++
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.install.i386
2011-11-02 09:50:53 UTC (rev 12769)
@@ -1,2 +0,0 @@
-debian/tmp/i386/ac_server-anticheat usr/lib/games/assaultcube
-debian/scripts/assaultcube-server-anticheat usr/games
Deleted:
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.lintian-overrides
===================================================================
---
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.lintian-overrides
2011-11-02 08:16:44 UTC (rev 12768)
+++
non-free/packages/trunk/assaultcube-data/debian/assaultcube-server-anticheat.lintian-overrides
2011-11-02 09:50:53 UTC (rev 12769)
@@ -1,3 +0,0 @@
-# The content of the manpages are provided by the assaultcube-data package
-# instead.
-assaultcube-server-anticheat: binary-without-manpage
usr/games/assaultcube-server-anticheat
Modified: non-free/packages/trunk/assaultcube-data/debian/changelog
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/changelog 2011-11-02
08:16:44 UTC (rev 12768)
+++ non-free/packages/trunk/assaultcube-data/debian/changelog 2011-11-02
09:50:53 UTC (rev 12769)
@@ -1,13 +1,8 @@
-assaultcube-nonfree (1.1.0.4+repacknot1-1) unstable; urgency=low
+assaultcube-data (1.1.0.4+repack1-2) unstable; urgency=low
[ Martin Erik Werner]
- * Rename source package to assaultcube-nonfree
- * New package: assaultcube-server-anticheat, installs upstream server
binaries
- * New package: assaultcube-docs, containing html documentation
- * Upstream tarball no longer repacked; binaries not removed since used
* Install tutorial demo in assaultcube-data as well
* Install external documentation and register with doc-base
- * Create a wrapper script for the server with "--help" for manpage
* Update debian/rules to dh7 format
* Update manpages
- CC-BY-NC-SA (previous license was incorrect given content used)
@@ -20,7 +15,7 @@
* Update VCS-browse control field, op=log -> view=log
* Change all Arand -> Martin; same person, now with real name
- -- Martin Erik Werner <[email protected]> Sun, 30 Oct 2011 12:40:49
+0100
+ -- Martin Erik Werner <[email protected]> Wed, 02 Nov 2011 08:26:42
+0100
assaultcube-data (1.1.0.4+repack1-1) unstable; urgency=low
Modified: non-free/packages/trunk/assaultcube-data/debian/control
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/control 2011-11-02
08:16:44 UTC (rev 12768)
+++ non-free/packages/trunk/assaultcube-data/debian/control 2011-11-02
09:50:53 UTC (rev 12769)
@@ -1,4 +1,4 @@
-Source: assaultcube-nonfree
+Source: assaultcube-data
Section: non-free/games
Priority: optional
Maintainer: Debian Games Team <[email protected]>
@@ -20,17 +20,3 @@
.
This package contains data used by AssaultCube, and external documentation in
HTML format.
-
-Package: assaultcube-server-anticheat
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends},
- assaultcube-data (>= 1.1.0.4+repacknot1)
-Description: AssaultCube server with closed source anti-cheat module
- AssaultCube, formerly ActionCube, is a first-person-shooter based on the
- game Cube. Set in a realistic looking environment, as far as that's
- possible with this engine, while gameplay stays fast and arcade. This
- game is all about team oriented multiplayer fun.
- .
- This package contains the server binary, as distributed by the creators
- of AssaultCube, which has been compiled with an additional closed source
- anti-cheat module.
Modified: non-free/packages/trunk/assaultcube-data/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/rules 2011-11-02
08:16:44 UTC (rev 12768)
+++ non-free/packages/trunk/assaultcube-data/debian/rules 2011-11-02
09:50:53 UTC (rev 12769)
@@ -3,18 +3,20 @@
%:
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" --exclude="package_copyrights.txt"
find debian/assaultcube-data -type f ! -name 'rules' -exec chmod 644 {}
\;
VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+]+).*,\1,p')
DEB_VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+DIR=assaultcube-data-$(VER)+repack1
+TARBALL=assaultcube-data_$(DEB_VER).orig.tar.gz
get-orig-source:
- uscan --noconf --force-download --rename --download-current-version
--destdir=.
- mv assaultcube-nonfree_$(VER).orig.tar.bz2 \
- assaultcube-nonfree_$(DEB_VER).orig.tar.bz2
+ uscan --noconf --force-download --download-current-version --destdir=.
+ rm -rf $(VER) $(DIR)
+ tar -xjf assaultcube-data_$(VER).orig.tar.bz2
+ mv $(VER) $(DIR)
+ rm -rf $(DIR)/bin_unix/
+ GZIP=--best tar -cz --owner root --group root --mode a+rX \
+ -f $(TARBALL) $(DIR)
+ rm -rf $(DIR)
Modified: non-free/packages/trunk/assaultcube-data/debian/watch
===================================================================
--- non-free/packages/trunk/assaultcube-data/debian/watch 2011-11-02
08:16:44 UTC (rev 12768)
+++ non-free/packages/trunk/assaultcube-data/debian/watch 2011-11-02
09:50:53 UTC (rev 12769)
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\+repacknot\d+$//g \
+opts=dversionmangle=s/\+repack\d+$//g \
http://sf.net/actiongame/AssaultCube_v([\.0-9]+)\.tar\.bz2
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
