Bug#773036: Debdiff

2014-12-23 Thread Ricardo Mones

Control: tags -1 help

Hi all,

On Mon, 15 Dec 2014 13:24:01 +0100
Andreas Beckmann a...@debian.org wrote:

 libetpan-dev has the same problems as libetpan-dbg and needs to be
 fixed, too.
 
 On Sat, 13 Dec 2014 20:26:48 + bastien ROUCARIES
 roucaries.bast...@gmail.com wrote:
  The following unstested patch should work
 
 not quite ...
 
  diff -Nru libetpan-1.5/debian/changelog libetpan-1.5/debian/changelog
  --- libetpan-1.5/debian/changelog   2014-06-11 18:38:34.0
  +0200 +++ libetpan-1.5/debian/changelog 2014-12-13
  20:13:37.0 +0100 @@ -1,3 +1,9 @@
  +libetpan (1.5-2) unstable; urgency=medium
  +
  +  * Fix symlink to dir problem introduced in 1.4.1-1 (Closes: #773033).
  +
  + -- Bastien Roucariès roucaries.bastien+deb...@gmail.com  Sat, 13 Dec
  2014 20:13:31 +0100
  +
   libetpan (1.5-1) unstable; urgency=medium
   
 * New upstream release: not really, identical to 1.4.1 but version
  diff -Nru libetpan-1.5/debian/control libetpan-1.5/debian/control
  --- libetpan-1.5/debian/control 2014-06-11 18:38:34.0
  +0200 +++ libetpan-1.5/debian/control   2014-12-13
  20:15:38.0 +0100 @@ -57,6 +57,7 @@
   Multi-Arch: same
   Priority: extra
   Depends: libetpan17 (= ${binary:Version}), ${misc:Depends}
  +Pre-Depends: dpkg (= 1.17.5)
 
 Pre-Depends: ${misc:Pre-Depends}
 if you use .maintscript files, see below
 
   Description: debugging symbols for libetpan
libEtPan! is a mail library. It may be used for low-level mail
  handling: network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP with or
  without SSL), diff -Nru libetpan-1.5/debian/libetpan-dbg.postinst 
  libetpan-1.5/debian/libetpan-dbg.postinst
  --- libetpan-1.5/debian/libetpan-dbg.postinst   1970-01-01
  01:00:00.0 +0100
  +++ libetpan-1.5/debian/libetpan-dbg.postinst   2014-12-13
  20:24:23.0 +0100
  @@ -0,0 +1,8 @@
  +#!/bin/sh
  +
  +set -e
  +
  +dpkg-maintscript-helper symlink_to_dir \
  +   /usr/share/doc/libetpan-dbg/ /usr/share/doc/libetpan15/
  1.5-2~ -- $@
  +
  +#DEBHELPER#
 
 The trailing slashes (at least the first one) make the call useless -
 it's not the symlink being tested, but the resolved directory behind it.
 For the second it should be sufficient to use the relative path.
 
 This manual code duplication (in 3 maintainer scripts) can be reduced by
 using .maintscript files, for libetpan-dbg it could look like this
 (completely untested!):
 
 libetpan-dbg.maintscript:
 symlink_to_dir /usr/share/doc/libetpan-dbg libetpan15 1.5-2~

First, thanks a lot for looking at this. Fact is I don't have much time at
this moment to be able to fix this, and I've never had to deal with
maintscripts directly, so I feel a bit like I'm going to break something if
I do, specially within the freeze period.

Is there any chance you can submit a complete patch for fixing it?

Second, which I also found scary from your comments: how can this be tested?
Just running piuparts with the new package?

thanks in advance and best regards,
-- 
 Ricardo Mones
 http://people.debian.org/~mones
 «Some men are all right in their place -- if they only the knew the 
 right places! -- Mae West»


pgpQdVanr6aIP.pgp
Description: OpenPGP digital signature


Bug#773036: Debdiff

2014-12-15 Thread Andreas Beckmann
libetpan-dev has the same problems as libetpan-dbg and needs to be
fixed, too.

On Sat, 13 Dec 2014 20:26:48 + bastien ROUCARIES
roucaries.bast...@gmail.com wrote:
 The following unstested patch should work

not quite ...

 diff -Nru libetpan-1.5/debian/changelog libetpan-1.5/debian/changelog
 --- libetpan-1.5/debian/changelog 2014-06-11 18:38:34.0 +0200
 +++ libetpan-1.5/debian/changelog 2014-12-13 20:13:37.0 +0100
 @@ -1,3 +1,9 @@
 +libetpan (1.5-2) unstable; urgency=medium
 +
 +  * Fix symlink to dir problem introduced in 1.4.1-1 (Closes: #773033).
 +
 + -- Bastien Roucariès roucaries.bastien+deb...@gmail.com  Sat, 13 Dec 2014 
 20:13:31 +0100
 +
  libetpan (1.5-1) unstable; urgency=medium
  
* New upstream release: not really, identical to 1.4.1 but version
 diff -Nru libetpan-1.5/debian/control libetpan-1.5/debian/control
 --- libetpan-1.5/debian/control   2014-06-11 18:38:34.0 +0200
 +++ libetpan-1.5/debian/control   2014-12-13 20:15:38.0 +0100
 @@ -57,6 +57,7 @@
  Multi-Arch: same
  Priority: extra
  Depends: libetpan17 (= ${binary:Version}), ${misc:Depends}
 +Pre-Depends: dpkg (= 1.17.5)

Pre-Depends: ${misc:Pre-Depends}
if you use .maintscript files, see below

  Description: debugging symbols for libetpan
   libEtPan! is a mail library. It may be used for low-level mail handling:
   network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP with or without SSL),
 diff -Nru libetpan-1.5/debian/libetpan-dbg.postinst 
 libetpan-1.5/debian/libetpan-dbg.postinst
 --- libetpan-1.5/debian/libetpan-dbg.postinst 1970-01-01 01:00:00.0 
 +0100
 +++ libetpan-1.5/debian/libetpan-dbg.postinst 2014-12-13 20:24:23.0 
 +0100
 @@ -0,0 +1,8 @@
 +#!/bin/sh
 +
 +set -e
 +
 +dpkg-maintscript-helper symlink_to_dir \
 +   /usr/share/doc/libetpan-dbg/ /usr/share/doc/libetpan15/ 
 1.5-2~ 
 -- $@
 +
 +#DEBHELPER#

The trailing slashes (at least the first one) make the call useless -
it's not the symlink being tested, but the resolved directory behind it.
For the second it should be sufficient to use the relative path.

This manual code duplication (in 3 maintainer scripts) can be reduced by
using .maintscript files, for libetpan-dbg it could look like this
(completely untested!):

libetpan-dbg.maintscript:
symlink_to_dir /usr/share/doc/libetpan-dbg libetpan15 1.5-2~


Andreas


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



Bug#773036: Debdiff

2014-12-13 Thread bastien ROUCARIES
control: tags -1 + patch

The following unstested patch should work


diff -Nru libetpan-1.5/debian/changelog libetpan-1.5/debian/changelog
--- libetpan-1.5/debian/changelog   2014-06-11 18:38:34.0 +0200
+++ libetpan-1.5/debian/changelog   2014-12-13 20:13:37.0 +0100
@@ -1,3 +1,9 @@
+libetpan (1.5-2) unstable; urgency=medium
+
+  * Fix symlink to dir problem introduced in 1.4.1-1 (Closes: #773033).
+
+ -- Bastien Roucariès roucaries.bastien+deb...@gmail.com  Sat, 13 Dec 2014 
20:13:31 +0100
+
 libetpan (1.5-1) unstable; urgency=medium
 
   * New upstream release: not really, identical to 1.4.1 but version
diff -Nru libetpan-1.5/debian/control libetpan-1.5/debian/control
--- libetpan-1.5/debian/control 2014-06-11 18:38:34.0 +0200
+++ libetpan-1.5/debian/control 2014-12-13 20:15:38.0 +0100
@@ -57,6 +57,7 @@
 Multi-Arch: same
 Priority: extra
 Depends: libetpan17 (= ${binary:Version}), ${misc:Depends}
+Pre-Depends: dpkg (= 1.17.5)
 Description: debugging symbols for libetpan
  libEtPan! is a mail library. It may be used for low-level mail handling:
  network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP with or without SSL),
diff -Nru libetpan-1.5/debian/libetpan-dbg.postinst 
libetpan-1.5/debian/libetpan-dbg.postinst
--- libetpan-1.5/debian/libetpan-dbg.postinst   1970-01-01 01:00:00.0 
+0100
+++ libetpan-1.5/debian/libetpan-dbg.postinst   2014-12-13 20:24:23.0 
+0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper symlink_to_dir \
+   /usr/share/doc/libetpan-dbg/ /usr/share/doc/libetpan15/ 1.5-2~ 
-- $@
+
+#DEBHELPER#
diff -Nru libetpan-1.5/debian/libetpan-dbg.postrm libetpan-1.5/debian/libetpan-
dbg.postrm
--- libetpan-1.5/debian/libetpan-dbg.postrm 1970-01-01 01:00:00.0 
+0100
+++ libetpan-1.5/debian/libetpan-dbg.postrm 2014-12-13 20:24:28.0 
+0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper symlink_to_dir \
+   /usr/share/doc/libetpan-dbg/ /usr/share/doc/libetpan15/ 1.5-2~ 
-- $@
+
+#DEBHELPER#
diff -Nru libetpan-1.5/debian/libetpan-dbg.preinst 
libetpan-1.5/debian/libetpan-dbg.preinst
--- libetpan-1.5/debian/libetpan-dbg.preinst1970-01-01 01:00:00.0 
+0100
+++ libetpan-1.5/debian/libetpan-dbg.preinst2014-12-13 20:24:31.0 
+0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper symlink_to_dir \
+   /usr/share/doc/libetpan-dbg/ /usr/share/doc/libetpan15/ 1.5-2~ 
-- $@
+
+#DEBHELPER#


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