Prepare 15.7a-4HEADmaster

5 files changed, 6 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 92746ca..a3f3cc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 cscope (15.7a-4) unstable; urgency=low
 
+  * Acknowledge NMU. Thanks to Jari Aalto and Tony Mancill.
+  * Move emacs-install and emacs-remove from cscope to cscope-el package.
+    Also make cscope suggest cscope-el (Closes: #582964).
   * Update Standards-Version to 3.8.4.
   * Use git:// URI in Vcs-Git control field.
 
- -- Tobias Klauser <tklauser@distanz.ch>  Mon, 01 Feb 2010 13:40:31 +0100
+ -- Tobias Klauser <tklauser@distanz.ch>  Thu, 03 Jun 2010 15:47:49 +0200
 
 cscope (15.7a-3.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 37dc7b6..234f395 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.distanz.ch/?p=debian/pkg-cscope.git
 Package: cscope
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: cbrowser
+Suggests: cbrowser, cscope-el
 Description: Interactively examine a C program source
  Cscope is an interactive text screen based source browsing tool.
  Although it is primarily designed to search C code (including lex
diff --git a/debian/cscope.emacsen-install b/debian/cscope-el.emacsen-install
index 07de87b..07de87b 100644
--- a/debian/cscope.emacsen-install
+++ b/debian/cscope-el.emacsen-install
diff --git a/debian/cscope.emacsen-remove b/debian/cscope-el.emacsen-remove
index 859d389..859d389 100644
--- a/debian/cscope.emacsen-remove
+++ b/debian/cscope-el.emacsen-remove
diff --git a/debian/patches/series b/debian/patches/series
index 888c622..eabfad0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03-fix-ocs-bashisms.patch
 04-fix-manpage-warning.patch
 debian-changes-15.7a-3.1
+debian-changes-15.7a-4