summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2011-01-20 18:21:59 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2011-01-20 18:29:29 -0800
commitda81092b2937ad388d0a99761080c0161cdf1a44 (patch)
tree30cac5d44c276d9c4cf354586eb08aadcf635297
parentb6bb2ca73a726eea170d1aa330a0b99c53799df5 (diff)
downloadvyatta-op-da81092b2937ad388d0a99761080c0161cdf1a44.tar.gz
vyatta-op-da81092b2937ad388d0a99761080c0161cdf1a44.zip
don't use conffiles (not the vyatta way)
(cherry picked from commit 6a0dfdb405bb0f2103b0a290ec377b5a831372de)
-rw-r--r--debian/lintian1
-rwxr-xr-xdebian/rules1
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/lintian b/debian/lintian
index 99e6c54..39697b6 100644
--- a/debian/lintian
+++ b/debian/lintian
@@ -1,3 +1,4 @@
vyatta-op: file-in-unusual-dir
vyatta-op: dir-or-file-in-opt
+vyatta-op: file-in-etc-not-marked-as-conffile
vyatta-op: shell-script-fails-syntax-check ./opt/vyatta/bin/vyatta-show-interfaces
diff --git a/debian/rules b/debian/rules
index 6edbcd3..c60eaa7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,7 @@ binary-indep: build install
dh_compress
dh_fixperms
dh_installdeb
+ rm -f debian/*/DEBIAN/conffiles
if [ -f "../.VYATTA_DEV_BUILD" ]; then \
dh_gencontrol -- -v999.dev; \
else \