do not create symlinks in /usr/share/bug

19 files changed, 2 insertions, 29 deletions

diff --git a/debian/build/debian/libmilter-dbg.dirs.in b/debian/build/debian/libmilter-dbg.dirs.in
deleted file mode 100644
index 91d68a1..0000000
--- a/debian/build/debian/libmilter-dbg.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-./DEBIAN
-.@libdir@/debug
diff --git a/debian/build/debian/libmilter-dev.dirs.in b/debian/build/debian/libmilter-dev.dirs.in
index a0b512b..888fdbf 100644
--- a/debian/build/debian/libmilter-dev.dirs.in
+++ b/debian/build/debian/libmilter-dev.dirs.in
@@ -1,7 +1,5 @@
-./DEBIAN
 .@includedir@/libmilter
 .@libdir@
 .@libdir@/libmilter
 .@docdir@/libmilter-dev
-.@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/libmilter-dev.links.in b/debian/build/debian/libmilter-dev.links.in
index 529e052..43a454e 100644
--- a/debian/build/debian/libmilter-dev.links.in
+++ b/debian/build/debian/libmilter-dev.links.in
@@ -1,3 +1,2 @@
-usr/share/bug/sendmail usr/share/bug/libmilter-dev
 usr/lib/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter/libmilter.so.@sm_libmilter_version@
 usr/lib/libmilter/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter/libmilter.so
diff --git a/debian/build/debian/libmilter.dirs.in b/debian/build/debian/libmilter.dirs.in
index 8145c07..7373576 100644
--- a/debian/build/debian/libmilter.dirs.in
+++ b/debian/build/debian/libmilter.dirs.in
@@ -1,5 +1,3 @@
-./DEBIAN
 .@libdir@/libmilter
 .@docdir@/libmilter@sm_libmilter_version@
-.@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/libmilter.links.in b/debian/build/debian/libmilter.links.in
deleted file mode 100644
index b0ffc90..0000000
--- a/debian/build/debian/libmilter.links.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/bug/sendmail usr/share/bug/libmilter@sm_libmilter_version@
diff --git a/debian/build/debian/rmail.dirs.in b/debian/build/debian/rmail.dirs.in
index d6661b4..1ae967a 100644
--- a/debian/build/debian/rmail.dirs.in
+++ b/debian/build/debian/rmail.dirs.in
@@ -1,6 +1,4 @@
-./DEBIAN
 .@sbindir@
 .@mandir@
 .@mandir@/man8
-.@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/sendmail-base.dirs.in b/debian/build/debian/sendmail-base.dirs.in
index 5c46b96..f53ff11 100644
--- a/debian/build/debian/sendmail-base.dirs.in
+++ b/debian/build/debian/sendmail-base.dirs.in
@@ -1,4 +1,3 @@
-./DEBIAN
 .@sysconfdir@/cron.d
 .@sysconfdir@/cron.daily
 .@sysconfdir@/default
@@ -31,8 +30,6 @@
 .@mandir@
 .@mandir@/man1
 .@mandir@/man8
-.@datadir@/bug
-.@datadir@/bug/sendmail
 .@datadir@/sendmail
 .@datadir@/sendmail/examples
 .@datadir@/sendmail/examples/db
diff --git a/debian/build/debian/sendmail-bin.dirs.in b/debian/build/debian/sendmail-bin.dirs.in
index 41098e0..a4e0873 100644
--- a/debian/build/debian/sendmail-bin.dirs.in
+++ b/debian/build/debian/sendmail-bin.dirs.in
@@ -1,4 +1,3 @@
-./DEBIAN
 .@sysconfdir@/cron.daily
 .@sysconfdir@/init.d
 .@bindir@
@@ -9,7 +8,6 @@
 .@mandir@/man1
 .@mandir@/man5
 .@mandir@/man8
-.@datadir@/bug
 .@localstatedir@/spool/mqueue
 .@localstatedir@/spool/mqueue-client
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/sendmail-cf.dirs.in b/debian/build/debian/sendmail-cf.dirs.in
index 5f68fa8..f2ef32f 100644
--- a/debian/build/debian/sendmail-cf.dirs.in
+++ b/debian/build/debian/sendmail-cf.dirs.in
@@ -1,6 +1,4 @@
-./DEBIAN
 .@docdir@/sendmail-cf
-.@datadir@/bug
 .@datadir@/sendmail/cf
 .@datadir@/sendmail/cf/cf
 .@datadir@/sendmail/cf/debian
diff --git a/debian/build/debian/sendmail-doc.dirs.in b/debian/build/debian/sendmail-doc.dirs.in
index 6692aec..333dd04 100644
--- a/debian/build/debian/sendmail-doc.dirs.in
+++ b/debian/build/debian/sendmail-doc.dirs.in
@@ -1,8 +1,6 @@
-./DEBIAN
 .@docdir@/sendmail-doc
 .@docdir@/sendmail-doc/libmilter
 .@docdir@/sendmail-doc/libmilter/html
 .@docdir@/sendmail-doc/op
 .@docdir@/sendmail-doc/sendmail
-.@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/sendmail.dirs.in b/debian/build/debian/sendmail.dirs.in
index 4c335c8..3d7ea9c 100644
--- a/debian/build/debian/sendmail.dirs.in
+++ b/debian/build/debian/sendmail.dirs.in
@@ -1,4 +1,2 @@
-./DEBIAN
 .@docdir@/sendmail
-.@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/build/debian/sensible-mda.dirs.in b/debian/build/debian/sensible-mda.dirs.in
index d6661b4..1ae967a 100644
--- a/debian/build/debian/sensible-mda.dirs.in
+++ b/debian/build/debian/sensible-mda.dirs.in
@@ -1,6 +1,4 @@
-./DEBIAN
 .@sbindir@
 .@mandir@
 .@mandir@/man8
-.@datadir@/bug
 .@datadir@/lintian/overrides
diff --git a/debian/changelog b/debian/changelog
index 8f2eefc..5fa1b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ sendmail (8.14.4-2.2) UNRELEASED; urgency=low
   * sendmail-base: Remove obsolete conffile
     /etc/dhcp3/dhclient-exit-hooks.d/sendmail on upgrades.
   * sendmail-base: Remove /etc/mail/{sendmail,submit}.cf.old on purge.
+  * Cleanup symlinks in /usr/share/bug, too, and ship bug-{control,script} in
+    all packages.
 
  -- Andreas Beckmann <debian@abeckmann.de>  Mon, 01 Oct 2012 20:19:07 +0200
 
diff --git a/debian/configure.ac b/debian/configure.ac
index 5a4d22f..61e5bd2 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1682,7 +1682,6 @@ AC_CONFIG_FILES([build/debian/control.m4],[
 		cp ./build/debian/control ./;])
 dnl AC_CONFIG_FILES([rules:./build/rules.in], [chmod a+x ./rules])
 AC_CONFIG_FILES([libmilter${sm_libmilter_version}.dirs:./build/debian/libmilter.dirs.in])
-AC_CONFIG_FILES([libmilter${sm_libmilter_version}.links:./build/debian/libmilter.links.in])
 AC_CONFIG_FILES([libmilter${sm_libmilter_version}.lintian-overrides:./build/debian/libmilter.lintian-overrides.in])
 AC_CONFIG_FILES([libmilter${sm_libmilter_version}.preinst:./build/debian/libmilter.preinst.in],
 	[chmod a+x ./libmilter${sm_libmilter_version}.preinst])
diff --git a/debian/rmail.links b/debian/rmail.links
deleted file mode 100644
index 01ebb97..0000000
--- a/debian/rmail.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/bug/sendmail usr/share/bug/rmail
diff --git a/debian/sendmail-base.links b/debian/sendmail-base.links
index 435b090..42c7509 100644
--- a/debian/sendmail-base.links
+++ b/debian/sendmail-base.links
@@ -1,2 +1 @@
 usr/share/sendmail/examples	usr/share/doc/sendmail-base/examples
-usr/share/bug/sendmail usr/share/bug/sendmail-base
diff --git a/debian/sendmail-bin.links b/debian/sendmail-bin.links
deleted file mode 100644
index 28458f8..0000000
--- a/debian/sendmail-bin.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/bug/sendmail usr/share/bug/sendmail-bin
diff --git a/debian/sendmail-cf.links b/debian/sendmail-cf.links
deleted file mode 100644
index f7febab..0000000
--- a/debian/sendmail-cf.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/bug/sendmail usr/share/bug/sendmail-cf
diff --git a/debian/sensible-mda.links b/debian/sensible-mda.links
deleted file mode 100644
index 2f4cb3e..0000000
--- a/debian/sensible-mda.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/bug/sendmail usr/share/bug/sensible-mda