Bug#858426: unblock: tworld/1.3.2-3

[Andreas Beckmann]

On 2017-03-23 01:06, Rhonda D'Vine wrote:
>  But I doubt that that is really a reason to re-upload it, do you see
> any way that second ~~ in there could have any side effect?

No, that should be only cosmetic.


Andreas

Bug#858426: unblock: tworld/1.3.2-3

[Rhonda D'Vine]

Hi,

* Andreas Beckmann  [2017-03-23 00:45:53 CET]:
> 1.3.2-3~ is already smaller than 1.3.2-3~bpo*

 You are of course right, not sure what way my thoughts were going at
that time.

> >  Actually I would assume most packages using that with only one tilde
> > didn't think about it, and I haven't even found any hint or
> > documentation that even suggests a single ~.
> 
> dpkg-maintscript-helper(1)

 Thanks, also not sure how I missed that part.

 But I doubt that that is really a reason to re-upload it, do you see
any way that second ~~ in there could have any side effect?

 Enjoy,
Rhonda
-- 
Fühlst du dich mutlos, fass endlich Mut, los  |
Fühlst du dich hilflos, geh raus und hilf, los| Wir sind Helden
Fühlst du dich machtlos, geh raus und mach, los   | 23.55: Alles auf Anfang
Fühlst du dich haltlos, such Halt und lass los|

Bug#858426: unblock: tworld/1.3.2-3

[Andreas Beckmann]

On Wed, 22 Mar 2017 23:58:11 +0100 Rhonda D'Vine  wrote:
> > one ~ too many?
> 
>  Not really.  You would need two ~ to be able to produce a backport and
> have it work there too.  So 1.3.2-3~~ is smaller than 1.3.2-3~bpo*. Not
> that I plan to do it for tworld, but actually it's the safe thing to do.

1.3.2-3~ is already smaller than 1.3.2-3~bpo*

>  Actually I would assume most packages using that with only one tilde
> didn't think about it, and I haven't even found any hint or
> documentation that even suggests a single ~.

dpkg-maintscript-helper(1)


Andreas

Bug#858426: unblock: tworld/1.3.2-3

[Rhonda D'Vine]

   Hi,

* Emilio Pozuelo Monfort  [2017-03-22 18:24:38 CET]:
> On 22/03/17 10:48, Rhonda D'Vine wrote:
> > diff -Nru tworld-1.3.2/debian/tworld.maintscript 
> > tworld-1.3.2/debian/tworld.maintscript
> > --- tworld-1.3.2/debian/tworld.maintscript  1970-01-01 01:00:00.0 
> > +0100
> > +++ tworld-1.3.2/debian/tworld.maintscript  2017-03-22 09:54:26.0 
> > +0100
> > @@ -0,0 +1 @@
> > +symlink_to_dir /usr/share/doc/tworld tworld-data 1.3.2-3~~
>^^
> one ~ too many?

 Not really.  You would need two ~ to be able to produce a backport and
have it work there too.  So 1.3.2-3~~ is smaller than 1.3.2-3~bpo*. Not
that I plan to do it for tworld, but actually it's the safe thing to do.

 Actually I would assume most packages using that with only one tilde
didn't think about it, and I haven't even found any hint or
documentation that even suggests a single ~.

 So long, and thanks for paying attention to details. :)
Rhonda
-- 
Fühlst du dich mutlos, fass endlich Mut, los  |
Fühlst du dich hilflos, geh raus und hilf, los| Wir sind Helden
Fühlst du dich machtlos, geh raus und mach, los   | 23.55: Alles auf Anfang
Fühlst du dich haltlos, such Halt und lass los|

Bug#858426: unblock: tworld/1.3.2-3

[Emilio Pozuelo Monfort]

On 22/03/17 10:48, Rhonda D'Vine wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> 
>  Hi,
> 
>  please unblock package tworld, it fixes the binNMU b0rkage mentioned in
> #857974.
> 
> #v+
> $ debdiff tworld_1.3.2-2.dsc  tworld_1.3.2-3.dsc
> diff -Nru tworld-1.3.2/debian/changelog tworld-1.3.2/debian/changelog
> --- tworld-1.3.2/debian/changelog 2016-01-05 14:53:05.0 +0100
> +++ tworld-1.3.2/debian/changelog 2017-03-22 09:54:26.0 +0100
> @@ -1,3 +1,12 @@
> +tworld (1.3.2-3) unstable; urgency=medium
> +
> +  * Remove doc symlink to -data package from tworld to make it binNMUable
> +(closes: #857974)
> +  * Install docs into tworld package instead of tworld-data.
> +  * Bump Standards-Version to 3.9.8.
> +
> + -- Rhonda D'Vine   Wed, 22 Mar 2017 09:54:26 +0100
> +
>  tworld (1.3.2-2) unstable; urgency=medium
>  
>* Fix reproducible issue, thanks to Chris Lamb for finding the spot to
> diff -Nru tworld-1.3.2/debian/control tworld-1.3.2/debian/control
> --- tworld-1.3.2/debian/control   2016-01-01 04:04:04.0 +0100
> +++ tworld-1.3.2/debian/control   2017-03-22 09:54:26.0 +0100
> @@ -4,7 +4,7 @@
>  Maintainer: Debian Games Team 
>  Uploaders: Rhonda D'Vine 
>  Build-Depends: debhelper (>= 9~), libsdl1.2-dev
> -Standards-Version: 3.9.6
> +Standards-Version: 3.9.8
>  Vcs-Git: git://anonscm.debian.org/pkg-games/tworld.git
>  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/tworld.git
>  Homepage: http://www.muppetlabs.com/~breadbox/software/tworld/
> diff -Nru tworld-1.3.2/debian/rules tworld-1.3.2/debian/rules
> --- tworld-1.3.2/debian/rules 2016-01-05 18:27:28.0 +0100
> +++ tworld-1.3.2/debian/rules 2017-03-22 09:54:26.0 +0100
> @@ -21,6 +21,3 @@
>   pod2man -s 6 -r 'Tile World' -c '' debian/c4 \
>   debian/tworld-data/usr/share/man/man6/c4.6
>   dh_auto_install
> -
> -override_dh_installdocs:
> - dh_installdocs --link-doc=tworld-data
> diff -Nru tworld-1.3.2/debian/tworld-data.docs 
> tworld-1.3.2/debian/tworld-data.docs
> --- tworld-1.3.2/debian/tworld-data.docs  2016-01-01 04:04:04.0 
> +0100
> +++ tworld-1.3.2/debian/tworld-data.docs  1970-01-01 01:00:00.0 
> +0100
> @@ -1,3 +0,0 @@
> -BUGS
> -README
> -docs/tworld.html
> diff -Nru tworld-1.3.2/debian/tworld.docs tworld-1.3.2/debian/tworld.docs
> --- tworld-1.3.2/debian/tworld.docs   1970-01-01 01:00:00.0 +0100
> +++ tworld-1.3.2/debian/tworld.docs   2017-03-22 09:54:26.0 +0100
> @@ -0,0 +1,3 @@
> +BUGS
> +README
> +docs/tworld.html
> diff -Nru tworld-1.3.2/debian/tworld.maintscript 
> tworld-1.3.2/debian/tworld.maintscript
> --- tworld-1.3.2/debian/tworld.maintscript1970-01-01 01:00:00.0 
> +0100
> +++ tworld-1.3.2/debian/tworld.maintscript2017-03-22 09:54:26.0 
> +0100
> @@ -0,0 +1 @@
> +symlink_to_dir /usr/share/doc/tworld tworld-data 1.3.2-3~~
   ^^
one ~ too many?

Cheers,
Emilio

Bug#858426: unblock: tworld/1.3.2-3

[Rhonda D'Vine]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

 Hi,

 please unblock package tworld, it fixes the binNMU b0rkage mentioned in
#857974.

#v+
$ debdiff tworld_1.3.2-2.dsc  tworld_1.3.2-3.dsc
diff -Nru tworld-1.3.2/debian/changelog tworld-1.3.2/debian/changelog
--- tworld-1.3.2/debian/changelog   2016-01-05 14:53:05.0 +0100
+++ tworld-1.3.2/debian/changelog   2017-03-22 09:54:26.0 +0100
@@ -1,3 +1,12 @@
+tworld (1.3.2-3) unstable; urgency=medium
+
+  * Remove doc symlink to -data package from tworld to make it binNMUable
+(closes: #857974)
+  * Install docs into tworld package instead of tworld-data.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Rhonda D'Vine   Wed, 22 Mar 2017 09:54:26 +0100
+
 tworld (1.3.2-2) unstable; urgency=medium
 
   * Fix reproducible issue, thanks to Chris Lamb for finding the spot to
diff -Nru tworld-1.3.2/debian/control tworld-1.3.2/debian/control
--- tworld-1.3.2/debian/control 2016-01-01 04:04:04.0 +0100
+++ tworld-1.3.2/debian/control 2017-03-22 09:54:26.0 +0100
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team 
 Uploaders: Rhonda D'Vine 
 Build-Depends: debhelper (>= 9~), libsdl1.2-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/pkg-games/tworld.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/tworld.git
 Homepage: http://www.muppetlabs.com/~breadbox/software/tworld/
diff -Nru tworld-1.3.2/debian/rules tworld-1.3.2/debian/rules
--- tworld-1.3.2/debian/rules   2016-01-05 18:27:28.0 +0100
+++ tworld-1.3.2/debian/rules   2017-03-22 09:54:26.0 +0100
@@ -21,6 +21,3 @@
pod2man -s 6 -r 'Tile World' -c '' debian/c4 \
debian/tworld-data/usr/share/man/man6/c4.6
dh_auto_install
-
-override_dh_installdocs:
-   dh_installdocs --link-doc=tworld-data
diff -Nru tworld-1.3.2/debian/tworld-data.docs 
tworld-1.3.2/debian/tworld-data.docs
--- tworld-1.3.2/debian/tworld-data.docs2016-01-01 04:04:04.0 
+0100
+++ tworld-1.3.2/debian/tworld-data.docs1970-01-01 01:00:00.0 
+0100
@@ -1,3 +0,0 @@
-BUGS
-README
-docs/tworld.html
diff -Nru tworld-1.3.2/debian/tworld.docs tworld-1.3.2/debian/tworld.docs
--- tworld-1.3.2/debian/tworld.docs 1970-01-01 01:00:00.0 +0100
+++ tworld-1.3.2/debian/tworld.docs 2017-03-22 09:54:26.0 +0100
@@ -0,0 +1,3 @@
+BUGS
+README
+docs/tworld.html
diff -Nru tworld-1.3.2/debian/tworld.maintscript 
tworld-1.3.2/debian/tworld.maintscript
--- tworld-1.3.2/debian/tworld.maintscript  1970-01-01 01:00:00.0 
+0100
+++ tworld-1.3.2/debian/tworld.maintscript  2017-03-22 09:54:26.0 
+0100
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/tworld tworld-data 1.3.2-3~~
#v-


unblock tworld/1.3.2-3

 Thanks in advance,
Rhonda
-- 
Fühlst du dich mutlos, fass endlich Mut, los  |
Fühlst du dich hilflos, geh raus und hilf, los| Wir sind Helden
Fühlst du dich machtlos, geh raus und mach, los   | 23.55: Alles auf Anfang
Fühlst du dich haltlos, such Halt und lass los|