summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-06-03 13:44:08 +0200
committerTobias Klauser <tklauser@distanz.ch>2010-06-03 13:44:08 +0200
commitdd1ba6f530787377b3b13c0c01f426c271bd3225 (patch)
treeb85e6bb90728f6902d72cb2125ad3412725cbf3b /debian/changelog
parentab3fd9bfb0f8a25492a18ec3cbbc9fc6a6bbe323 (diff)
parent2532a731d79ab37ac27c17fb84b6017a7f1ae4cb (diff)
Merge branch 'nmu-apply'
Conflicts: debian/changelog debian/control
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog38
1 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f94d349..92746ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,44 @@ cscope (15.7a-4) unstable; urgency=low
-- Tobias Klauser <tklauser@distanz.ch> Mon, 01 Feb 2010 13:40:31 +0100
+cscope (15.7a-3.1) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)" due to patch.
+ - Move from dpatch to quilt patch system.
+ * debian/copyright
+ - Point to GPL-2. Use FSF URL (Lintian).
+ * debian/control
+ - (Build-Depends): Update to debhelper 7.1.
+ - (cscope::Description): Fix french hyphens.
+ - (cscope-el::Description): Extend description.
+ * debian/{cscope,cscope-el}.preinst
+ - Add "set -e".
+ * debian/cscope-indexer.1
+ - Fix hyphens.
+ * debian/patches
+ - Convert all dpatch(es) into quilt format.
+ - (Number 04): Refresh patch. Fix also hyphens in manpage.
+ * debian/README.source
+ - Delete; obsoleted by new packaging format.
+ * debian/ocs.1
+ - Fix hyphens and spelling.
+ * debian/rules
+ - Remove dpatch. Move to dh(1) build system.
+ - (clean): Add rm for config.log.
+ * debian/source/format
+ - New file.
+
+ [ Hideki Yamane (Debian-JP) <henrich@debian.or.jp> ]
+ * debian/control
+ - (Package::cscope-el): New. separete emacs lisp to cscope-el package
+ (Closes: #565727).
+ * debian/cscope-el.{emacsen-install,emacsen-remove,install,preinst}
+ - New files.
+
+ -- Jari Aalto <jari.aalto@cante.net> Sat, 08 May 2010 20:29:08 +0300
+
cscope (15.7a-3) unstable; urgency=low
* Depend on emacsen-common to be able to install xcscope.el correctly