Subject: unblock: torcs/1.3.3+dfsg-0.1 Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Severity: normal X-Debbugs-CC: Rudy Godoy <rudy@stone-head.org> Please unblock package torcs It fixes an RC-bug (#685144) by simply removing the useless windows directory from the source package (and the useless CVS directories as advised by Ansgar in the bug report, that were causing FTBFS issue anyway). It also fixes another FTBFS RC-bug (#684845) by protecting the files automatically changed during the build process. The torcs_unstable.diff (with --exclude windows --exclude CVS) shows only those changes. As previously asked in the “torcs and torcs-data-*” thread I'm replying to, the maintainer prepared some other fixes in unstable, mostly documentation related, and a detail in rules already almost accepted by Adam (I hope I read you correctly on this one, apologies if I didn't). The full torcs_testing.diff (with --exclude windows --exclude CVS) show the actual differences from testing. Thanks in Advance. Regards David unblock torcs/1.3.3+dfsg-0.1 P.-S.: copy of <1343243139.495.30.camel@jacala.jungle.funky-badger.org> in case my “Reply-to” is broken. Le 25/07/2012 15:05, Adam D. Barratt a écrit : > On Wed, 2012-07-25 at 07:25 -0500, Rudy Godoy wrote: >> On Mon, Jul 23, 2012 at 07:59:08PM +0100, Adam D. Barratt wrote: >>> On Mon, 2012-07-23 at 12:29 -0500, Rudy Godoy wrote: >>>> So, in that case I'd like you to let pass rev. 6 (1.3.3-6) >>>> packages from sid. >>> >>> You're supposed to provide a rationale, not just say "oh, go on, >>> please". ;-p >>> >>> From a quick look at the diff from the version in testing, lintian fixes >>> generally don't qualify for unblocks, nor does a complete rewrite of the >>> copyright file in to DEP-5 format. >>> >>> I guess one could claim that some of the changes are documentation >>> updates, but that's certainly stretching it for the copyright file. >>> >> Basically, the DEP-5 involved primarily more detailed licensing terms >> for the game's artwork. Which was not included in the past. > >>From an unblock / review perspective, it would have been more helpful to > have simply added those to the existing file. :-( > >> Few >> things remain to clean-up for some data files, I might need to >> contact designers/authors for that. > > Is there an ETA for having that sorted out? > >> Second, with the new packaging layout I also created an VCs repo >> under the pkg-games umbrella, so that we are able to maintain >> and support on stable releases. > > That's already been in testing since May, so isn't really an argument > for an unblock. ;-p […] > As I indicated at the time, I'd still > appreciate the first being answered. > > Regards, > > Adam > >
diffstat for torcs-1.3.3 torcs-1.3.3+dfsg README.Debian-source | 12 ++++++++++++ changelog | 11 +++++++++++ rules | 10 ++++++++++ 3 files changed, 33 insertions(+) diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/changelog torcs-1.3.3+dfsg/debian/changelog --- torcs-1.3.3/debian/changelog 2012-07-05 11:42:03.000000000 -0400 +++ torcs-1.3.3+dfsg/debian/changelog 2012-08-24 01:10:15.000000000 -0400 @@ -1,3 +1,14 @@ +torcs (1.3.3+dfsg-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Repack source, removing src/windows including libraries for Win32 in + binary form only, and useless CVS directories. (Closes: #685144) + * debian/rules: protect automatically modified files during the source + building, restore them at the end of the process, and remove other extra + files during the clean target. (Closes: #684845) + + -- David Prévot <taffit@debian.org> Fri, 24 Aug 2012 01:08:42 -0400 + torcs (1.3.3-6) unstable; urgency=low * Resolved Lintian warnings diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/README.Debian-source torcs-1.3.3+dfsg/debian/README.Debian-source --- torcs-1.3.3/debian/README.Debian-source 2012-07-05 11:42:03.000000000 -0400 +++ torcs-1.3.3+dfsg/debian/README.Debian-source 2012-08-23 22:32:29.000000000 -0400 @@ -1,3 +1,15 @@ +torcs (1.3.3+dfsg-0.1) unstable; urgency=low + + * Repack source package: + tar xaf torcs_1.3.3.orig.tar.bz2 + find torcs-1.3.3 -type d -name CVS | xargs rm -r + rm -r torcs-1.3.3/src/windows + mv torcs-1.3.3 torcs-1.3.3+dfsg + tar -cf torcs_1.3.3+dfsg.orig.tar torcs-1.3.3+dfsg + xz torcs_1.3.3+dfsg.orig.tar + + -- David Prévot <taffit@debian.org> Thu, 23 Aug 2012 20:53:34 -0400 + torcs (1.3.3-2) unstable; urgency=low * Package building now uses upstream's "all-in-one" source package. diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/rules torcs-1.3.3+dfsg/debian/rules --- torcs-1.3.3/debian/rules 2012-07-05 11:42:03.000000000 -0400 +++ torcs-1.3.3+dfsg/debian/rules 2012-08-24 00:52:07.000000000 -0400 @@ -30,6 +30,16 @@ # remove VCS files present in source find $(CURDIR) -type d -name "CVS" | xargs rm -rf rm -f $(CURDIR)/debian/stamp* + mkdir debian/memory + cp Make-config config.h src/doc/torcsdoc.conf debian/memory + +clean:: + cp debian/memory/Make-config debian/memory/config.h . + cp debian/memory/torcsdoc.conf src/doc/ + rm -f src/linux/torcs src/tools/accc/accc src/tools/nfs2ac/nfs2ac \ + src/tools/nfsperf/nfsperf src/tools/texmapper/texmapper \ + src/tools/trackgen/trackgen stamp-h1 + rm -r debian/memory binary-predeb/torcs:: # removing shipped Makefiles
diffstat for torcs-1.3.3 torcs-1.3.3+dfsg
README.Debian-source | 12 ++++
TODO.Debian | 7 ++
changelog | 31 ++++++++++++
control | 77 ++++++++++++++++++-------------
copyright | 126 ++++++++++++++++++++++++++++++++++++---------------
rules | 14 +++++
6 files changed, 199 insertions(+), 68 deletions(-)
diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/changelog torcs-1.3.3+dfsg/debian/changelog
--- torcs-1.3.3/debian/changelog 2012-05-15 18:50:29.000000000 -0400
+++ torcs-1.3.3+dfsg/debian/changelog 2012-08-24 00:51:35.000000000 -0400
@@ -1,3 +1,34 @@
+torcs (1.3.3+dfsg-0.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Repack source, removing src/windows including libraries for Win32 in
+ binary form only. (Closes: #685144)
+ * debian/rules: protect automatically modified files during the source
+ building, and restore them at the end of the process, and remove other
+ extra files during the clean target. (Closes: #684845)
+
+ -- David Prévot <taffit@debian.org> Thu, 23 Aug 2012 23:12:38 -0400
+
+torcs (1.3.3-6) unstable; urgency=low
+
+ * Resolved Lintian warnings
+ - debian/copyright: Licensing for 155-DTM is GPL, according sources.
+ - debian/rules: Empty script in torcs-data.
+
+ -- Rudy Godoy <rudy@stone-head.org> Wed, 04 Jul 2012 22:26:21 -0500
+
+torcs (1.3.3-5) unstable; urgency=low
+
+ * Reworked debian/copyright to conform machine readable policy.
+ * Added artwork licensing for cars (-data-cars).
+ * Updated car list shipped within the torcs-data-cars package.
+ (Closes: #678827)
+ * Removed empty script (telemetry.sh) from torcs to make lintian happy.
+ * Reworded -data* packages description to be more descriptive and clear.
+ * Removed 'Website' pseudo-field since the package has Homepage field set.
+
+ -- Rudy Godoy <rudy@stone-head.org> Wed, 30 May 2012 18:30:54 -0500
+
torcs (1.3.3-4) unstable; urgency=low
* Fixed wording on package description.
diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/control torcs-1.3.3+dfsg/debian/control
--- torcs-1.3.3/debian/control 2012-05-15 18:50:29.000000000 -0400
+++ torcs-1.3.3+dfsg/debian/control 2012-07-05 11:42:03.000000000 -0400
@@ -12,14 +12,15 @@
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, torcs-data (>= 1.3.3)
Description: 3D racing cars simulator game using OpenGL
- TORCS, The Open Racing Car Simulator is a car racing simulation which
- allows you to drive in races against opponents simulated by the computer.
+ TORCS, The Open Racing Car Simulator is a car racing simulation game
+ which allows you to drive in races against opponents simulated by
+ the computer.
You can also develop your own computer-controlled driver (also called a
robot) in C or C++. TORCS is GPL (version 2 or later).
.
Hardware requirements are at least 550MHZ CPU, 256MB RAM and 32 MB
- OpenGL 1.3 compatible graphics card (with 3D accel preferred) in order to
- fully enjoy the game.
+ OpenGL 1.3 compatible graphics card (with 3D accel preferred) in order
+ to fully enjoy the game.
Package: torcs-data
@@ -29,13 +30,13 @@
Replaces: torcs-data-cars (<< 1.3.3), torcs (<< 1.3.3)
Breaks: torcs (<< 1.3.3)
Description: base data files for TORCS game
- TORCS, The Open Racing Car Simulator is a car racing simulation which
- allows you to drive in races against opponents simulated by the computer.
- .
- This package includes basic data files for the game. Additionally it includes
- one car: Ferrari 360 Modena.
- .
- Website: http://torcs.org
+ TORCS, The Open Racing Car Simulator is a car racing simulation game
+ which allows you to drive in races against opponents simulated by
+ the computer.
+ .
+ This package includes basic data files for the game plus one car:
+ Ferrari 360 Modena. For additional cars and tracks install the
+ torcs-data-tracks and torcs-data-cars packages.
Package: torcs-data-cars
@@ -46,28 +47,42 @@
Replaces: torcs-data-cars-extra (<< 1.3.3), torcs-data (<< 1.3.3)
Breaks: torcs-data (<< 1.3.3)
Description: data files for TORCS game - Cars set
- TORCS, The Open Racing Car Simulator is a car racing simulation which
- allows you to drive in races against opponents simulated by the computer.
+ TORCS, The Open Racing Car Simulator is a car racing simulation game
+ which allows you to drive in races against opponents simulated by
+ the computer.
.
This package includes the following cars for the game.
- Alfa Romeo 155 (DTM)
- - Honda Acura NSX SZ
+ - Acura NSX type S-Zero
- Baja Bug
- Buggy
- - Mercedes CLK (DTM)
- - Ford GT40
- - Lotus GT1
- - McLaren F1
+ - Toyota 2000 GT
+ - Bizzarrini 5300 GT
+ - Alpine A110
+ - Alfa Romeo TZ2
+ - Austin-Healey 3000 Mk II
+ - AC Cobra 427
+ - Cobra Daytona Shelby
+ - Opel GT Conrero
+ - Corvette T-Top
+ - Ferrari 365 Gtb4 Daytona
+ - Aston Martin DB4 GT Zagato
+ - Aston Martin DBS
+ - Ferrari Dino 246 GT
+ - Maserati Ghibli
+ - Alfa Romeo Giulietta spider
+ - Iso Grifo
+ - Ford Gt40
+ - Ferrari 250 GTO
+ - Ferrari 330 P4
- Peugeot 406
- - Porsche GT1
- - Porsche GT3RS
- - Viper GTS-R
- - Jaguar XJ220
- - Nascar RWD
- - Althea X2 GTS
- .
- Website: http://torcs.org
-
+ - Peugeot 206 WRC
+ - Peugeot 306 Maxi
+ - Toyota Corolla WRC
+ - Mitsubishi Lancer EVO VI WRC
+ - Ford Focus WRC
+ - Subaru Impreza WRC
+ - and More!
Package: torcs-data-tracks
Architecture: all
@@ -75,12 +90,12 @@
Recommends: torcs (>= 1.3.3)
Replaces: torcs-data-tracks (<< 1.3.3)
Description: data files for TORCS game - Tracks set
- TORCS, The Open Racing Car Simulator is a car racing simulation which
- allows you to drive in races against opponents simulated by the computer.
+ TORCS, The Open Racing Car Simulator is a car racing simulation game
+ which allows you to drive in races against opponents simulated by
+ the computer.
.
This package includes the following tracks for the game.
- 13 road tracks
- 9 oval tracks
- 8 dirt tracks
- .
- Website: http://torcs.org
+
diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/copyright torcs-1.3.3+dfsg/debian/copyright
--- torcs-1.3.3/debian/copyright 2012-05-15 18:50:29.000000000 -0400
+++ torcs-1.3.3+dfsg/debian/copyright 2012-07-05 11:42:03.000000000 -0400
@@ -1,35 +1,91 @@
-This package was debianized by Rudy Godoy <rudy@kernel-panik.org> on
-Thu, 26 Feb 2004 21:19:34 -0500.
-
-The current Debian maintainer is Rudy Godoy <rudy@stone-head.org>
-
-It was downloaded from http://torcs.sourceforge.net/
-http://prdownloads.sourceforge.net/torcs/TORCS-1.2.2-src.tgz?download
-
-Upstream Authors: Eric Espié <eric.espie@free.fr>,
- Christophe Guionneau <Christophe.Guionneau@fnac.net>
-
-Copyright: 2000 - Eric Espié
- 2002 - Christophe Guionneau
- 2005 - Bernhard Wymann
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-if not, write to the Free Software Foundation, Inc., 51 Franklin St,
-Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-The Debian packaging is (C) 2004, Rudy Godoy Guillén <rudy@stone-head.org> and
-is licensed under the GPL, see above.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Eric Espié <eric.espie@free.fr>
+Upstream-Contact: Bernhard Wymann <berniew@bluechin.ch>
+Source: http://torcs.sourceforge.net
+
+Files: *
+Copyright: 2000, Eric Espié <eric.espie@free.fr>
+ 2002, Christophe Guionneau <christophe.guinneau@fnac.net>
+ 2005, Bernhard Wymann <berniew@bluechin.ch>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+Files: data/cars/models/155-DTM/*
+Copyright: 2000, Andrea Alfieri <alfiogt@libero.it>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+Files: data/cars/models/acura-nsx-sz/*
+Copyright: 2002, Jean-Christophe Durieu
+ 2000, ViPeR <viper@mttestdriver.com>
+License: FreeArtLicense
+ This is a free work, you can copy, distribute,
+ and modify it under the terms of the Free Art License
+ .
+ http://artlibre.org/licence/lal/en/
+
+Files: data/cars/models/baja-bug/*
+Copyright: 200, Jean-Christophe Durieu
+License: FreeArtLicense
+ This is a free work, you can copy, distribute,
+ and modify it under the terms of the Free Art License
+ .
+ http://artlibre.org/licence/lal/en/
+
+Files: data/cars/models/car1-ow1
+Copyright: 2004, SpeedyChonChon
+License: FreeArtLicense
+ This is a free work, you can copy, distribute,
+ and modify it under the terms of the Free Art License
+ .
+ http://artlibre.org/licence/lal/en/
+
+Files: debian/*
+Copyright: 2004, Rudy Godoy Guillén <rudy@stone-head.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/README.Debian-source torcs-1.3.3+dfsg/debian/README.Debian-source
--- torcs-1.3.3/debian/README.Debian-source 2012-05-15 18:50:29.000000000 -0400
+++ torcs-1.3.3+dfsg/debian/README.Debian-source 2012-08-23 22:32:29.000000000 -0400
@@ -1,3 +1,15 @@
+torcs (1.3.3+dfsg-0.1) unstable; urgency=low
+
+ * Repack source package:
+ tar xaf torcs_1.3.3.orig.tar.bz2
+ find torcs-1.3.3 -type d -name CVS | xargs rm -r
+ rm -r torcs-1.3.3/src/windows
+ mv torcs-1.3.3 torcs-1.3.3+dfsg
+ tar -cf torcs_1.3.3+dfsg.orig.tar torcs-1.3.3+dfsg
+ xz torcs_1.3.3+dfsg.orig.tar
+
+ -- David Prévot <taffit@debian.org> Thu, 23 Aug 2012 20:53:34 -0400
+
torcs (1.3.3-2) unstable; urgency=low
* Package building now uses upstream's "all-in-one" source package.
diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/rules torcs-1.3.3+dfsg/debian/rules
--- torcs-1.3.3/debian/rules 2012-05-15 18:50:29.000000000 -0400
+++ torcs-1.3.3+dfsg/debian/rules 2012-08-24 00:52:07.000000000 -0400
@@ -30,17 +30,29 @@
# remove VCS files present in source
find $(CURDIR) -type d -name "CVS" | xargs rm -rf
rm -f $(CURDIR)/debian/stamp*
+ mkdir debian/memory
+ cp Make-config config.h src/doc/torcsdoc.conf debian/memory
+
+clean::
+ cp debian/memory/Make-config debian/memory/config.h .
+ cp debian/memory/torcsdoc.conf src/doc/
+ rm -f src/linux/torcs src/tools/accc/accc src/tools/nfs2ac/nfs2ac \
+ src/tools/nfsperf/nfsperf src/tools/texmapper/texmapper \
+ src/tools/trackgen/trackgen stamp-h1
+ rm -r debian/memory
binary-predeb/torcs::
# removing shipped Makefiles
find debian/torcs/usr/share/games/torcs -type f -name Makefile | xargs --no-run-if-empty rm -f
# stripped installed files that go into -data packages.
rm -rf debian/torcs/usr/share/games/torcs
+# removes empty script to make lintian happy
+ rm -f debian/torcs/usr/share/games/torcs/telemetry/telemetry.sh
build/torcs-data::
$(MAKE) datainstall DESTDIR=$(CURDIR)/debian/tmp
-build-predeb/torcs-data::
+binary-predeb/torcs-data::
# removing empty script until it's ready
rm -f debian/torcs-data/usr/share/games/torcs/telemetry/telemetry.sh
diff -Nru --exclude windows --exclude CVS torcs-1.3.3/debian/TODO.Debian torcs-1.3.3+dfsg/debian/TODO.Debian
--- torcs-1.3.3/debian/TODO.Debian 2012-05-15 18:50:29.000000000 -0400
+++ torcs-1.3.3+dfsg/debian/TODO.Debian 2012-07-05 11:42:03.000000000 -0400
@@ -1,6 +1,11 @@
TODO list for torcs in Debian
-----------------------------
+Cars and artwork licensing:
+- There are some cars that have an unclear licensing so that
+ it need further investigation to move them to the non-free
+ section. This will involve splitting the -data-cars package.
+
Upstream tarballs handling:
- Migrate upstream Makefiles to be generated by Automake, thus avoid
loops and unnecesary recursion, also having a sane Make system.
@@ -8,4 +13,4 @@
- Talk to upstream to merge with this new yet-on-progress Makefile system.
Status: work on progress. Debian part is prepared to support it.
-Rudy Godoy <rudy@kernel-panik.org> May. 15, 2012
+Rudy Godoy <rudy@kernel-panik.org> June. 30, 2012
Attachment:
signature.asc
Description: OpenPGP digital signature