Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-15 Thread Andreas Beckmann 
Package: xserver-xorg-video-geode-dbg
Version: 2.11.16-5
Severity: serious
User: debian...@lists.debian.org
Usertags: piuparts

Hi,

a test with piuparts revealed that your package misses the copyright
file after an upgrade, which is a violation of Policy 12.5:
https://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile

After the upgrade /usr/share/doc/$PACKAGE/ is just an empty directory.

This was observed on the following upgrade paths:

  wheezy -> jessie

>From the attached log (scroll to the bottom...):

3m56.0s ERROR: WARN: Inadequate results from running adequate!
  xserver-xorg-video-geode-dbg: missing-copyright-file 
/usr/share/doc/xserver-xorg-video-geode-dbg/copyright

3m59.5s DUMP: 
  MISSING COPYRIGHT FILE: /usr/share/doc/xserver-xorg-video-geode-dbg/copyright
  # ls -lad /usr/share/doc/xserver-xorg-video-geode-dbg
  drwxr-xr-x 2 root root 40 Jan 15 11:43 
/usr/share/doc/xserver-xorg-video-geode-dbg
  # ls -la /usr/share/doc/xserver-xorg-video-geode-dbg/
  total 0
  drwxr-xr-x   2 root root   40 Jan 15 11:43 .
  drwxr-xr-x 185 root root 3840 Jan 15 11:43 ..


Additional info may be available here:
https://wiki.debian.org/MissingCopyrightFile

Note that dpkg intentionally does not replace directories with symlinks
and vice versa, you need the maintainer scripts to do this.
See in particular the end of point 4 in
https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html#s-unpackphase

It is recommended to use the dpkg-maintscript-helper commands
'dir_to_symlink' and 'symlink_to_dir' (available since dpkg 1.17.14)
to perform the conversion, ideally using d/$PACKAGE.mainstscript.
Do not forget to add 'Pre-Depends: ${misc:Pre-Depends}' in d/control.
See dpkg-maintscript-helper(1) and dh_installdeb(1) for details.


cheers,

Andreas


xserver-xorg-video-geode-dbg_2.11.16-5.log.gz
Description: application/gzip

Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-16 Thread Martin-Éric Racine 
Hey Andreas,

debian/rules uses this:

override_dh_installdocs:
dh_installdocs --link-doc=xserver-xorg-video-geode NEWS README TODO

Surely that would link the -dbg package's /usr/share/doc/foo-dbg to
.../foo, wouldn't it?

Martin-Éric


2015-01-16 5:21 GMT+02:00 Andreas Beckmann :
> Package: xserver-xorg-video-geode-dbg
> Version: 2.11.16-5
> Severity: serious
> User: debian...@lists.debian.org
> Usertags: piuparts
>
> Hi,
>
> a test with piuparts revealed that your package misses the copyright
> file after an upgrade, which is a violation of Policy 12.5:
> https://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile
>
> After the upgrade /usr/share/doc/$PACKAGE/ is just an empty directory.
>
> This was observed on the following upgrade paths:
>
>   wheezy -> jessie
>
> >From the attached log (scroll to the bottom...):
>
> 3m56.0s ERROR: WARN: Inadequate results from running adequate!
>   xserver-xorg-video-geode-dbg: missing-copyright-file 
> /usr/share/doc/xserver-xorg-video-geode-dbg/copyright
>
> 3m59.5s DUMP:
>   MISSING COPYRIGHT FILE: 
> /usr/share/doc/xserver-xorg-video-geode-dbg/copyright
>   # ls -lad /usr/share/doc/xserver-xorg-video-geode-dbg
>   drwxr-xr-x 2 root root 40 Jan 15 11:43 
> /usr/share/doc/xserver-xorg-video-geode-dbg
>   # ls -la /usr/share/doc/xserver-xorg-video-geode-dbg/
>   total 0
>   drwxr-xr-x   2 root root   40 Jan 15 11:43 .
>   drwxr-xr-x 185 root root 3840 Jan 15 11:43 ..
>
>
> Additional info may be available here:
> https://wiki.debian.org/MissingCopyrightFile
>
> Note that dpkg intentionally does not replace directories with symlinks
> and vice versa, you need the maintainer scripts to do this.
> See in particular the end of point 4 in
> https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html#s-unpackphase
>
> It is recommended to use the dpkg-maintscript-helper commands
> 'dir_to_symlink' and 'symlink_to_dir' (available since dpkg 1.17.14)
> to perform the conversion, ideally using d/$PACKAGE.mainstscript.
> Do not forget to add 'Pre-Depends: ${misc:Pre-Depends}' in d/control.
> See dpkg-maintscript-helper(1) and dh_installdeb(1) for details.
>
>
> cheers,
>
> Andreas


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-16 Thread Martin-Éric Racine 
Wait. Got it: DPKG won't squash a previous directory.

Fixed in maintainer script. Patch attached.

Release Team:

Is this something worth getting a freeze exception for? If yes, should
it be introduced via unstable, jessies-update, or something else?

Cheers!
Martin-Éric

2015-01-16 14:48 GMT+02:00 Martin-Éric Racine :
> Hey Andreas,
>
> debian/rules uses this:
>
> override_dh_installdocs:
> dh_installdocs --link-doc=xserver-xorg-video-geode NEWS README TODO
>
> Surely that would link the -dbg package's /usr/share/doc/foo-dbg to
> .../foo, wouldn't it?
>
> Martin-Éric
>
>
> 2015-01-16 5:21 GMT+02:00 Andreas Beckmann :
>> Package: xserver-xorg-video-geode-dbg
>> Version: 2.11.16-5
>> Severity: serious
>> User: debian...@lists.debian.org
>> Usertags: piuparts
>>
>> Hi,
>>
>> a test with piuparts revealed that your package misses the copyright
>> file after an upgrade, which is a violation of Policy 12.5:
>> https://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile
>>
>> After the upgrade /usr/share/doc/$PACKAGE/ is just an empty directory.
>>
>> This was observed on the following upgrade paths:
>>
>>   wheezy -> jessie
>>
>> >From the attached log (scroll to the bottom...):
>>
>> 3m56.0s ERROR: WARN: Inadequate results from running adequate!
>>   xserver-xorg-video-geode-dbg: missing-copyright-file 
>> /usr/share/doc/xserver-xorg-video-geode-dbg/copyright
>>
>> 3m59.5s DUMP:
>>   MISSING COPYRIGHT FILE: 
>> /usr/share/doc/xserver-xorg-video-geode-dbg/copyright
>>   # ls -lad /usr/share/doc/xserver-xorg-video-geode-dbg
>>   drwxr-xr-x 2 root root 40 Jan 15 11:43 
>> /usr/share/doc/xserver-xorg-video-geode-dbg
>>   # ls -la /usr/share/doc/xserver-xorg-video-geode-dbg/
>>   total 0
>>   drwxr-xr-x   2 root root   40 Jan 15 11:43 .
>>   drwxr-xr-x 185 root root 3840 Jan 15 11:43 ..
>>
>>
>> Additional info may be available here:
>> https://wiki.debian.org/MissingCopyrightFile
>>
>> Note that dpkg intentionally does not replace directories with symlinks
>> and vice versa, you need the maintainer scripts to do this.
>> See in particular the end of point 4 in
>> https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html#s-unpackphase
>>
>> It is recommended to use the dpkg-maintscript-helper commands
>> 'dir_to_symlink' and 'symlink_to_dir' (available since dpkg 1.17.14)
>> to perform the conversion, ideally using d/$PACKAGE.mainstscript.
>> Do not forget to add 'Pre-Depends: ${misc:Pre-Depends}' in d/control.
>> See dpkg-maintscript-helper(1) and dh_installdeb(1) for details.
>>
>>
>> cheers,
>>
>> Andreas
diff -Nru xserver-xorg-video-geode-2.11.16/debian/changelog 
xserver-xorg-video-geode-2.11.16/debian/changelog
--- xserver-xorg-video-geode-2.11.16/debian/changelog   2014-11-11 
01:12:48.0 +0200
+++ xserver-xorg-video-geode-2.11.16/debian/changelog   2015-01-16 
15:11:33.0 +0200
@@ -1,3 +1,12 @@
+xserver-xorg-video-geode (2.11.16-6) unstable; urgency=medium
+
+  * debian/xserver-xorg-video-geode-dbg.maintscript: 
++ New file. Handles dir_to_symlink for 2.11.13-5 (Closes: # 775471).
+  * debian/control:
++ xserver-xorg-video-geode-dbg: Pre-Depends: dpkg (>= 1.17.14)
+
+ -- Martin-Éric Racine   Fri, 16 Jan 2015 15:10:36 
+0200
+
 xserver-xorg-video-geode (2.11.16-5) unstable; urgency=medium
 
   * debian/control:
diff -Nru xserver-xorg-video-geode-2.11.16/debian/control 
xserver-xorg-video-geode-2.11.16/debian/control
--- xserver-xorg-video-geode-2.11.16/debian/control 2014-11-11 
00:33:21.0 +0200
+++ xserver-xorg-video-geode-2.11.16/debian/control 2015-01-16 
15:10:27.0 +0200
@@ -40,6 +40,7 @@
 Architecture: any-i386
 Section: debug
 Priority: extra
+Pre-Depends: dpkg (>= 1.17.14)
 Depends: xserver-xorg-core-dbg,
  xserver-xorg-video-geode (= ${binary:Version}),
  ${misc:Depends},
diff -Nru 
xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
 
xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
--- 
xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
1970-01-01 02:00:00.0 +0200
+++ 
xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
2015-01-16 15:02:13.0 +0200
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/xserver-xorg-video-geode-dbg 
/usr/share/doc/xserver-xorg-video-geode 2.11.13-5

Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-16 Thread Jonathan Wiltshire 
On Fri, Jan 16, 2015 at 03:15:29PM +0200, Martin-Éric Racine wrote:
> Wait. Got it: DPKG won't squash a previous directory.
> 
> Fixed in maintainer script. Patch attached.
> 
> Release Team:
> 
> Is this something worth getting a freeze exception for? If yes, should
> it be introduced via unstable, jessies-update, or something else?

Yes please, via unstable.


-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51



signature.asc
Description: Digital signature

Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-16 Thread Andreas Beckmann 
On 2015-01-16 14:15, Martin-Éric Racine wrote:
> --- 
> xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
>   1970-01-01 02:00:00.0 +0200
> +++ 
> xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
>   2015-01-16 15:02:13.0 +0200
> @@ -0,0 +1 @@
> +dir_to_symlink /usr/share/doc/xserver-xorg-video-geode-dbg 
> /usr/share/doc/xserver-xorg-video-geode 2.11.13-5

I think you should use the relative target as it is in the current package:

lrwxrwxrwx 1 root root 24 Nov 10 23:22 
/usr/share/doc/xserver-xorg-video-geode-dbg -> xserver-xorg-video-geode

Also the prior-version was wrong, so the .maintscript file should look like

dir_to_symlink /usr/share/doc/xserver-xorg-video-geode-dbg 
xserver-xorg-video-geode 2.11.13-6~

For debian/control I'd recommend to use ${misc:Pre-Depends) instead of 
hardcoding it manually.


Andreas


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-17 Thread Andreas Beckmann 
On 2015-01-17 11:30, Martin-Éric Racine wrote:
>> dir_to_symlink /usr/share/doc/xserver-xorg-video-geode-dbg 
>> xserver-xorg-video-geode 2.11.13-6~
> 
> Shouldn't the version be the same one as when the symlink was
> introduced? (The relative version tilde is ok).

No, it needs to be the last version that didn't do the conversion.
Ideally both versions are the same :-)

If it's already a symlink (i.e. never a version with a directory there
was installed), dpkg-maintscript-helper dir_to_symlink won't touch it.
But we need to provide a clean upgrade path from all "conversion
forgotten" versions, too.

Thanks for fixing it!

Andreas


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#775471: xserver-xorg-video-geode-dbg: copyright file missing after upgrade (policy 12.5)

2015-01-17 Thread Martin-Éric Racine 
2015-01-17 7:19 GMT+02:00 Andreas Beckmann :
> On 2015-01-16 14:15, Martin-Éric Racine wrote:
>> --- 
>> xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
>>   1970-01-01 02:00:00.0 +0200
>> +++ 
>> xserver-xorg-video-geode-2.11.16/debian/xserver-xorg-video-geode-dbg.maintscript
>>   2015-01-16 15:02:13.0 +0200
>> @@ -0,0 +1 @@
>> +dir_to_symlink /usr/share/doc/xserver-xorg-video-geode-dbg 
>> /usr/share/doc/xserver-xorg-video-geode 2.11.13-5
>
> I think you should use the relative target as it is in the current package:
>
> lrwxrwxrwx 1 root root 24 Nov 10 23:22 
> /usr/share/doc/xserver-xorg-video-geode-dbg -> xserver-xorg-video-geode

I always have my doubts about putting relative links anywhere but, if
you think that this will work as intended, why not.

> Also the prior-version was wrong, so the .maintscript file should look like
>
> dir_to_symlink /usr/share/doc/xserver-xorg-video-geode-dbg 
> xserver-xorg-video-geode 2.11.13-6~

Shouldn't the version be the same one as when the symlink was
introduced? (The relative version tilde is ok).

> For debian/control I'd recommend to use ${misc:Pre-Depends) instead of 
> hardcoding it manually.

Sure, why not.

Martin-Éric


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org