Bug#986172: unblock: dwarf-fortress/0.47_04+dfsg1-1

2021-03-31 Thread Sebastian Ramacher
Control: tags -1 confirmed moreinfo

On 2021-03-30 22:32:08, Sven Bartscher wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> 
> Please unblock package dwarf-fortress
> 
> [ Reason ]
> It has been noted in #986119 that the upstream release tarballs for
> dwarf-fortress include shared libraries but no corresponding source
> code is available. The shared libraries in question are licensed under
> GPL and thus not distributable without source code.
> 
> The affected files are not shipped in any binary packages. This
> update fixes the issue by repacking the source tarballs to exclude
> those files.
> 
> [ Impact ]
> The package is not distributable in its current form, so it has to be
> either updated or entirely removed from testing to cease violating the
> licenses of the affected files.
> 
> [ Tests ]
> The now excluded files were not shipped in any binary package or used
> in the build process. Their removal should not have any affect on the
> binary packages. I confirmed (using diffoscope) that the built debian
> packages do not differ in content except in expected ways due to
> changed package metadata and changes in the generaed manpage due to a
> newer pandoc version being used in the build.
> 
> I also manually confirmed that the game can be successfully started
> and basic interactions inside the game still work.
> 
> [ Risks ]
> Since the removed files are not part of any binary packages, it can be
> easily confirmed that their removal has no negative effect. I see
> virtually no risk introduced by this update.
> 
> [ Checklist ]
>   [x] all changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in testing
> 
> unblock dwarf-fortress/0.47_04+dfsg1-1

ACK, please remove the moreinfo tag once the new version is available in
unstable.

Cheers


> Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/amd64/libs/libgcc_s.so.1 
> und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/amd64/libs/libgcc_s.so.1 
> sind verschieden.
> Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/amd64/libs/libstdc++.so.6 
> und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/amd64/libs/libstdc++.so.6 
> sind verschieden.
> diff -Nru dwarf-fortress-0.47.04/debian/changelog 
> dwarf-fortress-0.47.04+dfsg1/debian/changelog
> --- dwarf-fortress-0.47.04/debian/changelog   2020-03-28 18:48:06.0 
> +0100
> +++ dwarf-fortress-0.47.04+dfsg1/debian/changelog 2021-03-30 
> 19:04:37.0 +0200
> @@ -1,3 +1,10 @@
> +dwarf-fortress (0.47.04+dfsg1-1) unstable; urgency=high
> +
> +  * Remove unnecessary code copies with license violations from source
> +tarball. (Closes: #986119)
> +
> + -- Sven Bartscher   Tue, 30 Mar 2021 19:04:37 
> +0200
> +
>  dwarf-fortress (0.47.04-1) unstable; urgency=low
>  
>* New upstream version
> diff -Nru dwarf-fortress-0.47.04/debian/copyright 
> dwarf-fortress-0.47.04+dfsg1/debian/copyright
> --- dwarf-fortress-0.47.04/debian/copyright   2020-03-28 18:48:06.0 
> +0100
> +++ dwarf-fortress-0.47.04+dfsg1/debian/copyright 2021-03-30 
> 19:04:37.0 +0200
> @@ -11,6 +11,15 @@
>   do not grant all freedoms required by the DFSG. No modifications of
>   the included binaries are permitted, and the binaries are not
>   distributed with source code.
> +Comment:
> + Some files have been removed from the original source tarballs, because
> + they are licensed under the GPL, but no source is available for them.
> +Files-Excluded-amd64:
> + libs/libgcc_s.so.1
> + libs/libstdc++.so.6
> +Files-Excluded-i386:
> + libs/libgcc_s.so.1
> + libs/libstdc++.so.6
>  
>  Files: *
>  Copyright: 2002-2020 Tarn Adams. All rights reserved.
> diff -Nru dwarf-fortress-0.47.04/debian/watch 
> dwarf-fortress-0.47.04+dfsg1/debian/watch
> --- dwarf-fortress-0.47.04/debian/watch   2020-03-28 18:48:06.0 
> +0100
> +++ dwarf-fortress-0.47.04+dfsg1/debian/watch 2021-03-30 19:04:37.0 
> +0200
> @@ -1,7 +1,7 @@
>  version=4
> -opts="uversionmangle=s/^/0./,component=amd64" \
> +opts="uversionmangle=s/^/0./,dversionmangle=s/\+dfsg\d+//,component=amd64" \
>https://bay12games.com/dwarves/older_versions.html \
>df_(\d+)_(\d+)_linux@ARCHIVE_EXT@ debian
> -opts="uversionmangle=s/^/0./,component=i386" \
> +opts="uversionmangle=s/^/0./,dversionmangle=s/\+dfsg\d+//,component=i386" \
>https://bay12games.com/dwarves/older_versions.html \
>df_(\d+)_(\d+)_linux32@ARCHIVE_EXT@ same
> Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/i386/libs/libgcc_s.so.1 
> und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/i386/libs/libgcc_s.so.1 sind 
> verschieden.
> Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/i386/libs/libstdc++.so.6 
> und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/i386/libs/libstdc++.so.6 
> sind verschieden.


-- 
Sebastian Ramacher



Bug#986172: unblock: dwarf-fortress/0.47_04+dfsg1-1

2021-03-30 Thread Sven Bartscher
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package dwarf-fortress

[ Reason ]
It has been noted in #986119 that the upstream release tarballs for
dwarf-fortress include shared libraries but no corresponding source
code is available. The shared libraries in question are licensed under
GPL and thus not distributable without source code.

The affected files are not shipped in any binary packages. This
update fixes the issue by repacking the source tarballs to exclude
those files.

[ Impact ]
The package is not distributable in its current form, so it has to be
either updated or entirely removed from testing to cease violating the
licenses of the affected files.

[ Tests ]
The now excluded files were not shipped in any binary package or used
in the build process. Their removal should not have any affect on the
binary packages. I confirmed (using diffoscope) that the built debian
packages do not differ in content except in expected ways due to
changed package metadata and changes in the generaed manpage due to a
newer pandoc version being used in the build.

I also manually confirmed that the game can be successfully started
and basic interactions inside the game still work.

[ Risks ]
Since the removed files are not part of any binary packages, it can be
easily confirmed that their removal has no negative effect. I see
virtually no risk introduced by this update.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock dwarf-fortress/0.47_04+dfsg1-1
Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/amd64/libs/libgcc_s.so.1 
und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/amd64/libs/libgcc_s.so.1 sind 
verschieden.
Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/amd64/libs/libstdc++.so.6 
und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/amd64/libs/libstdc++.so.6 sind 
verschieden.
diff -Nru dwarf-fortress-0.47.04/debian/changelog 
dwarf-fortress-0.47.04+dfsg1/debian/changelog
--- dwarf-fortress-0.47.04/debian/changelog 2020-03-28 18:48:06.0 
+0100
+++ dwarf-fortress-0.47.04+dfsg1/debian/changelog   2021-03-30 
19:04:37.0 +0200
@@ -1,3 +1,10 @@
+dwarf-fortress (0.47.04+dfsg1-1) unstable; urgency=high
+
+  * Remove unnecessary code copies with license violations from source
+tarball. (Closes: #986119)
+
+ -- Sven Bartscher   Tue, 30 Mar 2021 19:04:37 
+0200
+
 dwarf-fortress (0.47.04-1) unstable; urgency=low
 
   * New upstream version
diff -Nru dwarf-fortress-0.47.04/debian/copyright 
dwarf-fortress-0.47.04+dfsg1/debian/copyright
--- dwarf-fortress-0.47.04/debian/copyright 2020-03-28 18:48:06.0 
+0100
+++ dwarf-fortress-0.47.04+dfsg1/debian/copyright   2021-03-30 
19:04:37.0 +0200
@@ -11,6 +11,15 @@
  do not grant all freedoms required by the DFSG. No modifications of
  the included binaries are permitted, and the binaries are not
  distributed with source code.
+Comment:
+ Some files have been removed from the original source tarballs, because
+ they are licensed under the GPL, but no source is available for them.
+Files-Excluded-amd64:
+ libs/libgcc_s.so.1
+ libs/libstdc++.so.6
+Files-Excluded-i386:
+ libs/libgcc_s.so.1
+ libs/libstdc++.so.6
 
 Files: *
 Copyright: 2002-2020 Tarn Adams. All rights reserved.
diff -Nru dwarf-fortress-0.47.04/debian/watch 
dwarf-fortress-0.47.04+dfsg1/debian/watch
--- dwarf-fortress-0.47.04/debian/watch 2020-03-28 18:48:06.0 +0100
+++ dwarf-fortress-0.47.04+dfsg1/debian/watch   2021-03-30 19:04:37.0 
+0200
@@ -1,7 +1,7 @@
 version=4
-opts="uversionmangle=s/^/0./,component=amd64" \
+opts="uversionmangle=s/^/0./,dversionmangle=s/\+dfsg\d+//,component=amd64" \
   https://bay12games.com/dwarves/older_versions.html \
   df_(\d+)_(\d+)_linux@ARCHIVE_EXT@ debian
-opts="uversionmangle=s/^/0./,component=i386" \
+opts="uversionmangle=s/^/0./,dversionmangle=s/\+dfsg\d+//,component=i386" \
   https://bay12games.com/dwarves/older_versions.html \
   df_(\d+)_(\d+)_linux32@ARCHIVE_EXT@ same
Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/i386/libs/libgcc_s.so.1 und 
/tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/i386/libs/libgcc_s.so.1 sind 
verschieden.
Binärdateien /tmp/x4E2O1qvMn/dwarf-fortress-0.47.04/i386/libs/libstdc++.so.6 
und /tmp/ag24SxYJ0c/dwarf-fortress-0.47.04+dfsg1/i386/libs/libstdc++.so.6 sind 
verschieden.