From 04db01311e170a7094e144f095f1d3f7798c4a49 Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Mon, 24 Sep 2012 21:02:54 -0400 Subject: [PATCH] debathena-conffile-example: Don't divert non-conffiles mailname is unversioned, and papersize is handled by ucf. --- examples/debathena-conffile-example-1.0/debian/rules | 4 +--- .../files/etc/mailname.debathena | 1 - .../files/etc/papersize.debathena | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 examples/debathena-conffile-example-1.0/files/etc/mailname.debathena delete mode 100644 examples/debathena-conffile-example-1.0/files/etc/papersize.debathena diff --git a/examples/debathena-conffile-example-1.0/debian/rules b/examples/debathena-conffile-example-1.0/debian/rules index 2099f70..20983b6 100755 --- a/examples/debathena-conffile-example-1.0/debian/rules +++ b/examples/debathena-conffile-example-1.0/debian/rules @@ -3,9 +3,7 @@ DEB_DIVERT_EXTENSION = .debathena # Replace some base files with simple replacements. DEB_DIVERT_FILES_debathena-conffile-example += \ - /etc/issue.net.debathena \ - /etc/mailname.debathena \ - /etc/papersize.debathena + /etc/issue.net.debathena # These files are installed via dh_install from the files/ directory # (see debian/debathena-conffile-example.install) diff --git a/examples/debathena-conffile-example-1.0/files/etc/mailname.debathena b/examples/debathena-conffile-example-1.0/files/etc/mailname.debathena deleted file mode 100644 index 731f0e4..0000000 --- a/examples/debathena-conffile-example-1.0/files/etc/mailname.debathena +++ /dev/null @@ -1 +0,0 @@ -mit.edu diff --git a/examples/debathena-conffile-example-1.0/files/etc/papersize.debathena b/examples/debathena-conffile-example-1.0/files/etc/papersize.debathena deleted file mode 100644 index 40e0a6f..0000000 --- a/examples/debathena-conffile-example-1.0/files/etc/papersize.debathena +++ /dev/null @@ -1 +0,0 @@ -letter -- 2.45.0