Merge branch 'nmu-apply'

Conflicts:
	debian/changelog
	debian/control

1 files changed, 24 insertions, 11 deletions

diff --git a/debian/control b/debian/control
index b32115f..37dc7b6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cscope
 Section: devel
 Priority: optional
 Maintainer: Tobias Klauser <tklauser@distanz.ch>
-Build-Depends: debhelper (>= 7), dpatch, autotools-dev, bison, flex, libncurses5-dev
+Build-Depends: debhelper (>= 7.1), autotools-dev, bison, flex, libncurses5-dev
 Standards-Version: 3.8.4
 Homepage: http://cscope.sourceforge.net
 Vcs-Git: git://git.distanz.ch/debian/pkg-cscope.git
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.distanz.ch/?p=debian/pkg-cscope.git
 
 Package: cscope
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, emacsen-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: cbrowser
 Description: Interactively examine a C program source
  Cscope is an interactive text screen based source browsing tool.
@@ -18,13 +18,26 @@ Description: Interactively examine a C program source
  and yacc files), it can also be used for C++ code.
  .
  Using cscope, you can easily search for where symbols are used and
- defined.  Cscope is designed to answer questions like:
+ defined. Cscope is designed to answer questions like:
  .
- Where is this variable used?
- What is the value of this preprocessor symbol?
- Where is this function in the source files?
- What functions call this function?
- What functions are called by this function?
- Where does the message "out of space" come from?
- Where is this source file in the directory structure?
- What files include this header file?
+  - Where is this variable used?
+  - What is the value of this preprocessor symbol?
+  - Where is this function in the source files?
+  - What functions call this function?
+  - What functions are called by this function?
+  - Where does the message "out of space" come from?
+  - Where is this source file in the directory structure?
+  - What files include this header file?
+
+Package: cscope-el
+Architecture: all
+Depends: cscope (>= ${source:Version}), emacs23 | emacsen, ${misc:Depends}
+Description: Interactively examine a C program source, cscope emacs binding
+ Cscope is a program that generates index tables from C and C++ source
+ files. It is also a client program that knows how to use the
+ generated index tables to answer questions such as where is a symbol
+ defined, where is a symbol referenced, etc.
+ .
+ cscope-el contains the Emacs interfaces to cscope; Darryl Okahata’s
+ xcscope.el,
+ See http://www.emacswiki.org/emacs/CScopeAndEmacs