[Pkg-golang-commits] [golang] 04/07: migrate to emacsen > 2

[Michael Stapelberg]

This is an automated email from the git hooks/post-receive script.

stapelberg pushed a commit to branch debian-sid
in repository golang.

commit 3b182a0624ad36b02564a3a5156ad08e29add62b
Author: Michael Stapelberg <stapelberg at debian.org>
Date:   Thu Jul 3 22:58:07 2014 +0200

    migrate to emacsen > 2
---
 debian/changelog                                               | 1 +
 debian/control                                                 | 3 ++-
 test/fixedbugs/bug206.out => debian/golang-mode.emacsen-compat | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae9c3a6..34b3dc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ golang (2:1.3-2) unstable; urgency=medium
   * Add debian/patches/0001-backport-delete-whole-line.patch to fix a
     deprecation warning about flet in the emacs part of golang-mode
     (Closes: #753607)
+  * Migrate to emacsen >2 (Closes: #753607)
 
  -- Michael Stapelberg <stapelberg at debian.org>  Thu, 03 Jul 2014 19:08:34 +0200
 
diff --git a/debian/control b/debian/control
index b93cf92..2c7f06c 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,8 @@ Description: Go programming language compiler - metapackage
 
 Package: golang-mode
 Architecture: all
-Depends: ${misc:Depends}, emacs23 | emacsen, emacsen-common (>= 1.4.14)
+Depends: ${misc:Depends}, emacs23 | emacsen, emacsen-common (>= 2.0.8)
+Conflicts: emacsen-common (<< 2.0.0)
 Suggests: golang-go
 Description: Go programming language - mode for GNU Emacs
  This package provides a GNU Emacs major mode for editing code in
diff --git a/test/fixedbugs/bug206.out b/debian/golang-mode.emacsen-compat
similarity index 50%
copy from test/fixedbugs/bug206.out
copy to debian/golang-mode.emacsen-compat
index aa47d0d..573541a 100644
--- a/test/fixedbugs/bug206.out
+++ b/debian/golang-mode.emacsen-compat
@@ -1,2 +1 @@
 0
-0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git