diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | elpa.pm.in | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5d42584 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fccc6aa --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/debian/dh-elpa.debhelper.log +/debian/dh-elpa.postinst.debhelper +/debian/dh-elpa.prerm.debhelper +/debian/dh-elpa.substvars +/debian/files +/dh_elpa.1 +/dh_elpa_test.1 diff --git a/debian/changelog b/debian/changelog index 5efd171..80e0822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dh-elpa (1.11) unstable; urgency=medium + + * disable dh-elpa-Version field + + -- David Bremner <bremner@debian.org> Fri, 04 Aug 2017 08:55:36 -0400 + dh-elpa (1.10) unstable; urgency=medium [ Sean Whitton ] @@ -10,7 +10,7 @@ use Config::Tiny; insert_after("dh_install", "dh_elpa"); -add_command_options("dh_gencontrol", "--", "-Ddh-elpa-Version=@HELPER_VERSION@"); +# add_command_options("dh_gencontrol", "--", "-Ddh-elpa-Version=@HELPER_VERSION@"); # check dh_make_perl version is new enough for dh_elpa_test my $info = Module::Metadata->new_from_module("Debian::Control"); |