Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Simon McVittie]

On Wed, 29 Mar 2017 at 21:27:26 +1100, Dmitry Smirnov wrote:
> On Wednesday, 29 March 2017 8:42:38 AM AEDT Simon McVittie wrote:
> > Please ask the release team to remove it if that's the case.
> 
> It is already scheduled for removal because of this bug's severity...

If you don't want it in stable, waiting for autoremoval leaves the bug
on the lists seen by people doing bug squashing (like me in this case),
whereas asking for it to be removed would take it off those lists sooner.

> > I've cancelled my delayed NMU.
> 
> OK. So you've decided not to save the package for stable? Fair enough.

You said "I'd rather drop it from Stretch" which I thought meant you
specifically didn't want it to be saved, so I went along with what I
thought was your request as maintainer. Was that a misinterpretation?

I can NMU or not NMU, whichever you prefer; please let me know. You're also
welcome to apply the patch that I attached a couple of messages ago if you
want to do a MU.

I'm not going to upload a new upstream version or other larger changes,
because I don't think the release team are likely to accept an upload not
based on 3.7.2+repack during the freeze.

S

Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Dmitry Smirnov]

On Wednesday, 29 March 2017 8:42:38 AM AEDT Simon McVittie wrote:
> Please ask the release team to remove it if that's the case.

It is already scheduled for removal because of this bug's severity...


> The
> version in stable is always going to be outdated, given the length of
> our freeze, so it seems odd to remove an otherwise working package;
> but if that's what you want...

I don't insist on removal... As my ability to respond to this issue were 
limited there is only little I could do to ensure that we won't end up with 
broken package in stable. I don't have strong opinion whether to remove or 
keep it.


> I've cancelled my delayed NMU.

OK. So you've decided not to save the package for stable? Fair enough.

Anyway I much appreciate your NMU. Thank you for your care and help.

-- 
Regards,
 Dmitry Smirnov.

---

Platitude: an idea (a) that is admitted to be true by everyone, and (b)
that is not true.
-- H. L. Mencken


signature.asc
Description: This is a digitally signed message part.

Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Simon McVittie]

On Wed, 29 Mar 2017 at 10:22:49 +1100, Dmitry Smirnov wrote:
> 3.7.2 is already obsolete so I'd rather drop it from Stretch.

Please ask the release team to remove it if that's the case. The
version in stable is always going to be outdated, given the length of
our freeze, so it seems odd to remove an otherwise working package;
but if that's what you want...

I've cancelled my delayed NMU. Please try building the updated package
as though it was a binNMU to confirm that it doesn't have this bug,
something like this:

sbuild --make-binNMU="Test" -m"Not for upload " -d 
unstable freespace2_*.dsc

Thanks,
S

Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Dmitry Smirnov]

On Tuesday, 28 March 2017 9:35:27 AM AEDT Simon McVittie wrote:
> On Fri, 22 Jul 2016 at 16:33:02 +0100, Edward Allcutt wrote:
> > The current package contains symlinks such as
> > 
> >/usr/games/fs2_open -> fs2_open_3.7.2+repack-1+b1
> > 
> > where the target doesn't exist.
> 
> This was tagged pending last July, but I don't see any work-in-progress
> in pkg-games git, so I'm testing my own version of a fix for this.
> 
> It looks as though the issue is that the regex used to parse the version
> is too specific, and doesn't cope with +b1 (or +nmu1) in the Debian
> revision.

This package is non-free so I've made no public repository for it.
I've fixed the problem in my private repository some months ago but 
unfortunately could not finish the job... I still hope to get back to it but 
3.7.2 is already obsolete so I'd rather drop it from Stretch. I already have 
new version packaged -- it needs some testing (and probably few changes/
corrections) but the most of the work is already done and I'll upload new 
release at the earliest opportunity.

-- 
Best wishes,
 Dmitry Smirnov.

---

For centuries, theologians have been explaining the unknowable in terms
of the-not-worth-knowing.
-- H. L. Mencken



signature.asc
Description: This is a digitally signed message part.

Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Simon McVittie]

Control: tags 832128 + patch

On Tue, 28 Mar 2017 at 09:35:27 +0100, Simon McVittie wrote:
> On Fri, 22 Jul 2016 at 16:33:02 +0100, Edward Allcutt wrote:
> > The current package contains symlinks such as
> >/usr/games/fs2_open -> fs2_open_3.7.2+repack-1+b1
> > where the target doesn't exist.
> 
> This was tagged pending last July, but I don't see any work-in-progress
> in pkg-games git, so I'm testing my own version of a fix for this.

Sorry, I had missed that this game is not under pkg-games maintenance but
instead in the maintainer's home directory; but the same applies, there
doesn't seem to be a patch available to the public. Re-testing the "team
upload" that I was about to make as an NMU instead; please see attached.

I'll NMU to DELAYED/2 when I've tested the new version unless you say
otherwise.

(I would suggest moving this to pkg-games if that is consistent with your
maintenance practices.)

Regards,
S
>From 960697e804ea20ce6b28a3e4e1cd65563cbc6b66 Mon Sep 17 00:00:00 2001
From: Simon McVittie 
Date: Tue, 28 Mar 2017 09:23:49 +0100
Subject: [PATCH] Determine upstream version in a way that works for NMUs and
 binNMUs

* Non-maintainer upload.
* Determine upstream version in a way that works for NMUs and binNMUs
  (Closes: #832128)
* Make sure the package fails to build from source if the
  /usr/games/fs2_open symlink would be dangling
---
 debian/changelog | 10 ++
 debian/rules |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b2f62c..2ac3509 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+freespace2 (3.7.2+repack-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Determine upstream version in a way that works for NMUs and binNMUs
+(Closes: #832128)
+  * Make sure the package fails to build from source if the
+/usr/games/fs2_open symlink would be dangling
+
+ -- Simon McVittie   Tue, 28 Mar 2017 10:32:01 +0100
+
 freespace2 (3.7.2+repack-1) unstable; urgency=low
 
   * New upstream release [April 2015].
diff --git a/debian/rules b/debian/rules
index fa03e9b..2d911a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,7 @@
 
 DPATH = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG := $(word 2,$(shell dpkg-parsechangelog -l$(DPATH)/changelog | grep ^Source))
-VER ?= $(word 2,$(shell dpkg-parsechangelog -l$(DPATH)/changelog | grep ^Version | perl -pe 's/(?:\+\w+)?-[0-9.]+\Z//'))
-#VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
+VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{^Version:\s*(?:[0-9]*:)?([\d\.]+)(?:[+\w]*)(?:-.*)\Z}')
 $(info VER=$(VER))
 
 # parallel build by default on linux
@@ -48,6 +47,8 @@ override_dh_auto_install:
 	dh_auto_install --parallel
 
 override_dh_link:
+	test -e debian/$(PKG)/usr/games/fs2_open_$(VER)
+	test -e debian/$(PKG)/usr/games/fs2_open_$(VER)_DEBUG
 	dh_link \
 /usr/games/fs2_open_$(VER) /usr/games/fs2_open \
 /usr/games/fs2_open_$(VER)_DEBUG   /usr/games/fs2_open_DEBUG \
-- 
2.11.0

Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Simon McVittie]

On Fri, 22 Jul 2016 at 16:33:02 +0100, Edward Allcutt wrote:
> The current package contains symlinks such as
>/usr/games/fs2_open -> fs2_open_3.7.2+repack-1+b1
> where the target doesn't exist.

This was tagged pending last July, but I don't see any work-in-progress
in pkg-games git, so I'm testing my own version of a fix for this.

It looks as though the issue is that the regex used to parse the version
is too specific, and doesn't cope with +b1 (or +nmu1) in the Debian revision.

S

Bug#832128: freespace2: Bad symlinks /usr/games/fs2_open{,_DEBUG}

[Edward Allcutt]

Package: freespace2
Version: 3.7.2+repack-1+b1
Severity: normal

Dear Maintainer,

The current package contains symlinks such as
   /usr/games/fs2_open -> fs2_open_3.7.2+repack-1+b1
where the target doesn't exist. /usr/games/fs2_open_3.7.2 does exist so
it seems likely that the build/maintainer scripts are using the Debian
package version where they should be using the upstream version.

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (900, 'testing'), (800, 'unstable'), (700, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.6.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages freespace2 depends on:
ii  libc6 2.23-1
ii  libgcc1   1:6.1.1-9
ii  libgl1-mesa-glx [libgl1]  11.2.2-1
ii  libglu1-mesa [libglu1]9.0.0-2.1
ii  libjansson4   2.7-5
ii  libjpeg62-turbo   1:1.5.0-1
ii  liblua5.1-0   5.1.5-8
ii  libogg0   1.3.2-1
ii  libopenal11:1.17.2-1
ii  libpng16-16   1.6.23-1
ii  libsdl1.2debian   1.2.15+dfsg1-4
ii  libstdc++66.1.1-9
ii  libtheora01.1.1+dfsg.1-14
ii  libvorbis0a   1.3.5-3
ii  libvorbisfile31.3.5-3

Versions of packages freespace2 recommends:
ii  freespace2-launcher-wxlauncher [freespace2-launcher]  0.11.0+dfsg-1

Versions of packages freespace2 suggests:
ii  dpkg-dev  1.18.9
ii  joystick  1:1.5.1-2
pn  vrms  

-- no debconf information