summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-09-06 20:42:10 -0700
committerSean Whitton <spwhitton@spwhitton.name>2016-09-06 20:42:10 -0700
commitcf8a9b11db3ff4ecc57b79a3ed80cb540115ec75 (patch)
treeed9cd414496df9088d08ec39dfd0488150974b4b /debian
parent30e37ca24e707ec5c7bfede6b4b867ac7178536f (diff)
parentaa9e6cb969552ae8e6dabe83668de9546bdac3ed (diff)
Merge branch 'master' into jessie-bpo
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/source/lintian-overrides2
2 files changed, 10 insertions, 0 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