summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Beckmann <anbe@debian.org>2013-10-21 23:59:22 +0200
committerAndreas Beckmann <anbe@debian.org>2013-10-22 00:09:49 +0200
commitb72466a5bc3d9163e869755a0eac7e4f29831565 (patch)
treeb5b8415e152a886079ad00e65de30746ccd5f5d3
parent802c495e0cb5a659fdd67562e3f6dac2f6855325 (diff)
downloadsendmail-b72466a5bc3d9163e869755a0eac7e4f29831565.tar.gz
simplify managing of the bug control files
This reverts most of commit a4de324a2a6e3e84d7f544cf310cf80edfbd1307.
-rw-r--r--debian/changelog1
-rw-r--r--debian/local/Makefile.am4
-rwxr-xr-xdebian/rules7
3 files changed, 1 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 564f6da..2022f4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ sendmail (8.14.4-4.2) UNRELEASED; urgency=low
* debian/rules: refresh-debian-configure: Refresh all Makefile.in, too.
* debian/build/: Update automake helper scripts to automake 1.14.
* debian/configure.ac: Fix libdb-dev autodetection.
+ * Simplify managing the bug control files.
-- Andreas Beckmann <anbe@debian.org> Sat, 19 Oct 2013 02:41:51 +0200
diff --git a/debian/local/Makefile.am b/debian/local/Makefile.am
index 6873dfe..fa8f807 100644
--- a/debian/local/Makefile.am
+++ b/debian/local/Makefile.am
@@ -21,9 +21,6 @@
#
# Shipped programs
#
-nobase_dist_data_DATA = \
- bug/sendmail/control \
- bug/sendmail/script
dist_pkgdata_SCRIPTS = \
Parse_conf.pm \
Parse_mc.pm \
@@ -61,7 +58,6 @@ nobase_dist_sysconf_DATA = \
# Local customisation... not automake friendly (should all be SCRIPTS) :(
#
install-data-hook:
- rm -rf ${DESTDIR}${datadir}/bug/sendmail
${LN_S} sendmail ${DESTDIR}${pkgdatadir}/hoststat;
${LN_S} sendmail ${DESTDIR}${pkgdatadir}/mailstats;
${LN_S} sendmail ${DESTDIR}${pkgdatadir}/mailq;
diff --git a/debian/rules b/debian/rules
index 2388432..7e323b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -344,19 +344,12 @@ clean::
debian/*.debhelper \
debian/build/debian/changelog.in \
debian/build/debian/control \
- debian/bug-control \
- debian/bug-script \
;
for file in tmp ${DEB_PACKAGES};do \
$(RM) -r debian/$$file; \
done;
#--------------------------------------------------------------------
-common-build-indep:: common-build-bugfiles
-common-build-arch:: common-build-bugfiles
-common-build-bugfiles:
- cp debian/local/bug/sendmail/control debian/bug-control
- cp debian/local/bug/sendmail/script debian/bug-script
#-------------
common-build-indep::