[Scummvm-cvs-logs] CVS: scummvm/dists/debian changelog,NONE,1.1 compat,NONE,1.1 scummvm.dirs,NONE,1.1 scummvm.docs,NONE,1.1 scummvm.manpages,NONE,1.1 scummvm.menu,NONE,1.1 control,1.4,1.5 copyright,1.1,1.2 prepare,1.4,1.5 rules,1.3,1.4 scummvm-cvs.dirs,1.2,NONE scummvm-cvs.docs,1.3,NONE scummvm-cvs.manpages,1.1,NONE scummvm-cvs.menu,1.2,NONE

Tore Anderson toreanderson at users.sourceforge.net
Mon Jul 18 14:56:31 CEST 2005 

Update of /cvsroot/scummvm/scummvm/dists/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20175

Modified Files:
	control copyright prepare rules 
Added Files:
	changelog compat scummvm.dirs scummvm.docs scummvm.manpages 
	scummvm.menu 
Removed Files:
	scummvm-cvs.dirs scummvm-cvs.docs scummvm-cvs.manpages 
	scummvm-cvs.menu 
Log Message:
Synchronized dists/debian with what's in the official Debian archives.


--- NEW FILE: changelog ---
scummvm (0.7.1-1) unstable; urgency=low

  * New upstream release.

  * debian/control:
      - Remove the nasm [!i386] build conflict, as the configure script now
        correctly detects if nasm can be used.
      - Up standards-version to 3.6.1.1 (no changes required).

  * configure:
      - Reverted to the upstream version, as the GCC 4.0 patch from 0.7.0-3 is
        now included there.

 -- Tore Anderson <tore at debian.org>  Tue, 29 Mar 2005 21:57:38 +0200

scummvm (0.7.0-3) unstable; urgency=medium

  * debian/control:
      - Add a version requirement of >= 1.1.1-2 to the libflac-dev build
        dependency, closes: #289214.
      - Add fluidsynth as a preferred alternative to the timidity suggestion.
      - Remove superfluous "the" from the description.

  * configure:
      - Partly apply patch from Andreas Jochens, closes: #289122.  Thanks!
        Hopefully, this should make it possible to compile ScummVM on AMD64
        using GCC 4.0.  GCC 4.0 is not yet supported from upstream, though.

 -- Tore Anderson <tore at debian.org>  Sat,  8 Jan 2005 15:03:34 +0100

scummvm (0.7.0-2) unstable; urgency=low

  * debian/control:
      - Build-depend on nasm only on i386.
      - Add a build conflict on nasm for all other archs than i386.
      - Add an explicit build dependency on libz-dev.

  * debian/copyright:
      - Change URLs from http://scummvm.sf.net/ to http://www.scummvm.org/.

 -- Tore Anderson <tore at debian.org>  Wed,  5 Jan 2005 23:22:08 +0100

scummvm (0.7.0-1) unstable; urgency=low

  * New upstream release.
      - Fixes scripting bug that in some cases may render the game unwinnable,
        closes: #209418.

  * debian/control:
      - Improve description.  Closes: #266055.  Thanks, Frederic Briere!
      - Add build dependencies on nasm, tetex-bin, tetex-extra, gs-gpl, and
        libflac-dev.

  * debian/rules, debian/scummvm.docs, debian/copyright:
      - Build and include README.pdf (generated from doc/*.tex).
      - Include AUTHORS, and reference it from debian/copyright instead of
        maintaining a separate list of authors there.

  * debian/scummvm.dirs, debian/rules, debian/scummvm.sh (removed):
      - A more sane default save game path has been chosen upstream.  Remove
        the Debian-specific wrapper script workaround introduced in 0.6.0-2
        accordingly.

 -- Tore Anderson <tore at debian.org>  Wed,  5 Jan 2005 14:43:08 +0100

scummvm (0.6.1b-1) unstable; urgency=low

  * New upstream release.

 -- Tore Anderson <tore at debian.org>  Fri,  6 Aug 2004 12:45:46 +0200

scummvm (0.6.1-1) unstable; urgency=low

  * New upstream release.

 -- Tore Anderson <tore at debian.org>  Mon, 26 Jul 2004 15:11:10 +0200

scummvm (0.6.0-2) unstable; urgency=low

  * debian/scummvm.dirs, debian/rules, debian/scummvm.sh (new):
      - Make /usr/games/scummvm be a wrapper script which creates the
        ~/.scummvmrc file if it doesn't already exist, setting the savegame
        path to ~/.scummvm/.  Closes: #216178.  This is a workaround, though,
        I really wish this would be fixed in the upstream sources.

  * debian/control:
      - Correct the compability chart link in the package description.
      - Update package description so it is clear that Flight of The Amazon
        Queen and Beneath a Steel Sky is available in Debian, closes: #245356.

  * debian/README.Debian (removed):
      - Removed from the package, as it only spoke of the ScummVM tools,
        which was removed in the 0.6.0-1 upload.  Closes: #259259 (sort-of).

  * base/main.cpp, scumm/actor.cpp, scumm/debugger.cpp:
      - GCC 3.4 fixes from Andreas Jochens.  Thanks!  Closes: #259835.

 -- Tore Anderson <tore at debian.org>  Sun, 18 Jul 2004 12:26:27 +0200

scummvm (0.6.0-1) unstable; urgency=low

  * New upstream release.

  * debian/control:
      - Build-Depend on libmpeg2-4-dev to support Broken Sword cutscenes.

  * debian/rules:
      - Start using upstream's new configure script.
      - Remove unneeded call to dh_link.

  * debian/scummvm.docs:
      - Add upstream's TODO file.

  * debian/scummvm.menu:
      - Enclose the "needs" and "section" directives in double quotes.

  * debian/patches/* (removed), debian/control, debian/rules:
      - Stop using dpatch.  All of the previously required patches are now
        integrated in the upstream sources.

  * debian/tools/* (removed), debian/scummvm.examples, debian/rules:
      - Remove the various tools as they really don't belong in the ScummVM
        package.

 -- Tore Anderson <tore at debian.org>  Sun, 14 Mar 2004 16:28:54 +0100

scummvm (0.5.1-4) unstable; urgency=low

  * debian/patches/03alsa_api_fix.dpatch (new), debian/patches/00list:
      - FTBFS fix;  improve ALSA version detection macro so it works with
        version 1.0 and above.  Thanks, Jordi Mallach!

 -- Tore Anderson <tore at debian.org>  Sun,  1 Feb 2004 01:36:07 +0100

scummvm (0.5.1-3) unstable; urgency=low

  * debian/patches/02bass_soundreload (new):
    - Forces BASS to reload music and sound even if the intro was
      viewed in full, closes: #208901.
  * debian/control:
    - Change maintainer email address.
    - Bump Standards-Version to current policy, no changes required.

 -- Tore Anderson <tore at debian.org>  Mon, 29 Sep 2003 16:13:43 +0200

scummvm (0.5.1-2) unstable; urgency=low

  * Move to main.  (Note to the FTP masters:  This is because the
    one of the supported games, Beneath A Steel Sky, has recently been
    released as free software.  It should appear in NEW shortly, if
    it's not there already.)
  * Sponsored by David Weinehall.

 -- David Weinehall <tao at debian.org>  Wed, 27 Aug 2003 21:00:42 +0200

scummvm (0.5.1-1) unstable; urgency=low

  * New upstream release.
  * Sponsored by David Weinehall. (No beer needed...)

 -- Tore Anderson <tore at linpro.no>  Sat,  9 Aug 2003 15:18:18 +0200

scummvm (0.5.0-1) unstable; urgency=low

  * New upstream release.
  * Suggest beneath-a-steel-sky.
  * Restructure 00buildopts somewhat, to ease future maintenance.
  * Standards-Version 3.6.0, no changes required.
  * Revised the description.
  * Sponsored by Joey Hess. (Tore fed me all the beer I could take .. 
    and then asked me to do this. ;-)

 -- Tore Anderson <tore at linpro.no>  Fri,  1 Aug 2003 21:45:06 +0200

scummvm (0.4.1-1) unstable; urgency=low

  * New upstream release.
  * Standards-Version 3.5.10.
    - Use upstream's icon in the menu system.
  * Removed debian/patches/01-enable-alsa-and-vorbis.dpatch, this
    is now done from debian/rules instead.
  * Added debian/patches/00buildopts, which makes it possible
    for environment variables to override the compiler flags.
  * Better handling of $DEB_BUILD_OPTIONS.
  * Declare the debhelper compability level in debian/compat instead
    of debian/rules.

 -- Tore Anderson <tore at linpro.no>  Thu, 29 May 2003 15:15:55 +0200

scummvm (0.4.0-1) unstable; urgency=low

  * New upstream release, closes: #193522.
    - Lots of VM fixes in The DIG, closes: #173550.
    - Obsoletes debian/patches/02-fix-manpage-savekey.dpatch.
    - Obsoletes debian/patches/03-fix-talking-to-parrot.dpatch.
    - Obsoletes debian/patches/04-alsa-seq-tty-output.dpatch.
  * Add extract.c and simon2mp3.c to the examples directory, closes: #154449.

 -- Tore Anderson <tore at linpro.no>  Wed, 14 May 2003 19:04:53 +0200

scummvm (0.3.0b-3) unstable; urgency=low

  * It appears I reinvented the wheel.  Start using dpatch instead of
    my own patchsystem.
  * Update Standards-Version to match current policy.
  * Tighten build-dependency on libvorbis-dev, to ensure that the binary
    will be linked against the new libvorbis0a package.  Closes: #185447.

 -- Tore Anderson <tore at linpro.no>  Tue, 18 Mar 2003 22:54:32 +0100

scummvm (0.3.0b-2) unstable; urgency=low

  * Re-upload to build the binary with GCC 3.2.
  * Use a patch system instead of putting all changes in the .diff.gz.
  * Correct save-game modifier key in the manpage. Closes: #173153.
  * Two fixes from upstream:
    - Fix 'talking to parrot' script deadlock in Fate of Atlantis.
    - Print correct alsa client and port variables to console.

 -- Tore Anderson <tore at linpro.no>  Fri, 10 Jan 2003 17:28:36 +0100

scummvm (0.3.0b-1) unstable; urgency=low

  * New upstream release.
  * Update standards-version again.
  * Convert icon to use only the colours mandated by the menu package.

 -- Tore Anderson <tore at linpro.no>  Sun,  8 Dec 2002 14:56:26 +0100

scummvm (0.2.81cvs20021110-1) unstable; urgency=low

  * New CVS snapshot.
  * Remove README.Debian - it was incorrect.
  * Drop build-deps on curses and readline.
  * Update standards-version to current policy.
  * Don't install the empty dir /usr/lib/scummvm anymore.

 -- Tore Anderson <tore at linpro.no>  Sun, 10 Nov 2002 17:13:36 +0100

scummvm (0.2.0.1cvs20021028-1) unstable; urgency=low

  * New CVS snapshot.
  * Kill cruft that sneaked into the .diff.gz.
  * Add menu entry.
  * Rewrote description and copyright file.
  * Suggest timidity (can be used with ALSA for gorgeous in-game music).
  * Support .SOG (Ogg Vorbis-compressed .SOU-files).

 -- Tore Anderson <tore at linpro.no>  Mon, 28 Oct 2002 14:30:21 +0100

scummvm (0.2.0.1cvs20021012-1) unstable; urgency=low

  * New upstream rele^WCVS snapshot.
  * New maintainer. Closes: #163105.
  * Compliant with Policy 3.5.7.0. Or so I hope.
  * Support ALSA's sequencer. Closes: #154451.

 -- Tore Anderson <tore at linpro.no>  Sat, 12 Oct 2002 15:17:11 +0200

scummvm (0.2.0.1) unstable; urgency=low

  * Fix by James Brown <ender at enderboi.com> for the trailing slash bug
    (Closes: #150144)
  * Add libmad-dev to the Buildreqs, compile with compressed audio support
    (Closes: #150272)

 -- Bastien Nocera <hadess at hadess.net>  Tue, 18 Jun 2002 02:35:50 +0100

scummvm (0.2.0) unstable; urgency=low

  * New upstream version (Closes: #143281)
  * Killed the wrapper script, see upstream changelog

 -- Bastien Nocera <hadess at hadess.net>  Wed, 15 May 2002 03:27:11 +0100

scummvm (0.1.0b-2) unstable; urgency=low

  * Moved the scummvm main bin under /usr/lib, the wrapper script under
    /usr/games
  * Fixed bug in the script that made it not work if the path was relative

 -- Bastien Nocera <hadess at hadess.net>  Wed, 10 Apr 2002 19:27:05 +0100

scummvm (0.1.0b-1) unstable; urgency=low

  * Initial Release.
  * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba !
    Ole !

 -- Bastien Nocera <hadess at hadess.net>  Fri,  5 Apr 2002 16:37:09 +0100


--- NEW FILE: compat ---
4

--- NEW FILE: scummvm.dirs ---
usr/games
usr/share/man/man6
usr/share/icons

--- NEW FILE: scummvm.docs ---
AUTHORS
README
TODO
doc/README.pdf

--- NEW FILE: scummvm.manpages ---
scummvm.6

--- NEW FILE: scummvm.menu ---
?package(scummvm):needs="x11" section="Games/Adventure" \
  title="ScummVM" command="/usr/games/scummvm" \
  icon="/usr/share/icons/scummvm.xpm"

Index: control
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- control	1 Mar 2003 15:16:52 -0000	1.4
+++ control	18 Jul 2005 21:53:47 -0000	1.5
@@ -1,32 +1,30 @@
-Source: scummvm-cvs
-Section: contrib/games
+Source: scummvm
+Section: games
 Priority: optional
-Maintainer: Tore Anderson <tore at linpro.no>
-Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev, libmad0-dev
-Standards-Version: 3.5.8
+Maintainer: Tore Anderson <tore at debian.org>
+Build-Depends: debhelper (>> 4.0.0), nasm [i386], tetex-bin, tetex-extra, gs-gpl, libsdl1.2-dev, libmad0-dev, libasound2-dev, libvorbis-dev (>= 1.0.0-2), libmpeg2-4-dev, libflac-dev (>= 1.1.1-2), libz-dev, libfluidsynth-dev
+Standards-Version: 3.6.1.1
 
-Package: scummvm-cvs
+Package: scummvm
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: timidity
-Conflicts: scummvm
-Description: SDL implementation of LucasArts' S.C.U.M.M. interpreter
- S.C.U.M.M. (Script Creation Utility for Maniac Mansion) is the engine
- used to create a lot of classic LucasArts adventure games, such as
- Sam & Max and The Secret of Monkey Island.
- .
- ScummVM lets you play your old adventure games in Debian, using SDL
- for the graphic presentation.
+Suggests: fluidsynth | timidity, beneath-a-steel-sky, flight-of-the-amazon-queen
+Description: free implementation of LucasArts' S.C.U.M.M interpreter
+ ScummVM is a 'virtual machine' for several classic graphical
+ point-and-click adventure games.  It is designed to run Adventure Soft's
+ Simon the Sorcerer 1 and 2, Revolution's Beneath A Steel Sky, and games
+ based on LucasArts' S.C.U.M.M (Script Creation Utility for Maniac Mansion)
+ system.  S.C.U.M.M is used for many games, including Monkey Island,
+ Day of the Tentacle, Sam and Max and more.  See the official compatibility
+ list at <http://www.scummvm.org/compatibility_stable.php> for a full list
+ of supported games.
  .
- In addition to the various LucasArts-games ScummVM can play, it is also
- possible to use ScummVM with AdventureSoft's Simon the Sorcerer. For
- a full list of compatible games; see the official compatibility list at
- http://scummvm.sf.net/compatibility.php .
+ The game data of two games compatible with ScummVM is included in Debian.
+ These are:
  .
- The data files belonging to the various games is not included in this
- package due to licensing issues; you have to obtain them somewhere else
- if you want ScummVM to be of any use.
+  - Beneath a Steel Sky        (package name: beneath-a-steel-sky)
+  - Flight of the Amazon Queen (package name: flight-of-the-amazon-queen)
  .
- NOTE: This is a unofficial package, which is not supported by the Debian
- Project. Please report problems to ScummVM's Sourceforge bug tracker;
- found at <http://sourceforge.net/tracker/?group_id=37116>.
+ To actually make use of ScummVM, you'll have to install one of these, or
+ obtain the proprietary game data for another supported game from somewhere
+ else.

Index: copyright
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/debian/copyright,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- copyright	1 Nov 2002 18:13:26 -0000	1.1
+++ copyright	18 Jul 2005 21:53:47 -0000	1.2
@@ -1,21 +1,9 @@
-This package was debianized by Bastien Nocera <hadess at hadess.net> on
-Fri,  5 Apr 2002 16:37:09 +0100
-
-It was adopted by Tore Anderson <tore at linpro.no> on the 4th Oct 2002.
-
-It was downloaded from http://scummvm.sourceforge.net/ .
-
-Upstream Authors:
+ScummVM was debianized by Bastien Nocera <hadess at hadess.net> the 5th Apr 2002.
+It was adopted by Tore Anderson <tore at linpro.no> the 4th Oct 2002.
 
- James Brown
- Vincent Hamm
- Max Horn
- Jeremy Newman
- Ludvig Strigeus
- ..and lots of other contributors.
+It was downloaded from <http://www.scummvm.org/>.
 
-To contact any of these, or see a more comprehensive list over
-contributors, see http://scummvm.sourceforge.net/contact.php .
+Upstream Authors: see `/usr/share/doc/scummvm/AUTHORS'.
 
 Copyright:
 
@@ -26,3 +14,5 @@
 
  On Debian GNU/Linux systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+This copyright also applies to the Debian-related build scripts.

Index: prepare
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/debian/prepare,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prepare	17 Dec 2003 15:32:09 -0000	1.4
+++ prepare	18 Jul 2005 21:53:47 -0000	1.5
@@ -1,5 +1,36 @@
 #! /bin/sh
 
-VER=`sed -n -e 's/^const char \*gScummVMVersion = "\(.*\)";/\1/p' base/main.cpp``date +%Y%m%d`
+# This simple script is called from the upstream makefile whenever someone
+# calls "make deb".  It adds a changelog entry to the top of debian/changelog
+# so that the version number is correct.
 
-sed "s/@VERSION@/$VER/g" debian/changelog.in > debian/changelog
+VERSION=`sed -n -e 's/CVS//g' -e 's/^const char \*gScummVMVersion = "\(.*\)";/\1/p' base/main.cpp `-0cvs`date +%Y%m%d`
+USERNAME=`whoami`
+GECOS=`getent passwd $USERNAME | awk '-F[,:]' '{print $5}'`
+DOMAIN=`hostname --fqdn`
+DATE=`date -R`
+
+head -1 debian/changelog | grep -qF $VERSION && exit 0
+
+TMP=`tempfile`
+
+cat debian/changelog > $TMP
+
+cat << __eof > debian/changelog
+scummvm ($VERSION) experimental; urgency=low
+
+  * CVS snapshot.
+
+    Builder:    $GECOS <$USERNAME@$DOMAIN>
+    Build-date: $DATE
+
+    Please don't file bugs you find in this package in the Debian Bug Tracking
+    system, use the ScummVM team's own bug tracker instead.  You can find this
+    tracker at <http://sourceforge.net/tracker/?group_id=37116>.
+
+ -- Tore Anderson <tore at debian.org>  $DATE 
+
+__eof
+
+cat $TMP >> debian/changelog
+rm -f $TMP

Index: rules
===================================================================
RCS file: /cvsroot/scummvm/scummvm/dists/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules	17 Dec 2003 15:32:09 -0000	1.3
+++ rules	18 Jul 2005 21:53:47 -0000	1.4
@@ -1,12 +1,15 @@
 #!/usr/bin/make -f
 
-export DH_COMPAT=3
+build: doc/README.pdf scummvm
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	export CXXFLAGS += -g
-endif
+doc/README.pdf:
+	(cd doc; latex readme.tex)
+	(cd doc; latex readme.tex)
+	dvips -q -f doc/readme.dvi | gs -q -dNOPAUSE -dBATCH \
+	                                -sDEVICE=pdfwrite \
+					-sOutputFile=doc/README.pdf -
 
-build:
+scummvm:
 	dh_testdir
 	./configure
 	$(MAKE)
@@ -14,19 +17,20 @@
 clean:
 	dh_testdir
 	dh_testroot
+	-$(MAKE) distclean
+	-rm doc/readme.aux doc/readme.dvi doc/readme.log doc/readme.out \
+	    doc/readme.toc doc/README.pdf
 	dh_clean
-	rm -f debian/changelog
-	-$(MAKE) clean
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean
 	dh_installdirs
-	install -m0755 scummvm $(CURDIR)/debian/scummvm-cvs/usr/games/scummvm
-	install -m0644 scummvm.xpm $(CURDIR)/debian/scummvm-cvs/usr/share/icons
+	install -m0755 scummvm debian/scummvm/usr/games/scummvm
+	install -m0644 scummvm.xpm debian/scummvm/usr/share/icons
 
-binary: binary-arch binary-indep
+binary: binary-arch
 
 binary-arch: build install
 	dh_testdir
@@ -35,9 +39,8 @@
 	dh_installchangelogs NEWS
 	dh_installman
 	dh_installmenu
-	dh_link
 	dh_strip
-	dh_compress
+	dh_compress -X.pdf
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps

--- scummvm-cvs.dirs DELETED ---

--- scummvm-cvs.docs DELETED ---

--- scummvm-cvs.manpages DELETED ---

--- scummvm-cvs.menu DELETED ---

More information about the Scummvm-git-logs mailing list