From e789ca2b064191182ad0016d676ff433a60d51a3 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 3 Jun 2010 14:33:37 +0200 Subject: Prepare 15.7a-4 --- debian/changelog | 5 ++++- debian/control | 2 +- debian/cscope-el.emacsen-install | 26 ++++++++++++++++++++++++++ debian/cscope-el.emacsen-remove | 11 +++++++++++ debian/cscope.emacsen-install | 26 -------------------------- debian/cscope.emacsen-remove | 11 ----------- debian/patches/series | 1 + 7 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 debian/cscope-el.emacsen-install create mode 100644 debian/cscope-el.emacsen-remove delete mode 100644 debian/cscope.emacsen-install delete mode 100644 debian/cscope.emacsen-remove 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 Mon, 01 Feb 2010 13:40:31 +0100 + -- Tobias Klauser 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-el.emacsen-install b/debian/cscope-el.emacsen-install new file mode 100644 index 0000000..07de87b --- /dev/null +++ b/debian/cscope-el.emacsen-install @@ -0,0 +1,26 @@ +#!/bin/sh +# +# emacsen install script for the Debian GNU/Linux cscope package +# based on the emacsen install script of the cmake package + +FLAVOUR=$1 +PACKAGE=cscope + +ELDIR=/usr/share/emacs/site-lisp/ +ELCDIR=/usr/share/$FLAVOUR/site-lisp/$PACKAGE +ELFILE="xcscope.el" +FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile" + +if [ $FLAVOUR != emacs ]; then + echo "install/$PACKAGE: Byte-compiling for $FLAVOUR" + + install -m 755 -d $ELCDIR + cd $ELDIR + cp $ELFILE $ELCDIR + cd $ELCDIR + cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF + $FLAVOUR $FLAGS $ELFILE + rm -f $ELFILE path.el +fi diff --git a/debian/cscope-el.emacsen-remove b/debian/cscope-el.emacsen-remove new file mode 100644 index 0000000..859d389 --- /dev/null +++ b/debian/cscope-el.emacsen-remove @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +FLAVOUR=$1 +PACKAGE=cscope +ELCFILE=xcscope.elc + +if [ $FLAVOUR != emacs ]; then + echo "remove/$PACKAGE: Purging byte-compiled files for $FLAVOUR" + rm -f /usr/share/$FLAVOUR/site-lisp/$ELCFILE +fi diff --git a/debian/cscope.emacsen-install b/debian/cscope.emacsen-install deleted file mode 100644 index 07de87b..0000000 --- a/debian/cscope.emacsen-install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# emacsen install script for the Debian GNU/Linux cscope package -# based on the emacsen install script of the cmake package - -FLAVOUR=$1 -PACKAGE=cscope - -ELDIR=/usr/share/emacs/site-lisp/ -ELCDIR=/usr/share/$FLAVOUR/site-lisp/$PACKAGE -ELFILE="xcscope.el" -FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile" - -if [ $FLAVOUR != emacs ]; then - echo "install/$PACKAGE: Byte-compiling for $FLAVOUR" - - install -m 755 -d $ELCDIR - cd $ELDIR - cp $ELFILE $ELCDIR - cd $ELCDIR - cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF - $FLAVOUR $FLAGS $ELFILE - rm -f $ELFILE path.el -fi diff --git a/debian/cscope.emacsen-remove b/debian/cscope.emacsen-remove deleted file mode 100644 index 859d389..0000000 --- a/debian/cscope.emacsen-remove +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -FLAVOUR=$1 -PACKAGE=cscope -ELCFILE=xcscope.elc - -if [ $FLAVOUR != emacs ]; then - echo "remove/$PACKAGE: Purging byte-compiled files for $FLAVOUR" - rm -f /usr/share/$FLAVOUR/site-lisp/$ELCFILE -fi 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 -- cgit v1.2.3-54-g00ecf