r5614 - in packages/trunk/glest: . debian debian/patches

Wed Feb 6 12:57:26 UTC 2008

On 02/02/2008, Ansgar Burchardt <ansgar-guest at alioth.debian.org> wrote:
> Author: ansgar-guest
> Date: 2008-02-02 17:06:22 +0000 (Sat, 02 Feb 2008)
> New Revision: 5614
>
> Added:
>    packages/trunk/glest/debian/patches/nomapeditor
>    packages/trunk/glest/debian/patches/series
>    packages/trunk/glest/debian/patches/use-fixed-fonts
> Removed:
>    packages/trunk/glest/debian/patches/00list
>    packages/trunk/glest/debian/patches/01_addcleanrule.dpatch
>    packages/trunk/glest/debian/patches/05_nomapeditor.dpatch
>    packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch
>    packages/trunk/glest/debian/patches/20_be-support-from-kozz.dpatch

Why did you remove this patch? This patch was not applied.
Even if is not applied, it can be useful for people interested in
maintaining it.

>    packages/trunk/glest/debian/patches/be-support/
>    packages/trunk/glest/mk/

After all these removals, does the package still compiles cleanly two
times in a row?

Can you run a debian/rules clean without errors? How about two clean
commands in a row?

> Modified:
>    packages/trunk/glest/debian/
>    packages/trunk/glest/debian/changelog
>    packages/trunk/glest/debian/control
>    packages/trunk/glest/debian/docs
>    packages/trunk/glest/debian/glest.install
>    packages/trunk/glest/debian/glest.sh
>    packages/trunk/glest/debian/rules
> Log:
> * New upstream release (Closes: #463489)
> * Use quilt for patch management
> * Remove Homepage field from description
> * Add myself to Uploaders
> * Bump Debian Standards version to 3.7.3
>
>
> Property changes on: packages/trunk/glest/debian
> ___________________________________________________________________
> Name: svn-bp:origUrl
>    - http://pkg-games.alioth.debian.org/tarballs/glest_2.0.0.orig.tar.gz
>    + http://pkg-games.alioth.debian.org/tarballs/glest_3.0.0.orig.tar.gz
>
>
> Modified: packages/trunk/glest/debian/changelog
> ===================================================================
> --- packages/trunk/glest/debian/changelog       2008-02-02 16:43:48 UTC (rev 5613)
> +++ packages/trunk/glest/debian/changelog       2008-02-02 17:06:22 UTC (rev 5614)
> @@ -1,4 +1,4 @@
> -glest (2.0.1-1) UNRELEASED; urgency=low
> +glest (3.0.0-1) UNRELEASED; urgency=low
>
>    [ Barry deFreese ]
>    * Add watch file
> @@ -6,12 +6,7 @@
>    [ Jon Dowland ]
>    * Add Homepage: control field to source stanza
>
> -  [ Eddy Petrișor ]
> -  * Removed Homepage: semi-field since the official one exists now
> -

Why did you removed this? You must not alter history!
There could have been two ways to do this right:
 - create a new changelog entry and keep the old one separate; on
upload tell the uploader that the last version in the archive is
2.0.0-2 so that the changes file contains the unpublished part, too
 - merge the changelog (no removals should be made, unless the changes
are nullified by the new ones - which, ttbomk, is not the case

>    [ Siegfried-Angel Gevatter Pujals (RainCT) ]
> -  * New upstream version. Packaging changes:
> -     - Drop patches/10_fix_gcc-4.1_particle.h.dpatch.

Same thing here, please do not rewrite history!!!!!

>    * debian/control:
>       - Replace XS-Vcs-* with Vcs-*
>       - Add myself to Uploaders
> @@ -19,8 +14,15 @@
>       - Update to the latest FD.o standards
>       - Add Catalan translation
>
> - -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct at ubuntu.com>  Sun, 27 Jan 2008 12:06:45 +0100
> +  [ Ansgar Burchardt ]
> +  * New upstream release (Closes: #463489)

 dropping patches:

> +  * Use quilt for patch management

... instead of dpatch

> +  * Remove Homepage field from description
> +  * Add myself to Uploaders
> +  * Bump Debian Standards version to 3.7.3
>
> + -- Ansgar Burchardt <ansgar at 43-1.org>  Sat, 02 Feb 2008 17:34:46 +0100
> +

> -Depends: ${shlibs:Depends}, glest-data
> +Depends: ${shlibs:Depends}, glest-data (>= 3.0.0)
>  Description: A free 3D real-time customizable strategy game
>   Glest takes place in a context which could be compared to that of the
>   pre-renaissance Europe, with the licence that magic forces exist in the
> @@ -20,5 +20,3 @@
>   Current version is fully playable, includes single player game against CPU
>   controlled players, two factions with their corresponding tech trees, units,
>   buildings and some maps.
> - .
> -  Homepage: http://www.glest.org/
>
> Modified: packages/trunk/glest/debian/docs
> ===================================================================
> --- packages/trunk/glest/debian/docs    2008-02-02 16:43:48 UTC (rev 5613)
> +++ packages/trunk/glest/debian/docs    2008-02-02 17:06:22 UTC (rev 5614)
> @@ -1 +1 @@
> -docs/README*
> +README*
>
> Modified: packages/trunk/glest/debian/glest.install
> ===================================================================
> --- packages/trunk/glest/debian/glest.install   2008-02-02 16:43:48 UTC (rev 5613)
> +++ packages/trunk/glest/debian/glest.install   2008-02-02 17:06:22 UTC (rev 5614)
> @@ -1,4 +1,4 @@
> -mk/linux/glest usr/lib/glest
> -mk/linux/glest.ini usr/lib/glest
> +glest usr/lib/glest
> +glest.ini usr/lib/glest
>  debian/glest.xpm usr/share/pixmaps
>  debian/glest.desktop usr/share/applications
>
> Modified: packages/trunk/glest/debian/glest.sh
> ===================================================================
> --- packages/trunk/glest/debian/glest.sh        2008-02-02 16:43:48 UTC (rev 5613)
> +++ packages/trunk/glest/debian/glest.sh        2008-02-02 17:06:22 UTC (rev 5614)
> @@ -6,7 +6,7 @@
>  [ -f glest.ini ] || cp /usr/lib/glest/glest.ini .
>  [ -h glest ] || ln -s /usr/lib/glest/glest .
>  [ -f configuration.xml ] || ln -s $MAINDIR/configuration.xml .
> -for i in data docs techs tilesets; do
> +for i in data docs scenarios techs tilesets; do
>        [ -h $i ] || ln -s $MAINDIR/$i .
>  done
>  [ -d maps ] || mkdir maps

> --- packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch       2008-02-02 16:43:48 UTC (rev 5613)
> +++ packages/trunk/glest/debian/patches/15_use_fixed_fonts.dpatch       2008-02-02 17:06:22 UTC (rev 5614)
> @@ -1,24 +0,0 @@
> -#! /bin/sh /usr/share/dpatch/dpatch-run
> -## 15_use_fixed_fonts.dpatch by Eddy Petrișor <eddy.petrisor at gmail.com>
> -##
> -## All lines beginning with `## DP:' are a description of the patch.
> -## DP: Make the game use the fixed fonts since utopia fonts are not available
> -##     on Debian, by default
> -
> - at DPATCH@
> -diff -urNad glest-2.0.0~/mk/linux/glest.ini glest-2.0.0/mk/linux/glest.ini
> ---- glest-2.0.0~/mk/linux/glest.ini    2006-04-13 01:52:25.000000000 +0300
> -+++ glest-2.0.0/mk/linux/glest.ini     2007-06-06 01:06:42.000000000 +0300
> -@@ -22,9 +22,9 @@
> - FogOfWar=1
> - FogOfWarSmoothing=1
> - FogOfWarSmoothingFrameSkip=3
> --FontConsole=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
> --FontDisplay=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
> --FontMenu=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
> -+FontConsole=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
> -+FontDisplay=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
> -+FontMenu=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
> - Lang=english.lng
> - MaxLights=1
> - PathFindNodesMax=250
>
> Deleted: packages/trunk/glest/debian/patches/20_be-support-from-kozz.dpatch

> -include /usr/share/dpatch/dpatch.make
> +include /usr/share/quilt/quilt.make

> @@ -38,9 +35,7 @@
>         dh_testdir
>
>         # Add here commands to compile the package.
> -       cd mk/linux && ln -sf ../../source/glest_game glest_game
> -       cd mk/linux && ln -sf ../../source/shared_lib shared_lib
> -       cd mk/linux && jam -q
> +       jam -q
>         #docbook-to-man debian/glest.sgml > glest.1
>
>         touch build-stamp
> @@ -52,13 +47,8 @@
>         rm -f build-stamp configure-stamp
>
>         # Add here commands to clean up after the build process.
> -       cd mk/linux && jam -q clean && cd -
> +       jam -q distclean
>
> -       echo "pwd=`pwd`"
> -       [ -L mk/linux/glest_game ] && rm -f mk/linux/glest_game || true
> -       [ -L mk/linux/shared_lib ] && rm -f mk/linux/shared_lib || true
> -       rm -fr mk/linux/build/*
> -

Doesn't removing this leads to unrepresentable changes in the source package?

-- 
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein