[SCM] ladish/master: Merge branch 'master.experimental'

[alessio at users.alioth.debian.org]

Set to unreleased.
Update symbols file.
Fix small misspellings.
Update debian/copyright.
Start new upload
Re-add --enable-liblash.
Properly bump the SONAME due to the ABI breakage introduced by the latest ladish release.
Restore the correct name of README.source.
Revert "Drop lash compatibility library, it's not needed anymore."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 27583cd57cc76c5baec2ded939985db161e98e94
X-Git-Newrev: f70c9a714d3b97dcf55825fbce9cc05c70d5e8aa

The following commit has been merged in the master branch:
commit f70c9a714d3b97dcf55825fbce9cc05c70d5e8aa
Merge: 27583cd57cc76c5baec2ded939985db161e98e94 78e71c244da5568e2d25d3cb7ab4425f947248fa
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 31 11:51:29 2012 +0100

    Merge branch 'master.experimental'

diff --combined debian/control
index 79eca38,7ceb4c2..b7a278d
--- a/debian/control
+++ b/debian/control
@@@ -15,8 -15,9 +15,8 @@@ Build-Depends: debhelper (>= 7.0.50~)
   libglade2-dev,
   libgnomecanvasmm-2.6-dev,
   libgtk2.0-dev,
 - python-all (>= 2.6.6-3),
 + python,
   uuid-dev
 -X-Python-Version: >= 2.6
  Standards-Version: 3.9.2
  Homepage: http://ladish.org/
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/ladish.git
@@@ -27,6 -28,7 +27,6 @@@ Architecture: an
  Depends: ${shlibs:Depends},
   jackd,
   python-dbus,
 - ${python:Depends},
   ${misc:Depends}
  Suggests: gladish
  Recommends: a2jmidid
@@@ -56,6 -58,42 +56,42 @@@ Description: graphical interface for LA
   .
   This package provides a graphical interface to ladish.
  
+ Package: liblash-compat-1debian0
+ Section: libs
+ Architecture: any
+ Depends: ${shlibs:Depends},
+  ${misc:Depends}
+ Breaks: lashd,
+  python-lash
+ Description: LASH compatibility library
+  liblash-compat is a library and associated header files, that aims
+  to provide lash environment for apps that can use it. Currently it
+  does not interact with ladish daemon yet.
+  .
+  This package provides the shared library.
+ 
+ Package: liblash-compat-dev
+ Section: libdevel
+ Architecture: all
+ Depends: liblash-compat-1debian0 (>= ${source:Version}),
+  liblash-compat-1debian0 (<< ${source:Upstream-Version}+1~),
+  uuid-dev,
+  libdbus-1-dev,
+  ${misc:Depends}
+ Breaks: liblash-dev
+ Replaces: liblash-dev
+ Description: LASH compatibility library (development files)
+  liblash-compat is a library and associated header files, that aims
+  to provide lash environment for apps that can use it. Currently it
+  does not interact with ladish daemon yet. In its current state, it
+  enables building lash-aware apps but they will fail to contact the
+  lash server.
+  .
+  In its current state, it enables building lash-aware apps but they
+  will fail to contact the lash server.
+  .
+  This package provides the development files.
+ 
  Package: ladish-dbg
  Section: debug
  Priority: extra
diff --combined debian/rules
index 6e628bc,9c8ece7..7e028db
--- a/debian/rules
+++ b/debian/rules
@@@ -3,10 -3,11 +3,11 @@@
  WAF = ./waf
  
  %:
 -	dh $@ --with python2
 +	dh $@
  
  override_dh_auto_configure:
  	$(WAF) configure --prefix=/usr \
+ 		--enable-liblash \
  		--debug
  
  override_dh_auto_build:

-- 
ladish packaging