widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

>The patches stuff is all Greek to me

Right, I didn't explain this part properly. The patches directory contains any changes the package  does to the original source code. The source code is stored in pristine condition and the patches are added when building the package. This makes it easy to pull in a new upstream release without losing a fix for build failure or workaround because a slightly different library version is packaged...

In addition to the patch files, there's `series` which says which patches should be applied (and possibly in which order?) when the package is built. In the original Debian package (compare with http://anonscm.debian.org/cgit/pkg-games/widelands.git/tree/debian/patches), all patches are added, but our series file is empty which means they won't be used.

All patches were originally removed in https://code.launchpad.net/~hjd/widelands/remove-all-patches/+merge/217341, so the current change is in essence an undelete.

In summary, we retain the patches so that the Debian maintainers won't need to wonder if they are still needed or have been included in the release, but we don't add them at build time to avoid conflicts.

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2016-01-22 07:20:01 +0000
> +++ debian/changelog	2016-07-22 12:49:08 +0000
> @@ -1,3 +1,27 @@
> +widelands (1:18-3widelands1) UNRELEASED; urgency=medium
> +
> +  * Merged Debian packaging of Widelands 1:18-3. Remaining changes:
> +    - Disabled all Debian-patches since some caused conflicts when applied to 
> +      latest trunk. They mostly concern architectures which we don't have
> +      access to build/test with normally, so they would be hard to maintain.
> +        - The kFreeBSD-patch was removed entirely since it has been included.
> +    - Build dependencies changed from SDL to SDL2.
> +    - New build dependencies: boost-regex, boost-test
> +    - Removed build dependencies: lua, sdl(2)-gfx
> +    - Reduce complexity by reducing the number of paths configured during build
> +      to just the datadir. 
> +    - Install new binaries; wl_map_info, wl_map_object_info and wl_render_richtext
> +    - Always use our bundled fonts
> +    - Updated copyright file
> +    - Updated man page
> +    - Moved all data-related directories into a new "data" directory.
> +      Various paths have been updated to reflect this.
> +    - Added added widelands.appdata.xml for debian desktops. 

This is the one you mentioned on the other review, right?

I can look into it, but I haven't worked with this before either.

> +    - Made widelands.desktop localizable.
> +    - Translations for appdata and desktop file.
> +
> + -- Widelands <mail@xxxxxxxxxxx>  Thu, 21 Jul 2016 21:25:36 +0200
> +
>  widelands (1:18-3) unstable; urgency=medium
>  
>    Packaging cleanup version only, no user-visible changes.


-- 
https://code.launchpad.net/~hjd/widelands/debian-changelog/+merge/300877
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/debian-changelog into lp:widelands.