Merge ~wxl/kubuntu-packaging/+git/kppp:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kppp:kubuntu_unstable

[Walter Lapchynski]

Fixes version numbers mentioned in kppp.{NEWS,README.Debian} to resolve "KCI-W :: W: kppp: debian-news-entry-has-unknown-version 4:4.8.4-3" (http://kci.pangea.pub/job/zesty_unstable_kppp/19/parsed_console/).

This lintian tag occurs when NEWS.Debian mentions a version number that can't be found in the changelog. They both mention 4:4.8.4-3, which is not to be found. Both of these files refer to kppp 4:4.8.4-3. Interestingly, the package wasn't actually known as kppp back then. Look at the changelog and you'll find a 4:4.8.4-1, but it's kdenetwork.

Debian is plagued by the same problem: https://anonscm.debian.org/cgit/pkg-kde/applications/kppp.git/tree/debian
As is Neon: https://packaging.neon.kde.org/applications/kppp.git/tree/debian

That said, it made sense to just change the version to match the latest version closest to the kppp 4:4.8.4-3 (kdenetwork 4:4.8.4-1). Problem solved.

On the other hand…

What's really interesting is that this commit (b5b4feb) is from 9 September 2013 which corresponds to the kppp 4:4.11.1-1 version in the changelog. This was to deal with an upstream split and ended up producing a new source package kppp, which is what we deal with now. kppp used to be a part of the kdenetwork package (https://packaging.neon.kde.org/attic/kdenetwork.git/tree/debian/control). Looking there (https://packaging.neon.kde.org/attic/kdenetwork.git/plain/debian/changelog) you actually find changelog entries for the right version (kdenetwork, though).

Trimming off all the kppp entries from a fresh Neon kppp changelog, I find some differences, but mainly a lot of stuff missing:
http://paste.ubuntu.com/23530855/
So maybe the bigger problem would be to add all the changelog entries back. Well, kdenetwork built a lot of different packages. So maybe cherry-picking would make more sense.

On the other hand, at least in relation to 4:4.8.4-3, there's no reason why it shouldn't be included. As you can see, it made changes that (outside of the changelog entry), still exist in the current codebase:
http://paste.ubuntu.com/23530848/

tl;dr, the fix works, albeit it being a bit janky, but this tends to reveal a larger problem that seems to have been all but ignored for 3 years.

[Clive Johnston (clivejo)]

Do you think that these items are still needed? Given that the NEWS file is signed off by Maxy in June 2013. Kinda sounds like old news to me :)

Also, we usually also include a changelog entry just saying what was done in your commit.

[Walter Lapchynski (wxl)]

Yeah well maybe it makes sense to remove them, but still, there's the missing changelog entries. I don't know. If it works for you, it works for me. Just seems like the transition to a separate package didn't go all that cleanly and no one really seemed to pick up on that anywhere. It might be a little late to deal with the dust bunnies at this point. Better to just sweep them back under the carpet ;)

diff --git a/debian/kppp.NEWS b/debian/kppp.NEWS
index b8e12f1..cd7755e 100644
--- a/debian/kppp.NEWS
+++ b/debian/kppp.NEWS
@@ -1,4 +1,4 @@
-kppp (4:4.8.4-3) unstable; urgency=low
+kdenetwork (4:4.8.4-1) unstable; urgency=low
 
   The /usr/bin/kppp binary is no longer setuid executable, that means that to
   use the kppp command the user needs to belong to the groups:
diff --git a/debian/kppp.README.Debian b/debian/kppp.README.Debian
index 4982269..76867da 100644
--- a/debian/kppp.README.Debian
+++ b/debian/kppp.README.Debian
@@ -1,7 +1,7 @@
 KPPP for Debian
 -----------------
 
- As of 4:4.8.4-3 to use the kppp command the user needs to belong to the
+ As of 4:4.8.4-1 to use the kppp command the user needs to belong to the
  groups:
    - dip (as required by pppd)
    - dialout (to access the modem devices)