please merge courier 0.60.0-1 from debian sid

courier-authlib need to be merged first for courier to build (patch for merge is already done on Bug 254680)

Patch doesn't apply:

Hunk #1 FAILED at 22.
Hunk #2 FAILED at 63.
Hunk #3 FAILED at 106.
Hunk #4 FAILED at 132.
Hunk #5 succeeded at 160 with fuzz 2.
Hunk #6 succeeded at 185 with fuzz 1.
Hunk #7 succeeded at 211 with fuzz 1.
Hunk #8 succeeded at 236 with fuzz 2.
Hunk #9 succeeded at 255 with fuzz 2.
Hunk #10 succeeded at 272 with fuzz 2.
Hunk #12 succeeded at 332 with fuzz 2.
Hunk #13 succeeded at 357 with fuzz 2.

The patch should be applied to debian's courier 0.60.0-1. I can patch it without problems:

[buster:~/dev/ubuntu/src/courier/tmp] nxvl$ ls
courier-0.60.0 courier_0.60.0-1.dsc courier_0.60.0.orig.tar.gz
courier_0.60.0-1.diff.gz courier_0.60.0-1ubuntu1.debdiff

[buster:~/dev/ubuntu/src/courier/tmp] nxvl$ patch -p0 < courier_0.60.0-1ubuntu1.debdiff
patching file courier-0.60.0/debian/courier-mlm.init
patching file courier-0.60.0/debian/courier-imap-ssl.init
patching file courier-0.60.0/debian/courier-imap.init
patching file courier-0.60.0/debian/courier-pop-ssl.init
patching file courier-0.60.0/debian/courier-mta-ssl.postinst
patching file courier-0.60.0/debian/courier-mta.postinst
patching file courier-0.60.0/debian/courier-pop.init
patching file courier-0.60.0/debian/courier-mta.init
patching file courier-0.60.0/debian/courier-pop-ssl.postinst
patching file courier-0.60.0/debian/courier-mta-ssl.init
patching file courier-0.60.0/debian/courier-pcp.init
patching file courier-0.60.0/debian/control
patching file courier-0.60.0/debian/changelog
patching file courier-0.60.0/debian/courier-ldap.init
patching file courier-0.60.0/debian/courier-imap-ssl.postinst
patching file courier-0.60.0/debian/po/cs.po
patching file courier-0.60.0/debian/po/pt_BR.po
patching file courier-0.60.0/debian/po/sv.po
patching file courier-0.60.0/debian/po/es.po
patching file courier-0.60.0/debian/watch

OK. I'll try it again tomorrow.

Patch failed again, but since it worked for others, I decided not to blame you and fixed in manually.

+ - debian/control:
+ - Bumped Standards-Version to 3.7.3

+Standards-Version: 3.8.0

Please pick one. Also if you're going to claim 3.8.0, please actually update it. At a glance, Homepage: is missing. Please check the upgrade checklist that comes in the debian-policy package.

Generally good job on a tough merge.

uploading new debdiff.

Now running lintian...
W: courier source: maintainer-script-lacks-debhelper-token debian/courier-mta.preinst
W: courier source: out-of-date-standards-version 3.7.3 (current is 3.8.0)
E: courier source: build-depends-on-obsolete-package build-depends: gs
E: courier source: build-depends-on-obsolete-package build-depends: gs-aladdin

unsuscribing uus since there is nothing to sponsor :D

scott, your diff seems to downgrade config.guess and config.sub.

Thanks.

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

---------------
courier (0.60.0-1ubuntu1) intrepid; urgency=low

  [ Nicolas Valcárcel ]
  * Fix deprecated chown usage in debian/courier-webadmin.postinst
  * Fix rpath issue. http://wiki.debian.org/RpathIssue
  * debian/control:
    - Build-depend on chrpath
    - Fixed courier-mta's line too long issue on long description
    - Fixed courier-imap's line too long issue on long description
    - Change courier-faxmail's Depend on gs | gs-aladdin to ghostscript
  * Removed unnecesary debian/conffiles files:
    - courier-pop-ssl.conffiles
    - courier-pop.conffiles
    - courier-pcp.conffiles
    - courier-mta-ssl.conffiles
    - courier-mta.conffiles
    - courier-base.conffiles
    - courier-faxmail.conffiles
    - courier-imap.conffiles
    - courier-imap-ssl.conffiles
    - courier-ldap.conffiles
    - courier-maildrop.conffiles
    - courier-mlm.conffiles
    - sqwebmail.conffiles
  * Bumped Standards-Version to 3.8.0
  * Merge from debian unstable (LP: #254681), remaining changes:
    - debian/watch - Added
    - debian/control:
      - 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
      - Dropped Build-Depend libmysqlclient-dev
      - Added Build-Depend po-debconf
      - Changed Depends to apache2 instead apache
      - 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.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/sqwebmail.pam:
      - Added common-session
    - 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.

  [ Scott Kitterman ]
  * Touched up debian/changelog formatting
  * Change build-dep on gs | gs-aladdin to ghostscript
  * Add debhelper token to courier-mta.preinst
  * Disable parallel builds in debian/rules so it will actually build

  [ Michael Casadevall ]
  * Removed unneeded config.* files from the diff
  * Removed patch for maildrop (unneeded AFAIK, and breaks the build now)
  * Removed webmail piddir patch, merged upstream
  * Resolved FTBFS in maildrop/webmail

 -- Michael Casadevall <email address hidden> Wed, 19 Aug 2008 01:33:50 -0400