fix duplicate and incorrect Section and Homepage settings

2 files changed, 11 insertions, 34 deletions

diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in
index 64716f0..0d00a0b 100644
--- a/debian/build/debian/control.m4.in
+++ b/debian/build/debian/control.m4.in
@@ -20,7 +20,7 @@ dnl # Always built
 dnl #
 [[Source: sendmail
 Priority: extra
-Section:  mail
+Section: mail
 Maintainer: Jakub Safarik <jsafarik@ymail.com>
 Standards-Version: 3.8.3
 ]]dnl # Sigh... build daemons ignore B-D-I, so replicate in B-D :(
@@ -38,7 +38,6 @@ dnl #
 
 Package: sendmail-bin
 Architecture: any
-Section: mail
 Replaces: mail-transport-agent
 Provides: mail-transport-agent
 Conflicts: mail-transport-agent
@@ -60,9 +59,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  pick from the plethora of available MUAs (mutt, vm, etc.)
  .
  This package supports @sm_databases@ maps,
- and has enabled @sm_features@.
- .
-Homepage: http://www.sendmail.org]]dnl
+ and has enabled @sm_features@.]]dnl
 dnl #
 dnl # The arch=any package: rmail
 dnl # Always built
@@ -71,7 +68,6 @@ dnl #
 
 Package: rmail
 Architecture: any
-Section: mail
 Conflicts: sendmail (<< 8.13.1-7), postfix, exim, exim-tls, exim4-daemon-custom, exim4-daemon-heavy, exim4-daemon-light, courier-mta, smail, zmailer, masqmail
 Depends: sendmail-bin | mail-transport-agent, ${shlibs:Depends}
 Description: MTA->UUCP remote mail handler
@@ -79,9 +75,7 @@ Description: MTA->UUCP remote mail handler
  sendmail (or workalike).
  .
  This version comes from the sendmail source package and the only
- change is the call to sendmail (from -obq to -obi).
- .
-Homepage: http://www.sendmail.org]]dnl
+ change is the call to sendmail (from -obq to -obi).]]dnl
 dnl #
 dnl # The arch=any package: sensible-mda (debian private)
 dnl # Always built
@@ -90,7 +84,6 @@ dnl #
 
 Package: sensible-mda
 Architecture: any
-Section: mail
 Depends: sendmail-bin | mail-transport-agent, procmail | maildrop | deliver, ${shlibs:Depends}
 Description: Mail Delivery Agent wrapper
  Sensible-mda is a Debian addition in the sendmail package and has been
@@ -117,12 +110,10 @@ Description: Sendmail Mail Filter API (Milter)
  The Debian Sendmail package is built to support libmilter.
  .
  This package contains libmilter.so
- .
-Homepage: http://www.sendmail.org
 
 Package: libmilter@sm_libmilter_version@-dbg
 Architecture: any
-Section: libs
+Section: debug
 Depends: libmilter@sm_libmilter_version@ (= ${binary:Version}), ${shlibs:Depends}
 Description: Sendmail Mail Filter API (Milter)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
@@ -131,9 +122,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  The Debian Sendmail package is built to support libmilter.
  .
- This package contains debugging information for libmilter.so
- .
-Homepage: http://www.sendmail.org]]dnl
+ This package contains debugging information for libmilter.so]]dnl
 dnl #
 dnl # The arch=any package: libmilter-dev
 dnl # Only built if MILTER is enabled
@@ -154,9 +143,7 @@ Description: Sendmail Mail Filter API (Milter)
  .
  This is the libmilter static library and include files for development.
  .
- The documentation on building a Milter is in the sendmail-doc package.
- .
-Homepage: http://www.sendmail.org]]]])dnl
+ The documentation on building a Milter is in the sendmail-doc package.]]]])dnl
 dnl #
 dnl # The arch=all package: sendmail-doc
 dnl # Always built
@@ -180,9 +167,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
    op.{ps,txt}.gz  -- The care and feeding of Sendmail.
    faq.txt.gz      -- Sendmail FAQ, current as of the package date.
  .
- Other files include the references for smrsh and libmilter.
- .
-Homepage: http://www.sendmail.org]]dnl
+ Other files include the references for smrsh and libmilter.]]dnl
 dnl #
 dnl # The arch=all package: sendmail
 dnl # Always built
@@ -191,7 +176,6 @@ dnl #
 
 Package: sendmail
 Architecture: all
-Section: mail
 Replaces: sendmail-tls, sendmail-base (<< 8.14.4-2.2~)
 Depends: sendmail-base, sendmail-bin, sendmail-cf, sensible-mda
 Breaks: sendmail-base (<< 8.14.4-2.2~)
@@ -213,9 +197,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  This package supports @sm_databases@ maps,
  and has enabled @sm_features@.
  .
- This package is to make installation/upgrading easier (Do NOT delete it)
- .
-Homepage: http://www.sendmail.org]]dnl
+ This package is to make installation/upgrading easier (Do NOT delete it)]]dnl
 dnl #
 dnl # The arch=all package: sendmail-base
 dnl # Always built
@@ -224,7 +206,6 @@ dnl #
 
 Package: sendmail-base
 Architecture: all
-Section: mail
 Depends: m4, make, adduser, ${perl:Depends}
 Suggests: sendmail-doc, ca-certificates, logcheck, logrotate, resolvconf
 Description: powerful, efficient, and scalable Mail Transport Agent
@@ -234,9 +215,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  can also be complex.
  .
  This package contains the base, architecture independent, portions
- of the sendmail packages.
- .
-Homepage: http://www.sendmail.org]]dnl
+ of the sendmail packages.]]dnl
 dnl #
 dnl # The arch=all package: sendmail-cf
 dnl # Always built
@@ -245,7 +224,6 @@ dnl #
 
 Package: sendmail-cf
 Architecture: all
-Section: mail
 Suggests: sendmail-doc
 Depends: m4
 Description: powerful, efficient, and scalable Mail Transport Agent
@@ -255,9 +233,7 @@ Description: powerful, efficient, and scalable Mail Transport Agent
  can also be complex.
  .
  This package contains the .m4 (configuration files) for the
- sendmail packages.
- .
-Homepage: http://www.sendmail.org]]dnl
+ sendmail packages.]]dnl
 dnl #
 dnl # Provide the requisite trailing newline
 dnl #
diff --git a/debian/changelog b/debian/changelog
index a007eba..8dba203 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ sendmail (8.14.4-4.1) UNRELEASED; urgency=low
   * Fix FTBFS on HURD, thanks to Samuel Thibault.  (Closes: #608525)
   * Drop obsolete NEWS entries.
   * Use canonical Vcs-* URLs.
+  * Fix duplicate and incorrect Section and Homepage settings.
 
  -- Andreas Beckmann <anbe@debian.org>  Fri, 13 Sep 2013 05:46:00 +0200