summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-06-03 14:33:37 +0200
committerTobias Klauser <tklauser@distanz.ch>2010-06-03 15:47:57 +0200
commite789ca2b064191182ad0016d676ff433a60d51a3 (patch)
treef6ae950cafbb3811b85ea51200df8acded669f0f
parentdd1ba6f530787377b3b13c0c01f426c271bd3225 (diff)
Prepare 15.7a-4HEADmaster
-rw-r--r--debian/changelog5
-rw-r--r--debian/control2
-rw-r--r--debian/cscope-el.emacsen-install (renamed from debian/cscope.emacsen-install)0
-rw-r--r--debian/cscope-el.emacsen-remove (renamed from debian/cscope.emacsen-remove)0
-rw-r--r--debian/patches/series1
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
span> 2012-11-28dma: remove use of __devexit_pBill Pemberton1-1/+1 2012-09-01dma: fix commentsMasanari Iida1-1/+1 2012-03-13dmaengine: ensure all DMA engine drivers initialize their cookiesRussell King - ARM Linux1-0/+1 2012-03-13dmaengine: fix cookie handling in iop-adma.c and ppc4xx/adma.cRussell King - ARM Linux1-5/+1 2012-03-13dmaengine: consolidate tx_status functionsRussell King - ARM Linux1-14/+2 2012-03-13dmaengine: consolidate assignment of DMA cookiesRussell King - ARM Linux1-18/+1 2012-03-13dmaengine: add private header fileRussell King - ARM Linux1-0/+1 2012-03-13dmaengine: move last completed cookie into generic dma_chan structureRussell King - ARM Linux1-5/+5 2011-04-06Merge branch 'old_next' into nextVinod Koul1-4/+4 2011-03-31dma: use BUG_ON correctly in ppc4xx/adam.c, v4Coly Li1-4/+4 2011-02-28dt/powerpc: Eliminate users of of_platform_{,un}register_driverGrant Likely1-6/+5 2010-12-04drivers/dma/ppc4xx: Use printf extension %pR for struct resourceJoe Perches1-3/+2 2010-08-06of/device: Replace struct of_device with struct platform_deviceGrant Likely1-4/+4 2010-07-02of/dma: fix build breakage in ppc4xx adma driverDan Williams1-1/+3 2010-06-02of/dma: fix build breakage in ppc4xx adma driverAnatolij Gustschin1-0/+0 2010-05-22Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely1-0/+0 2010-05-22of: Remove duplicate fields from of_platform_driverGrant Likely1-1/+1