summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-10-04 17:14:09 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2014-10-04 20:32:00 +0400
commit68114aa1e6bf57e236d124c929fc37b0e37455e0 (patch)
treedf8f084d7d906bb6146cffd8598525c4d52b75eb /debian
parent604e7b423366f41c820989ff7b2e7b7323861406 (diff)
do not embed $VERSION to mkconf and bugscript
Diffstat (limited to 'debian')
-rw-r--r--debian/.gitignore2
-rwxr-xr-xdebian/bugscript (renamed from debian/bugscript.in)5
-rw-r--r--debian/changelog1
-rw-r--r--debian/mkconf (renamed from debian/mkconf.in)0
-rwxr-xr-xdebian/rules9
5 files changed, 3 insertions, 14 deletions
diff --git a/debian/.gitignore b/debian/.gitignore
index e9191d6e..b14b640b 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,5 +5,3 @@
/mdadm-udeb
/*.debhelper
/*.log
-/mkconf
-/bugscript
diff --git a/debian/bugscript.in b/debian/bugscript
index 9ab3823e..dcb88ebd 100755
--- a/debian/bugscript.in
+++ b/debian/bugscript
@@ -13,8 +13,6 @@
# maximise information output even in the case of errors
set +eu
-VERSION=%VERSION%
-
if ! command -v yesno >/dev/null; then
if [ -r /usr/share/reportbug/handle_bugscript ]; then
exec /usr/share/reportbug/handle_bugscript ". $0" /dev/stdout
@@ -218,5 +216,4 @@ echo "--- /dev:" >&3
ls -l /dev/md* /dev/disk/by-* >&3
echo >&3
-echo "Auto-generated on $(date -R)" >&3
-echo "by mdadm bugscript $VERSION" >&3
+echo "Auto-generated on $(date -R) by mdadm bugscript" >&3
diff --git a/debian/changelog b/debian/changelog
index 9ebcc5ac..b074e345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mdadm (3.3.2-2) UNRELEASED; urgency=medium
* remove more leftovers from old versions
+ * do not embed $VERSION to mkconf and bugscript
-- Michael Tokarev <mjt@tls.msk.ru> Sat, 04 Oct 2014 15:43:57 +0400
diff --git a/debian/mkconf.in b/debian/mkconf
index a580f5b3..a580f5b3 100644
--- a/debian/mkconf.in
+++ b/debian/mkconf
diff --git a/debian/rules b/debian/rules
index a495b915..8274b838 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,24 +34,17 @@ mdadm: configure
$(MAKE) all $(BUILDFLAGS) CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf
.PHONY: mdadm
-INTERPOLATED_FILES = debian/bugscript debian/mkconf
-
clean:
dh_testdir
- rm -f $(INTERPOLATED_FILES)
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) clean
rm -f mdadm.udeb mdmon.udeb mdadm
dh_clean
debconf-updatepo
-debian/%: VERSION=$(shell dpkg-parsechangelog | sed -ne 's,^Version: ,,p')
-debian/%: debian/%.in
- sed -re 's,%VERSION%,$(VERSION),g' < $< > $@
-
install: DESTDIR=$(CURDIR)/debian/mdadm
install: DESTDIR_UDEB=$(DESTDIR)-udeb
-install: build $(INTERPOLATED_FILES)
+install: build
dh_testdir
dh_clean -k
dh_installdirs