• Bug#263701: NMU diff

    From Matthias Urlichs@1:229/2 to All on Fri Aug 13 16:40:08 2004
    From: [email protected]

    This is the NMU patch.
    I'll upload to the delayed-2 queue today.

    diff -ru conglomerate-0.7.14/debian/changelog conglomerate-0.7.14-nmu/debian/changelog
    --- conglomerate-0.7.14/debian/changelog 2004-08-13 10:57:45 +0200
    +++ conglomerate-0.7.14-nmu/debian/changelog 2004-08-13 10:19:37 +0200
    @@ -1,3 +1,11 @@
    +conglomerate (0.7.14-1.1) unstable; urgency=medium
    +
    + * NMU.
    + * Closes: #263701: Please use gcrypt11/gnutls11 instead of gcrypt7/gnutls10 + - depend on libgnomeui-dev (>= 2.6.1.1-4)
    +
    + -- Matthias Urlichs <[email protected]> Fri, 13 Aug 2004 10:19:15 +0200
    +
    conglomerate (0.7.14-1) unstable; urgency=low

    * new upstream versions, 0.7.14 was released two days after 0.7.13.
    diff -ru conglomerate-0.7.14/debian/control conglomerate-0.7.14-nmu/debian/control
    --- conglomerate-0.7.14/debian/control 2004-08-13 10:57:45 +0200
    +++ conglomerate-0.7.14-nmu/debian/control 2004-08-13 10:19:41 +0200
    @@ -3,7 +3,7 @@
    Priority: optional
    Maintainer: Geert Stappers <[email protected]>
    Uploaders: Sven Luther <[email protected]>
    -Build-Depends: debhelper (>> 4.1.51), dpatch, gnome-common, libbonobo2-dev, libbonoboui2-dev, libgnomeui-dev, li
  • From Geert Stappers@1:229/2 to Matthias Urlichs on Fri Aug 13 17:40:10 2004
    From: [email protected]

    On Fri, Aug 13, 2004 at 04:20:03PM +0200, Matthias Urlichs wrote:
    This is the NMU patch.
    You mist my announce of 0.7.14-2, it was sended to both
    [email protected] and [email protected].

    I'll upload to the delayed-2 queue today.
    Please don't.


    diff -ru conglomerate-0.7.14/debian/changelog conglomerate-0.7.14-nmu/debian/changelog
    --- conglomerate-0.7.14/debian/changelog 2004-08-13 10:57:45 +0200
    +++ conglomerate-0.7.14-nmu/debian/changelog 2004-08-13 10:19:37 +0200
    @@ -1,3 +1,11 @@
    +conglomerate (0.7.14-1.1) unstable; urgency=medium
    +
    + * NMU.
    + * Closes: #263701: Please use gcrypt11/gnutls11 instead of gcrypt7/gnutls10
    + - depend on libgnomeui-dev (>= 2.6.1.1-4)
    +
    + -- Matthias Urlichs <[email protected]> Fri, 13 Aug 2004 10:19:15 +0200
    +
    conglomerate (0.7.14-1) unstable; urgency=low

    * new upstream versions, 0.7.14 was released two days after 0.7.13.
    diff -ru conglomerate-0.7.14/debian/control conglomerate-0.7.14-nmu/debian/control
    --- conglomerate-0.7.14/debian/control 2004-08-13 10:57:45 +0200
    +++ conglomerate-0.7.14-nmu/debian/control 2004-08-13 10:19:41 +0200
    @@ -3,7 +3,7 @@
    Priority: optional
    Maintainer: Geert Stappers <[email protected]>
    Uploaders: Sven Luther <[email protected]>
    -Build-Depends: debhelper (>> 4.1.51), dpatch, gnome-common, libbonobo2-dev, libbonoboui2-dev, libgnomeui-dev, libgnomeprint-dev, libgnomeprintui2.2-dev, libxslt1-dev, scrollkeeper
    +Build-Depends: debhelper (>> 4.1.51), dpatch, gnome-common, libbonobo2-dev, libbonoboui2-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprint-dev, libgnomeprintui2.2-dev, libxslt1-dev, scrollkeeper

    -Build-Depends: libgnomeui-dev,
    +Build-Depends: libgnomeui-dev (>= 2.6.1.1-4),

    That is change that I assumed not necessary. (assumption is the mother of all fuck ups)
    I will add that to 0.7.14-3

    Thank you.


    Cheers
    Geert Stappers

    P.S.

    That you didn't see the bug closed, is probably because it
    waits for approval of the conglomerate-common package.

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.1 (GNU/Linux)

    iD8DBQFBHNucOSINbgwa/7sRAjkjAJ9lAXQxAYVBRJElRWCH2JuYrL631ACghCD8 JR+aOHlg5UUWxwl7FaHAaR8=
    =CvlE
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Geert Stappers@1:229/2 to Geert Stappers on Fri Aug 13 21:00:21 2004
    From: [email protected]

    On Fri, Aug 13, 2004 at 05:17:48PM +0200, Geert Stappers wrote:
    On Fri, Aug 13, 2004 at 04:20:03PM +0200, Matthias Urlichs wrote:
    <snip/>
    -Build-Depends: libgnomeui-dev,
    +Build-Depends: libgnomeui-dev (>= 2.6.1.1-4),

    That is a change that I assumed not necessary. (assumption is the mother of all fuck ups)
    I will add that to 0.7.14-3

    You can get the diff.gz by

    wget http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3.diff.gz


    Cheers
    Geert Stappers

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.1 (GNU/Linux)

    iD8DBQFBHPy2OSINbgwa/7sRAvKDAJ9oraicd/mm41Ge3OFI3WGYWNvN8ACgv/Cz kU0E4uf8j3iQPLPq2hdGICw=
    =pWi4
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Matthias Urlichs@1:229/2 to All on Sat Aug 14 12:20:04 2004
    From: [email protected]

    Hi,

    Geert Stappers:
    You mist my announce of 0.7.14-2, it was sended to both
    [email protected] and [email protected].

    I seem to have missed that (my mailer acted up).

    I'll upload to the delayed-2 queue today.
    Please don't.

    Deleted.

    --
    Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [email protected]

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.5 (GNU/Linux)

    iD8DBQFBHd6h8+hUANcKr/kRAheMAJ9F6Vp/hTxGgrRaG+0/EZTnLdeq9wCcCsfy V42qeTGV3h66cbPM9FtC90c=
    =MC38
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Geert Stappers@1:229/2 to Matthias Urlichs on Sat Aug 14 16:40:13 2004
    From: [email protected]

    On Sat, Aug 14, 2004 at 11:42:58AM +0200, Matthias Urlichs wrote:
    Hi,
    Hallo Sven,
    Hallo Matthias,


    Geert Stappers:
    You mist my announce of 0.7.14-2, it was sended to both
    [email protected] and [email protected].

    I seem to have missed that (my mailer acted up).

    I'll upload to the delayed-2 queue today.
    Please don't.

    Deleted.

    Okay, the 0.7.14-1.1 is canceled.

    That NMU had some use:
    It made me add '(>= 2.6.1.1-4)' to libgnomeui-dev in the
    Build-Depends line of debian/control in 0.7.14-3.

    And there may be another reason why it is good to upload 0.7.14-3. dpkg-buildpackage, which generates the .diff.gz file, does NOT
    notice the removal the debian/conglomerate.postinst which is in
    in the .orig.tar.gz. That file contains code to install /etc/gconf/schema/conglomerate.schema, which went into the
    conglomerate-common package.
    This means it can BREAK the packaging system!
    In the diff.gz there should lines like:

    --- conglomerate-0.7.14.orig/debian/conglomerate.postinst
    +++ conglomerate-0.7.14/debian/conglomerate.postinst
    @@ -4,11 +4,11 @@

    PACKAGE=conglomerate

    -if [ "$1" = "configure" ]; then
    - export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
    - HOME=/root /usr/bin/gconftool-2 --makefile-install-rule \
    - /etc/gconf/schemas/${PACKAGE}.schemas > /dev/null
    -fi
    +#if [ "$1" = "configure" ]; then
    +# export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
    +# HOME=/root /usr/bin/gconftool-2 --makefile-install-rule \
    +# /etc/gconf/schemas/${PACKAGE}.schemas > /dev/null
    +#fi

    #DEBHELPER#


    the 0.7.14-3.diff.gz does contains these lines.


    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz


    Cheers
    Geert Stappers

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.1 (GNU/Linux)

    iD8DBQFBHh8+OSINbgwa/7sRAqpbAKCmx/CXOhuHctizL55SLgrWfmRJ5QCePmis XK8EhtZwNOnz6q+TYThCHjk=
    =U0g8
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you canno
  • From Matthias Urlichs@1:229/2 to All on Sat Aug 14 17:00:13 2004
    From: [email protected]

    Hi,

    Geert Stappers:
    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz

    Sven: will you do it, or shall I?

    --
    Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [email protected]

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.5 (GNU/Linux)

    iD8DBQFBHiLE8+hUANcKr/kRAtVUAJ94bX5dvOvGvbPYuJe/LHr/xFF1MwCeL1YH y+vkuBQdMPpLiawCq2DqhqQ=
    =+QQX
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Geert Stappers@1:229/2 to Matthias Urlichs on Sun Aug 15 11:30:10 2004
    From: [email protected]

    --924gEkU1VlJlwnwX
    Content-Type: text/plain; charset=us-ascii
    Content-Disposition: inline
    Content-Transfer-Encoding: quoted-printable

    On Sat, Aug 14, 2004 at 04:33:41PM +0200, Matthias Urlichs wrote:
    Hi,

    Geert Stappers:
    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz

    Sven: will you do it, or shall I?

    To find what the plans are for Sven this weekend, I checked

    http://db.debian.org : He is not on vacation

    http://lists.debian.org/debian-powerpc/2004/08/author.html : no postings on saturday,
    no signs saying "Leaving town for a few days"

    http://lists.debian.org/debian-boot/2004/08/author2.html : no postings on saturday
    no signs saying "Leaving town for a few days"

    http://lists.debian.org/debian-boot/2004/08/msg00762.html : a todo list
    for debian-installer on PowerPC


    If we don't see a message from Sven the next few hours saying:
    "upload of 0.7.14-3 done"
    then please go ahead.

    Or just do it right away.


    Cheers
    Geert Stappers

    --924gEkU1VlJlwnwX
    Content-Type: text/plain; charset=us-ascii
    Content-Disposition: attachment; filename="uploadbysmurf.diff" Content-Transfer-Encoding: quoted-printable

    --- debian/control.usual 2004-08-13 17:01:52.000000000 +0000
    +++ debian/control 2004-08-15 08:34:21.000000000 +0000
    @@ -2,7 +2,7 @@
    Section: editors
    Priority: optional
    Maintainer: Geert Stappers <[email protected]>
    -Uploaders: Sven Luther <[email protected]>
    +Uploaders: Matthias Urlichs <[email protected]>
    Build-Depends: debhelper (>> 4.1.51), dpatch, gnome-common, libbonobo2-dev, libbonoboui2-dev, libgnomeui-dev (>= 2.6.1.1-4), libgnomeprint-dev, libgnomeprintui2.2-dev, libxslt1-dev, scrollkeeper
    Standards-Version: 3.6.1


    --924gEkU1VlJlwnwX--

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.1 (GNU/Linux)

    iD8DBQFBHygBOSINbgwa/7sRAgMwAJ9zwzsfQ2B+lLAh62sXEHxj0EwWHQCgt6Cc bg2QQYo7+092DYDla9FoAd0=
    =NbWJ
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Sven Luther@1:229/2 to Geert Stappers on Sun Aug 15 23:20:06 2004
    From: [email protected]

    On Sun, Aug 15, 2004 at 11:08:17AM +0200, Geert Stappers wrote:
    On Sat, Aug 14, 2004 at 04:33:41PM +0200, Matthias Urlichs wrote:
    Hi,

    Geert Stappers:
    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz

    Sven: will you do it, or shall I?

    To find what the plans are for Sven this weekend, I checked

    http://db.debian.org : He is not on vacation

    http://lists.debian.org/debian-powerpc/2004/08/author.html : no postings on saturday,
    no signs saying "Leaving town for a few days"

    http://lists.debian.org/debian-boot/2004/08/author2.html : no postings on saturday
    no signs saying "Leaving town for a few days"

    http://lists.debian.org/debian-boot/2004/08/msg00762.html : a todo list
    for debian-installer on PowerPC


    If we don't see a message from Sven the next few hours saying:
    "upload of 0.7.14-3 done"
    then please go ahead.

    Or just do it right away.

    Hey, i was away the weekend, a bit over 48 hours. No real need to post a vacation notice for this, as past flamage on debian-private has shown.

    Friendly,

    Sven Luther


    --
    To UNSUBSCRIBE, email to [email protected]
    with a subject of "unsubscribe". Trouble? Contact [email protected]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Sven Luther@1:229/2 to Matthias Urlichs on Sun Aug 15 23:20:07 2004
    From: [email protected]

    On Sat, Aug 14, 2004 at 04:33:41PM +0200, Matthias Urlichs wrote:
    Hi,

    Geert Stappers:
    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz

    Sven: will you do it, or shall I?

    Please what's the hurry ? I was away for the weekend, so not much i could do, but still the freeze date for low urgency packages is only on the 17th of august, so ...

    Friendly,

    Sven Luther


    --
    To UNSUBSCRIBE, email to [email protected]
    with a subject of "unsubscribe". Trouble? Contact [email protected]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Geert Stappers@1:229/2 to Sven Luther on Mon Aug 16 20:30:14 2004
    From: [email protected]

    On Sun, Aug 15, 2004 at 10:59:24PM +0200, Sven Luther wrote:
    On Sat, Aug 14, 2004 at 04:33:41PM +0200, Matthias Urlichs wrote:
    Hi,

    Geert Stappers:
    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz

    Sven: will you do it, or shall I?

    Please what's the hurry ? I was away for the weekend, so not much i could do, but still the freeze date for low urgency packages is only on the 17th of august, so ...

    Hello Sven,

    Good to have you back.
    Yes, I can image that I look nervous.
    It was the discovery that the error you encountered could be regenerated
    by dpkg-buildpackage (not detecting removed debian/conglomerate.postinst).

    From [email protected] I got a message stating that the new packages
    are NOT lintian clean. ( I did a `lintian cong*.dsc`, which was clean )

    Today I spend time on making another -3 version, this one uses
    lintian override files.

    http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3.diff.gz

    the previous one is available as

    http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3friday.diff.gz


    An uncompressed version, to read online is
    http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3.diff

    (and yes, there is also a friday version 8^)


    Can have look at it?
    And when it matches your quality standard, then please upload.


    Friendly,

    Sven Luther


    Cheers
    Geert Stappers

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.2.1 (GNU/Linux)

    iD8DBQFBIPh9OSINbgwa/7sRAgPsAJwMpNERegKSldk66Blf8WRL2Eq+2gCfYHP+ xCq3oourHuVPQtk1ezwN/yQ=
    =zuAo
    -----END PGP SIGNATURE-----

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)
  • From Sven Luther@1:229/2 to Geert Stappers on Mon Aug 16 22:00:09 2004
    From: [email protected]

    On Mon, Aug 16, 2004 at 08:10:05PM +0200, Geert Stappers wrote:
    On Sun, Aug 15, 2004 at 10:59:24PM +0200, Sven Luther wrote:
    On Sat, Aug 14, 2004 at 04:33:41PM +0200, Matthias Urlichs wrote:
    Hi,

    Geert Stappers:
    Sven and or Matthias:
    Please upload conglomerate_0.7.14-3.diff.gz

    Sven: will you do it, or shall I?

    Please what's the hurry ? I was away for the weekend, so not much i could do,
    but still the freeze date for low urgency packages is only on the 17th of august, so ...

    Hello Sven,

    Good to have you back.
    Yes, I can image that I look nervous.
    It was the discovery that the error you encountered could be regenerated
    by dpkg-buildpackage (not detecting removed debian/conglomerate.postinst).

    From [email protected] I got a message stating that the new packages
    are NOT lintian clean. ( I did a `lintian cong*.dsc`, which was clean )

    Today I spend time on making another -3 version, this one uses
    lintian override files.

    http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3.diff.gz

    the previous one is available as

    http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3friday.diff.gz


    An uncompressed version, to read online is
    http://www.stappers.nl/gst/pool/main/c/conglomerate/conglomerate_0.7.14-3.diff

    (and yes, there is also a friday version 8^)


    Can have look at it?
    And when it matches your quality standard, then please upload.

    Ok, will do so tomorrow morning.

    Friendly,

    Sven Luther


    --
    To UNSUBSCRIBE, email to [email protected]
    with a subject of "unsubscribe". Trouble? Contact [email protected]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)