lp:~vibhavp/ubuntu/saucy/csound/merge-from-debian

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/saucy/csound

Sebastien Bacher: Approve on 2013-05-16

Ubuntu branches: Pending requested 2013-05-07

Diff: 5640 lines (+48/-5348)

24 files modified

.pc/0000-backported-cmake-additions.diff/Opcodes/CMakeLists.txt (+0/-161)
.pc/0003-csoundac.patch/frontends/CsoundAC/CMakeLists.txt (+0/-132)
.pc/0004-swig-java-package.patch/interfaces/CMakeLists.txt (+0/-148)
.pc/1000-csoundac-cmake-bugfix.patch/frontends/CsoundAC/CMakeLists.txt (+0/-134)
.pc/2000-avoid-nonfree-scansyn-plugin.diff/Opcodes/CMakeLists.txt (+0/-160)
.pc/2001-lua-link.diff/frontends/CsoundAC/CMakeLists.txt (+0/-133)
.pc/2001-lua-link.diff/interfaces/CMakeLists.txt (+0/-149)
.pc/2004-fix-gettext.diff/Top/getstring.c (+0/-168)
.pc/2007-apidoc-dotpath.patch/Doxyfile (+0/-1522)
.pc/2008-apidoc-listings-pkg.patch/refman_header.tex (+0/-158)
.pc/2013-no-rawwave-defined.diff/Opcodes/stk/stkOpcodes.cpp (+0/-723)
.pc/2014-cmake-libsndfile-hack.patch/CMakeLists.txt (+0/-856)
.pc/2020-libpthread-underlinkage.patch/CMakeLists.txt (+0/-864)
.pc/applied-patches (+0/-12)
CMakeLists.txt (+1/-9)
Doxyfile (+1/-1)
Opcodes/CMakeLists.txt (+6/-1)
Opcodes/stk/stkOpcodes.cpp (+13/-7)
Top/getstring.c (+4/-1)
debian/changelog (+13/-0)
debian/rules (+4/-0)
frontends/CsoundAC/CMakeLists.txt (+4/-5)
interfaces/CMakeLists.txt (+2/-3)
refman_header.tex (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

30. By Vibhav Pant on 2013-05-07

* Merge from Debian unstable. Remaining Changes:
  - Added missing pthread lib to link, fixing FTBFS.

29. By Vibhav Pant on 2013-05-07

* Added missing pthread lib to link, fixing FTBFS.
* Install missing interlocks.h file

28. By Daniel T Chen on 2013-04-06

Added missing pthread lib to link, fixing FTBFS.

27. By Felipe Sateler on 2012-09-28

Backport fix from upstream to build the java interface correctly

26. By Felipe Sateler on 2012-06-16

[ Forrest Cahoon ]
* Imported Upstream version 5.17.11~dfsg
 - refresh patches for new upstream sources
* Add patch for CsoundAC CMake bugfix
* Build with new parser, old one is now unsupported upstream
* Debian-specific hack for CMake to set an appropriate libsndfile version.
   Closes: #676145

[ Felipe Sateler ]
* Add build-dependency on libeigen3-dev, necessary for CsoundAC
* Add Forrest to Uploaders

25. By Felipe Sateler on 2012-05-09

Fix segfault in csladspa. Closes: #672204

24. By Felipe Sateler on 2012-04-25

* Build-Depends on libpng-dev. Closes: #662292
* Document portsmf copyright
* Update copyright hints
* Tighten dependency on CDBS 0.4.111. Closes: #669429.

23. By Felipe Sateler on 2012-04-19

* New upstream release
 - Do not build the wiimote opcodes (we need wiiuse).
* Add new API function to symbols file
* Disable lua opcodes, they were broken. Requires OpenMP to be enabled.
* Backport fixes from upstream:
  - Link dssi4cs with dl. Backport
  - Fix building of CsoundAC

22. By Felipe Sateler on 2011-11-23

* Fix broken lua module symlink (symlink did not get updated when the lua
  module changed names).
* Fix FTBFS with -Werror=format-security. Closes: #649462

21. By Felipe Sateler on 2011-11-02

[ Felipe Sateler ]
* New upstream release
 - Update copyright file
 - Remove patch applied upstream
 - Refresh patches
 - Beats has been renamed to csbeats
* Delete custom.py on clean
* Install new plugins
* Enable the new Lua opcodes
* Enable new parser

[ Jonas Smedegaard ]
* Update copyright file:
  + Rewrite to DEP5 rev. 174 format.
  + Fix update more entries.