[needs-merge] courier_0.58.0.20080127-1

[Morten Kjeldgaard]

New upstream version in Debian, please merge.

[Morten Kjeldgaard (mok0)]

This patch excludes bogus changes in debian/po/

[Scott Kitterman (kitterman)]

Your debian/changelog entry needs to document the entire Debian/Ubuntu diff (see the previous entries), and not just what you had to touch manually.

[Morten Kjeldgaard (mok0)]

New patch that includes the desired documentation in debian/changelog. Note that the debian/*.po files are _not_ patched.

[Scott Kitterman (kitterman)]

Pretty good, but needs a couple of things....

We added lsb sections to the inits a couple of releases ago (I did it when I was about to apply for MOTU). The Debian maintainer has decided (finally) to add them. From glancing at them, it does not appear to me like there is a difference there that is worth maintaining. Unless you see a clear reason to do so, I think we should drop the Ubuntu lsb inits and use Debian's.

The package was just rebuilt against the new ldap 2.4, so the patch will need to be updated (debian/changelog is all that's impacted.

Please have a look at bug #189554. If there's a real postinst problem it would be good to deal with it in this merge.

[Morten Kjeldgaard (mok0)]

1) Looked at all init scripts. Changed Default-Start and -Stop to be similar to Debian version. Removed empty Should-Start and Should-Stop fields.
2) Added changelog entry describing recent rebuild against new ldap.
3) Checked all .postinst scripts. Found a weakness that might explain the failure in #189554, but since the description of that bug is lacking, it can't be verified at this time. If /etc/courier for some reason is not present when the script is run (user might inadvertently have deleted it) the script will fail. Now makes sure it's there.
4) I did a very stupid thing. I trimmed all the files in debian/ for trailing whitespace, resulting in a patch that has increased vastly in size. Doh!

[Scott Kitterman (kitterman)]

Please undo the trailing whitespace change. We don't want to carry that diff
with Debian essentiall forever.

[Morten Kjeldgaard (mok0)]

This patch reverts the trailing whitespace goof made above.

[Scott Kitterman (kitterman)]

The patch doesn't apply. Please create a patch that applies from the top of the source directory with -p0.

courier-0.58.0$ patch -p1 <../courier_0.58.0.20080127-1ubuntu1.patch
patching file debian/changelog
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 99 with fuzz 2 (offset 24 lines).
Hunk #3 succeeded at 230 with fuzz 2 (offset 74 lines).
Hunk #4 succeeded at 320 with fuzz 2 (offset 100 lines).
Hunk #5 succeeded at 409 with fuzz 2 (offset 122 lines).
Hunk #6 FAILED at 438.
Hunk #7 succeeded at 511 with fuzz 2 (offset 164 lines).
Hunk #8 succeeded at 559 with fuzz 2 (offset 185 lines).
Hunk #9 succeeded at 604 with fuzz 2 (offset 200 lines).
Hunk #10 succeeded at 832 with fuzz 2 (offset 266 lines).
Hunk #11 succeeded at 1038 with fuzz 2 (offset 323 lines).
2 out of 11 hunks FAILED -- saving rejects to file debian/changelog.rej
The next patch would create the file debian/compat,
which already exists! Assume -R? [n]

and there I quit. The patch looked generally correct, so I think this is just a toolsmanship issue.

[Morten Kjeldgaard (mok0)]

This works for me:

wget http://launchpadlibrarian.net/11806295/courier_0.58.0.20080127-1ubuntu1.patch
dget -x http://ftp.de.debian.org/debian/pool/main/c/courier/courier_0.58.0.20080127-1.dsc
cd courier-0.58.0.20080127/
patch -p1 < ../courier_0.58.0.20080127-1ubuntu1.patch

Am I patching the wrong source?

[Scott Kitterman (kitterman)]

No. I was. Sorry about that.

[Launchpad Janitor (janitor)]

This bug was fixed in the package courier - 0.58.0.20080127-1ubuntu1

---------------
courier (0.58.0.20080127-1ubuntu1) hardy; urgency=low

  * Merge from Debian unstable (LP: #188746)
  * Automatically merged by DaD:
    - debian/watch - Added
    - debian/compat - Added
    - debian/control:
      - Bumped Standards-Version to 3.7.3
      - Changed Build-Depend libgamin-dev instead libfam-dev
      - Updated Build-Depend to debhelper >= 5.0.37
      - Updated Build-Depend to libldap2-dev instead libldap-dev
      - Updated Build-Depend to apache2 instead apache
      - Dropped Build-Depend libmysqlclient-dev
      - Added Build-Depend po-debconf
      - Changed Depends to postfix instead exim4
      - Added Depends debconf to courier-mta, sqwebmail, courier-imap,
        courier-webadmin, courier-pop, courier-ssl
      - Added Depends lsb-base to courier-mta, sqwebmail, courier-imap,
        courier-pcp, courier-ldap, courier-mta-ssl, courier-pop-ssl,
        courier-imap-ssl
      - Added Depends openssl to courier-pop-ssl
    - debian/courier-imap.templates - Added
    - debian/courier-base.templates, debian/courier-webadmin.templates,
      debian/sqwebmail.templates:
      - Grammar and prompt cleanup
    - debian/courier-imap.init, debian/courier-imap-ssl.init,
      debian/courier-ldap.init, debian/courier-mta.init,
      debian/courier-mta-ssl.init, debian/courier-pcp.init,
      debian/courier-pop-.init, debian/courier-pop-ssl.init, sqwebmail.init:
      - Added LSB sections
      - Fixed MAILDIR var to MAILDIRPATH
    - debian/rules:
      - Dropped DH_COMPAT
      - Fixed shared/index to drop warnings
    - debian/sqwebmail.pam:
      - Added common-session
    - debian/srcmgr:
      - Fixed to remove recursive
  * Remaining Ubuntu manual changes:
    - debian/control:
      - Changed maintainer to MOTU
    - debian/*.init: use log_success_msg instead of echo
      - If /etc/courier for some reason does not exist, some of the
        postinst scripts could die horribly. Make sure that it does.
      - Required-Start and Required-Stop lsb fields similar to Debian version.
    - Removed trailing whitespace everywhere.

courier (0.58.0.20080127-1) unstable; urgency=low

  * new upstream release (development snapshot)
  * SPF fix for %{ir} macro
  * tell user about newly introduced sanity check on mailbox directory
    ownership (Closes: #456637, thanks to Jerome Benoit
    <email address hidden> for the report)
  * add /usr/lib/cgi-bin directory to sqwebmail package to fix
    installation problem with yaws webserver (Closes: #462515, #426330,
    thanks to Lucas Nussbaum <email address hidden> for the report
    and Willi Mann <email address hidden> for pointing out a solution)
  * alternative for makedat added to avoid conflicts with maildrop package
  * added LSB dependency info to init scripts (Closes: #458433, thanks to
    Petter Reinholdtsen <email address hidden> for the patch)
  * remove inappropriate reload option from init scripts (Closes: #449175,
    thanks to Peter Eisentraut <email address hidden> for the report)
  * fix FTBFS with GCC 4.3 due to missing #includes (Closes: #456096,
    thanks to Martin Michlmayr <<email address hidden>...