Merge branch 'master' into jessie-bpo

3 files changed, 11 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 2c16ae1..272ec47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dh-elpa (1.3) unstable; urgency=medium
+
+  * Fix version comparison in elpa.pm.
+    Quote "0.90" so that the trailing 0 is not lost.
+  * Override debian-watch-file-in-native-package.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 06 Sep 2016 20:38:10 -0700
+
 dh-elpa (1.2~bpo8+1) UNRELEASED; urgency=medium
 
   * Rebuild for jessie-backports.
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..401b3e2
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# watch file is for use with pkg-emacsen PET
+debian-watch-file-in-native-package
diff --git a/elpa.pm b/elpa.pm
index d6e3126..a43f395 100755
--- a/elpa.pm
+++ b/elpa.pm
@@ -18,7 +18,7 @@ my $options;
 $options = Config::Tiny->read( "debian/elpa-test" )
   if ( -f "debian/elpa-test" );
 
-if ( $version >= 0.90
+if ( $version >= "0.90"
      && !defined $options->{_}->{ "disable" }
      && !defined $ENV{ 'DH_ELPA_TEST_DISABLE' }
    ) {