aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2017-03-09 12:35:41 +0100
committerToni Uhlig <matzeton@googlemail.com>2017-03-09 13:16:45 +0100
commitb8a2d1c361ae440f958675491655ca6831e266f1 (patch)
tree3901affba0889b842cabaf4a8f1a4be13a854352
parent2a6ddd22196bcc76c5567596e3b9c7da6be48604 (diff)
fixing lintian complains
-rw-r--r--Makefile.am7
-rw-r--r--Makefile.in7
-rwxr-xr-xdebian/rules4
-rw-r--r--debian/templates2
4 files changed, 12 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index cd39556..4aa7a2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,10 @@ install-exec-local:
clean-local:
rm -f naskpass naskshell naskpass_check
+ $(MAKE) -C ./tests clean
distclean-local: clean-local
- rm -f aclocal.m4 config.log config.status configure
- rm -f Makefile.in src/Makefile.in src/aconfig.h.in~ src/*.d src/version.h
- rm -rf build autom4te.cache
+ rm -f config.log config.status
+ rm -f src/aconfig.h.in~ src/*.d src/version.h
+ rm -rf autom4te.cache
diff --git a/Makefile.in b/Makefile.in
index da08620..fa22a3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -764,11 +764,12 @@ install-exec-local:
clean-local:
rm -f naskpass naskshell naskpass_check
+ $(MAKE) -C ./tests clean
distclean-local: clean-local
- rm -f aclocal.m4 config.log config.status configure
- rm -f Makefile.in src/Makefile.in src/aconfig.h.in~ src/*.d src/version.h
- rm -rf build autom4te.cache
+ rm -f config.log config.status
+ rm -f src/aconfig.h.in~ src/*.d src/version.h
+ rm -rf autom4te.cache
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/rules b/debian/rules
index a135e91..46aeb7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ configure-stamp:
echo "#define VERSION \"$(DEBVERS)\"" >src/version.h
touch configure-stamp
+build-arch: build
+build-indep: build
build: configure-stamp build-stamp
build-stamp:
dh_testdir
@@ -46,7 +48,7 @@ install: build
install -D -m755 ./scripts/naskpass.initconf $(CURDIR)/debian/naskpass/usr/share/naskpass/
install -D -m755 ./scripts/naskpass.pre $(CURDIR)/debian/naskpass/usr/share/naskpass/
install -D -m755 ./scripts/naskpass.post $(CURDIR)/debian/naskpass/usr/share/naskpass/
- install -d -m755 $(CURDIR)/debian/naskpass/etc/initramfs-tools/etc/ssh/
+ install -d -m755 $(CURDIR)/debian/naskpass/etc/initramfs-tools/etc/ssh/
install -D -m644 ./scripts/sshd_config $(CURDIR)/debian/naskpass/etc/initramfs-tools/etc/ssh/
binary-indep: build install
diff --git a/debian/templates b/debian/templates
index aecdded..7e664ab 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,7 +1,7 @@
Template: naskpass/activate
Type: boolean
Default: false
-Description: Do you want to activate naskpass?
+Description.UTF-8: Do you want to activate naskpass?
Activate or Deactivate the naskpass initramfs replacement
for askpass. You can activate/deactivate it later with
'dpkg-reconfigure naskpass'.