[SCM] csound/master: Merge branch 'csound_5.17.11-dsg-3'

[sramacher at users.alioth.debian.org]

Imported Debian patch 1:5.17.11~dfsg-3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9b87ffb6c1734225cdcaa4b32e763984cc93949e
X-Git-Newrev: caa1228b69a38a179106a87e0a1f7ffa3229a754

The following commit has been merged in the master branch:
commit b133703879fe3bf84e4d83f1bfad17d6033a1a2c
Merge: 2b253b6edb6aa2e82ef3fbdcf13efb7a9b74e21f 0d4bdac6061229dda466724c0415334bee374b9b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 5 01:16:02 2013 +0200

    Merge branch 'csound_5.17.11-dsg-3'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 3542cfa,dc73aa0..fb9fc14
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,26 @@@
 +csound (1:5.17.11~dfsg-4) unstable; urgency=low
 +
 +  * Team upload.
 +
 +  [ Jonas Smedegaard ]
 +  * Update README.source to emphasize control.in file as *not* a
 +    show-stopper for contributions, referring to wiki page for details.
 +
 +  [ Sebastian Ramacher ]
 +  * debian/patches/2015-bison-2.6.patch: Apply patch from upstream to fix
 +    compilation with bison 2.6. (Closes: #710619)
 +  * debian/{control,rules}: Bump bison to (>= 2.6) to be on the safe side.
 +  * debian/control{,.in}: Change section of libcsoundac5.2 and libcsnd5.2 to
 +    libs.
 +
 + -- Sebastian Ramacher <sramacher at debian.org>  Wed, 05 Jun 2013 00:36:40 +0200
 +
+ csound (1:5.17.11~dfsg-3) unstable; urgency=low
+ 
+   * Install missing interlocks.h file
+ 
+  -- Felipe Sateler <fsateler at debian.org>  Fri, 12 Apr 2013 17:59:48 -0300
+ 
  csound (1:5.17.11~dfsg-2) unstable; urgency=low
  
    * Backport fix from upstream to build the java interface correctly
diff --combined debian/rules
index ce521e9,5e164f6..6244425
--- a/debian/rules
+++ b/debian/rules
@@@ -223,6 -223,10 +223,10 @@@ install/csladspa:
  install/libcsound64-doc::
  	rm -f doc/html/*.md5 doc/html/*.map doc/html/*.dot
  
+ # TODO: Remove this install for csound6
+ install/libcsound64-dev::
+ 	install H/interlocks.h -T \
+ 		$(CURDIR)/debian/tmp/usr/include/csound/interlocks.h
  
  # Don't ship any executable examples, they don't need to be
  # Currently only arch packages carry examples
@@@ -300,7 -304,7 +304,7 @@@ CDBS_BUILD_DEPENDS += , 
  	dssi-dev, \
  	libstk0-dev, \
  	libgmm++-dev, \
 -	bison, \
 +	bison (>= 2.6), \
  	flex, \
  	libeigen3-dev
  

-- 
csound packaging