This is a resend of an earlier message that really didn't want to make
it through to the Debian servers. I've uploaded the debdiffs and
changelog here instead of attaching them:
http://www.stdout.nl/static/tmp/openttd-debdiffs/

Original message follows
---

Hi folks,

I've attached debdiffs for both of the proposed options for review.

Note that in both options, the openttd-dbg packages becomes
significantly bigger. I suspect this is due to changes in the compiler /
debhelper version. Since the file lists are identical and it occurs in
both cases, I didn't investigate further.

> I see two options here:
> 
>  1. Include the next upstream version 1.2.2 in testing. I would prefer
>     this option, because:
>    - 1.2.2 will include a number of useful bugfixes for users.
>    - 1.2.2 will include only bugfixes, so the risk of introducing
>      breakage is minimal.
>    - 1.2.2 will probably be included in Ubuntu 12.10, so including it in
>      Debian will allow multiplayer games between Debian wheezy and
>      Ubuntu 12.10.

See new-upstream-src.debdiff and new-upstream-bin.debdiff for the
changes for this option. Some notes:

 - Upstream has enabled debug symbols and assertions in this RC build,
   this change will not be present in the final upload.
 - The binary package is a lot bigger, this is due to the enabled
   assertions. The final upload will be around the same size as 1.2.1-1.
 - I have slightly modified the rules file to enable hardening for all
   binaries built, including those only used during the build process.
   This fixes the dpkg-buildflags-missing error at
   https://buildd.debian.org/~brlink/packages/o/openttd.html
   No other packaging changes were made (note that the
   os/debian/changelog file is included in the upstream tarball and used
   by upstream only).
 - This debdiff is made using the 1.2.2~rc1 release, but this should be
   similar enough (ideally identical) to the final release to give a
   clear picture of the included changes.

Upstream changes in 1.2.2~rc1 are:
 - Translation updates (this is about 80% of the src diff)
 - Bugfixes
 - Small addition to the build system to allow passing compiler flags
   to binaries used during the build.

I've added the complete changelog for this release in the changelog.txt
attachment. Revision numbers refer to the svn repository accessible at
http://vcs.openttd.org/svn/

>  2. Backport just the security fix and upload this as 1.2.1-2.

See backport-fix-src.debdiff and backport-fix-bin.debdiff for the
changes for this option. These should be pretty straightforward.


If you let me know if option #1 is acceptable or not, I'll prepare the
appropriate upload.


Thanks!

Matthijs

Attachment: signature.asc
Description: Digital signature

Reply via email to