cscope 15.6-515.6-5

* Remove left over Emacs startup file (Closes: #454377)
* Update to Standards-Version 3.7.3 (no changes needed)

5 files changed, 42 insertions, 7 deletions

diff --git a/config.guess b/config.guess
index 0f0fe71..278f9e9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-03-06'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
diff --git a/config.sub b/config.sub
index 5defff6..1761d8b 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-01-18'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
diff --git a/debian/changelog b/debian/changelog
index 6283f18..cfa3906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cscope (15.6-5) unstable; urgency=low
+
+  * Remove left over Emacs startup file (Closes: #454377)
+  * Update to Standards-Version 3.7.3 (no changes needed)
+
+ -- Tobias Klauser <tklauser@access.unizh.ch>  Thu, 06 Dec 2007 20:06:00 +0100
+
 cscope (15.6-4) unstable; urgency=low
 
   * Fix a typo in xcscope.el (Closes: #438170)
diff --git a/debian/control b/debian/control
index 14493b3..4f3ae41 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Tobias Klauser <tklauser@access.unizh.ch>
 Build-Depends: debhelper (>= 5), dpatch, autotools-dev, bison, flex, libncurses5-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: cscope
 Architecture: any
diff --git a/debian/cscope.preinst b/debian/cscope.preinst
new file mode 100644
index 0000000..be518b4
--- /dev/null
+++ b/debian/cscope.preinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+cleanup_sitestart() {
+	if [ -e /etc/emacs/site-start.d/50cscope.el ]; then
+		rm -f /etc/emacs/site-start.d/50cscope.el
+	fi
+}
+
+case "$1" in
+	upgrade)
+	cleanup_sitestart
+	;;
+
+	install|abort-upgrade)
+	;;
+
+	*)
+	echo "$0 called with unknown argument '$1'" >&2
+	exit 1
+	;;
+esac
+
+#DEBHELPER#
+exit 0