summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Beckmann <anbe@debian.org>2013-10-22 00:42:22 +0200
committerAndreas Beckmann <anbe@debian.org>2013-10-22 00:42:22 +0200
commit9b5080da9228d71649fb3979e9ee0164e013c880 (patch)
tree23bddac687380781794934a9a02bf2957b2f51dc
parent80226204743ae8203a4c846949a0b2efc91c833b (diff)
downloadsendmail-9b5080da9228d71649fb3979e9ee0164e013c880.tar.gz
move all control file templates to debian/
-rw-r--r--debian/changelog2
-rw-r--r--debian/configure.ac73
-rw-r--r--debian/libmilter-dev.dirs.in (renamed from debian/build/debian/libmilter-dev.dirs.in)0
-rw-r--r--debian/libmilter-dev.links.in (renamed from debian/build/debian/libmilter-dev.links.in)0
-rw-r--r--debian/libmilter-dev.preinst.in (renamed from debian/build/debian/libmilter-dev.preinst.in)0
-rw-r--r--debian/libmilter.dirs.in (renamed from debian/build/debian/libmilter.dirs.in)0
-rw-r--r--debian/libmilter.preinst.in (renamed from debian/build/debian/libmilter.preinst.in)0
-rw-r--r--debian/rmail.dirs.in (renamed from debian/build/debian/rmail.dirs.in)0
-rw-r--r--debian/rmail.preinst.in (renamed from debian/build/debian/rmail.preinst.in)0
-rw-r--r--debian/sendmail-base.dirs.in (renamed from debian/build/debian/sendmail-base.dirs.in)0
-rw-r--r--debian/sendmail-base.postinst.in (renamed from debian/build/debian/sendmail-base.postinst.in)0
-rw-r--r--debian/sendmail-base.postrm.in (renamed from debian/build/debian/sendmail-base.postrm.in)0
-rw-r--r--debian/sendmail-base.preinst.in (renamed from debian/build/debian/sendmail-base.preinst.in)0
-rw-r--r--debian/sendmail-base.prerm.in (renamed from debian/build/debian/sendmail-base.prerm.in)0
-rw-r--r--debian/sendmail-bin.dirs.in (renamed from debian/build/debian/sendmail-bin.dirs.in)0
-rw-r--r--debian/sendmail-bin.postinst.in (renamed from debian/build/debian/sendmail-bin.postinst.in)0
-rw-r--r--debian/sendmail-bin.postrm.in (renamed from debian/build/debian/sendmail-bin.postrm.in)0
-rw-r--r--debian/sendmail-bin.preinst.in (renamed from debian/build/debian/sendmail-bin.preinst.in)0
-rw-r--r--debian/sendmail-bin.prerm.in (renamed from debian/build/debian/sendmail-bin.prerm.in)0
-rw-r--r--debian/sendmail-bin.suid.in (renamed from debian/build/debian/sendmail-bin.suid.in)0
-rw-r--r--debian/sendmail-cf.dirs.in (renamed from debian/build/debian/sendmail-cf.dirs.in)0
-rw-r--r--debian/sendmail-cf.postrm.in (renamed from debian/build/debian/sendmail-cf.postrm.in)0
-rw-r--r--debian/sendmail-cf.preinst.in (renamed from debian/build/debian/sendmail-cf.preinst.in)0
-rw-r--r--debian/sendmail-doc.dirs.in (renamed from debian/build/debian/sendmail-doc.dirs.in)0
-rw-r--r--debian/sendmail-doc.preinst.in (renamed from debian/build/debian/sendmail-doc.preinst.in)0
-rw-r--r--debian/sendmail.cron.daily.in (renamed from debian/build/debian/sendmail.cron.daily.in)0
-rw-r--r--debian/sendmail.dirs.in (renamed from debian/build/debian/sendmail.dirs.in)0
-rw-r--r--debian/sendmail.init.d.in (renamed from debian/build/debian/sendmail.init.d.in)0
-rw-r--r--debian/sensible-mda.dirs.in (renamed from debian/build/debian/sensible-mda.dirs.in)0
-rw-r--r--debian/sensible-mda.preinst.in (renamed from debian/build/debian/sensible-mda.preinst.in)0
30 files changed, 30 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog
index 33208d9..6a80fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ sendmail (8.14.4-4.2) UNRELEASED; urgency=low
* debian/configure.ac: Fix libdb-dev autodetection.
* Simplify managing the bug control files.
* Let dh_lintian install the overrides.
+ * Simplify managing generated control files by placing the templates
+ directly in debian/.
-- Andreas Beckmann <anbe@debian.org> Sat, 19 Oct 2013 02:41:51 +0200
diff --git a/debian/configure.ac b/debian/configure.ac
index 80178fd..5212aa6 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1681,52 +1681,35 @@ AC_CONFIG_FILES([build/debian/control.m4],[
m4 ./build/debian/control.m4 > ./build/debian/control;
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}.dirs:libmilter.dirs.in])
AC_CONFIG_FILES([libmilter${sm_libmilter_version}.lintian-overrides: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])
-AC_CONFIG_FILES([libmilter-dev.dirs:./build/debian/libmilter-dev.dirs.in])
-AC_CONFIG_FILES([libmilter-dev.links:./build/debian/libmilter-dev.links.in])
-AC_CONFIG_FILES([libmilter-dev.preinst:./build/debian/libmilter-dev.preinst.in],
- [chmod a+x ./libmilter-dev.preinst])
-AC_CONFIG_FILES([rmail.dirs:./build/debian/rmail.dirs.in])
-AC_CONFIG_FILES([rmail.preinst:./build/debian/rmail.preinst.in],
- [chmod a+x ./rmail.preinst])
-AC_CONFIG_FILES([sendmail.dirs:./build/debian/sendmail.dirs.in])
-AC_CONFIG_FILES([sendmail-base.dirs:./build/debian/sendmail-base.dirs.in])
-AC_CONFIG_FILES([sendmail-base.postinst:./build/debian/sendmail-base.postinst.in],
- [chmod a+x ./sendmail-base.postinst])
-AC_CONFIG_FILES([sendmail-base.postrm:./build/debian/sendmail-base.postrm.in],
- [chmod a+x ./sendmail-base.postrm])
-AC_CONFIG_FILES([sendmail-base.preinst:./build/debian/sendmail-base.preinst.in],
- [chmod a+x ./sendmail-base.preinst])
-AC_CONFIG_FILES([sendmail-base.prerm:./build/debian/sendmail-base.prerm.in],
- [chmod a+x ./sendmail-base.prerm])
-AC_CONFIG_FILES([sendmail-doc.dirs:./build/debian/sendmail-doc.dirs.in])
-AC_CONFIG_FILES([sendmail-doc.preinst:./build/debian/sendmail-doc.preinst.in],
- [chmod a+x ./sendmail-doc.preinst])
-AC_CONFIG_FILES([sendmail-cf.dirs:./build/debian/sendmail-cf.dirs.in])
-AC_CONFIG_FILES([sendmail-cf.postrm:./build/debian/sendmail-cf.postrm.in],
- [chmod a+x ./sendmail-cf.postrm])
-AC_CONFIG_FILES([sendmail-cf.preinst:./build/debian/sendmail-cf.preinst.in],
- [chmod a+x ./sendmail-cf.preinst])
-AC_CONFIG_FILES([sendmail.cron.daily:./build/debian/sendmail.cron.daily.in],
- [chmod a+x ./sendmail.cron.daily])
-AC_CONFIG_FILES([sendmail-bin.dirs:./build/debian/sendmail-bin.dirs.in])
-AC_CONFIG_FILES([sendmail.init.d:./build/debian/sendmail.init.d.in:./local/sendmail.in],
- [chmod a+x ./sendmail.init.d])
-AC_CONFIG_FILES([sendmail-bin.postinst:./build/debian/sendmail-bin.postinst.in],
- [chmod a+x ./sendmail-bin.postinst])
-AC_CONFIG_FILES([sendmail-bin.postrm:./build/debian/sendmail-bin.postrm.in],
- [chmod a+x ./sendmail-bin.postrm])
-AC_CONFIG_FILES([sendmail-bin.preinst:./build/debian/sendmail-bin.preinst.in],
- [chmod a+x ./sendmail-bin.preinst])
-AC_CONFIG_FILES([sendmail-bin.prerm:./build/debian/sendmail-bin.prerm.in],
- [chmod a+x ./sendmail-bin.prerm])
-AC_CONFIG_FILES([sendmail-bin.suid:./build/debian/sendmail-bin.suid.in])
-AC_CONFIG_FILES([sensible-mda.dirs:./build/debian/sensible-mda.dirs.in])
-AC_CONFIG_FILES([sensible-mda.preinst:./build/debian/sensible-mda.preinst.in],
- [chmod a+x ./sensible-mda.preinst])
+AC_CONFIG_FILES([libmilter${sm_libmilter_version}.preinst:libmilter.preinst.in])
+AC_CONFIG_FILES([libmilter-dev.dirs])
+AC_CONFIG_FILES([libmilter-dev.links])
+AC_CONFIG_FILES([libmilter-dev.preinst])
+AC_CONFIG_FILES([rmail.dirs])
+AC_CONFIG_FILES([rmail.preinst])
+AC_CONFIG_FILES([sendmail.dirs])
+AC_CONFIG_FILES([sendmail-base.dirs])
+AC_CONFIG_FILES([sendmail-base.postinst])
+AC_CONFIG_FILES([sendmail-base.postrm])
+AC_CONFIG_FILES([sendmail-base.preinst])
+AC_CONFIG_FILES([sendmail-base.prerm])
+AC_CONFIG_FILES([sendmail-doc.dirs])
+AC_CONFIG_FILES([sendmail-doc.preinst])
+AC_CONFIG_FILES([sendmail-cf.dirs])
+AC_CONFIG_FILES([sendmail-cf.postrm])
+AC_CONFIG_FILES([sendmail-cf.preinst])
+AC_CONFIG_FILES([sendmail.cron.daily])
+AC_CONFIG_FILES([sendmail-bin.dirs])
+AC_CONFIG_FILES([sendmail.init.d:sendmail.init.d.in:local/sendmail.in])
+AC_CONFIG_FILES([sendmail-bin.postinst])
+AC_CONFIG_FILES([sendmail-bin.postrm])
+AC_CONFIG_FILES([sendmail-bin.preinst])
+AC_CONFIG_FILES([sendmail-bin.prerm])
+AC_CONFIG_FILES([sendmail-bin.suid])
+AC_CONFIG_FILES([sensible-mda.dirs])
+AC_CONFIG_FILES([sensible-mda.preinst])
AC_CONFIG_FILES([bug-control])
AC_CONFIG_FILES([bug-script])
AC_CONFIG_FILES([cf/Makefile])
diff --git a/debian/build/debian/libmilter-dev.dirs.in b/debian/libmilter-dev.dirs.in
index fabd44a..fabd44a 100644
--- a/debian/build/debian/libmilter-dev.dirs.in
+++ b/debian/libmilter-dev.dirs.in
diff --git a/debian/build/debian/libmilter-dev.links.in b/debian/libmilter-dev.links.in
index 43a454e..43a454e 100644
--- a/debian/build/debian/libmilter-dev.links.in
+++ b/debian/libmilter-dev.links.in
diff --git a/debian/build/debian/libmilter-dev.preinst.in b/debian/libmilter-dev.preinst.in
index f132076..f132076 100644
--- a/debian/build/debian/libmilter-dev.preinst.in
+++ b/debian/libmilter-dev.preinst.in
diff --git a/debian/build/debian/libmilter.dirs.in b/debian/libmilter.dirs.in
index 2176d5c..2176d5c 100644
--- a/debian/build/debian/libmilter.dirs.in
+++ b/debian/libmilter.dirs.in
diff --git a/debian/build/debian/libmilter.preinst.in b/debian/libmilter.preinst.in
index 03731bf..03731bf 100644
--- a/debian/build/debian/libmilter.preinst.in
+++ b/debian/libmilter.preinst.in
diff --git a/debian/build/debian/rmail.dirs.in b/debian/rmail.dirs.in
index a2aeebb..a2aeebb 100644
--- a/debian/build/debian/rmail.dirs.in
+++ b/debian/rmail.dirs.in
diff --git a/debian/build/debian/rmail.preinst.in b/debian/rmail.preinst.in
index f1aa978..f1aa978 100644
--- a/debian/build/debian/rmail.preinst.in
+++ b/debian/rmail.preinst.in
diff --git a/debian/build/debian/sendmail-base.dirs.in b/debian/sendmail-base.dirs.in
index 951b1a2..951b1a2 100644
--- a/debian/build/debian/sendmail-base.dirs.in
+++ b/debian/sendmail-base.dirs.in
diff --git a/debian/build/debian/sendmail-base.postinst.in b/debian/sendmail-base.postinst.in
index 769e441..769e441 100644
--- a/debian/build/debian/sendmail-base.postinst.in
+++ b/debian/sendmail-base.postinst.in
diff --git a/debian/build/debian/sendmail-base.postrm.in b/debian/sendmail-base.postrm.in
index 5a68568..5a68568 100644
--- a/debian/build/debian/sendmail-base.postrm.in
+++ b/debian/sendmail-base.postrm.in
diff --git a/debian/build/debian/sendmail-base.preinst.in b/debian/sendmail-base.preinst.in
index 1091ddc..1091ddc 100644
--- a/debian/build/debian/sendmail-base.preinst.in
+++ b/debian/sendmail-base.preinst.in
diff --git a/debian/build/debian/sendmail-base.prerm.in b/debian/sendmail-base.prerm.in
index 28941ad..28941ad 100644
--- a/debian/build/debian/sendmail-base.prerm.in
+++ b/debian/sendmail-base.prerm.in
diff --git a/debian/build/debian/sendmail-bin.dirs.in b/debian/sendmail-bin.dirs.in
index b3b51ed..b3b51ed 100644
--- a/debian/build/debian/sendmail-bin.dirs.in
+++ b/debian/sendmail-bin.dirs.in
diff --git a/debian/build/debian/sendmail-bin.postinst.in b/debian/sendmail-bin.postinst.in
index 484c83e..484c83e 100644
--- a/debian/build/debian/sendmail-bin.postinst.in
+++ b/debian/sendmail-bin.postinst.in
diff --git a/debian/build/debian/sendmail-bin.postrm.in b/debian/sendmail-bin.postrm.in
index 4fafe4e..4fafe4e 100644
--- a/debian/build/debian/sendmail-bin.postrm.in
+++ b/debian/sendmail-bin.postrm.in
diff --git a/debian/build/debian/sendmail-bin.preinst.in b/debian/sendmail-bin.preinst.in
index b45a775..b45a775 100644
--- a/debian/build/debian/sendmail-bin.preinst.in
+++ b/debian/sendmail-bin.preinst.in
diff --git a/debian/build/debian/sendmail-bin.prerm.in b/debian/sendmail-bin.prerm.in
index a478620..a478620 100644
--- a/debian/build/debian/sendmail-bin.prerm.in
+++ b/debian/sendmail-bin.prerm.in
diff --git a/debian/build/debian/sendmail-bin.suid.in b/debian/sendmail-bin.suid.in
index 32469ca..32469ca 100644
--- a/debian/build/debian/sendmail-bin.suid.in
+++ b/debian/sendmail-bin.suid.in
diff --git a/debian/build/debian/sendmail-cf.dirs.in b/debian/sendmail-cf.dirs.in
index 837ffae..837ffae 100644
--- a/debian/build/debian/sendmail-cf.dirs.in
+++ b/debian/sendmail-cf.dirs.in
diff --git a/debian/build/debian/sendmail-cf.postrm.in b/debian/sendmail-cf.postrm.in
index 606ec49..606ec49 100644
--- a/debian/build/debian/sendmail-cf.postrm.in
+++ b/debian/sendmail-cf.postrm.in
diff --git a/debian/build/debian/sendmail-cf.preinst.in b/debian/sendmail-cf.preinst.in
index d81e779..d81e779 100644
--- a/debian/build/debian/sendmail-cf.preinst.in
+++ b/debian/sendmail-cf.preinst.in
diff --git a/debian/build/debian/sendmail-doc.dirs.in b/debian/sendmail-doc.dirs.in
index b078e7f..b078e7f 100644
--- a/debian/build/debian/sendmail-doc.dirs.in
+++ b/debian/sendmail-doc.dirs.in
diff --git a/debian/build/debian/sendmail-doc.preinst.in b/debian/sendmail-doc.preinst.in
index 6f2724a..6f2724a 100644
--- a/debian/build/debian/sendmail-doc.preinst.in
+++ b/debian/sendmail-doc.preinst.in
diff --git a/debian/build/debian/sendmail.cron.daily.in b/debian/sendmail.cron.daily.in
index 131f9a2..131f9a2 100644
--- a/debian/build/debian/sendmail.cron.daily.in
+++ b/debian/sendmail.cron.daily.in
diff --git a/debian/build/debian/sendmail.dirs.in b/debian/sendmail.dirs.in
index 2e2d8f5..2e2d8f5 100644
--- a/debian/build/debian/sendmail.dirs.in
+++ b/debian/sendmail.dirs.in
diff --git a/debian/build/debian/sendmail.init.d.in b/debian/sendmail.init.d.in
index 49caef3..49caef3 100644
--- a/debian/build/debian/sendmail.init.d.in
+++ b/debian/sendmail.init.d.in
diff --git a/debian/build/debian/sensible-mda.dirs.in b/debian/sensible-mda.dirs.in
index a2aeebb..a2aeebb 100644
--- a/debian/build/debian/sensible-mda.dirs.in
+++ b/debian/sensible-mda.dirs.in
diff --git a/debian/build/debian/sensible-mda.preinst.in b/debian/sensible-mda.preinst.in
index 118bf17..118bf17 100644
--- a/debian/build/debian/sensible-mda.preinst.in
+++ b/debian/sensible-mda.preinst.in