[SCM] laditools/master: Split laditools:

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9eb7f069bdba7e01f0b3245e33857f33b14df6ca
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Mar 24 12:31:29 2012 +0100

    Split laditools:
    
    - python-laditools to provide Python modules.
    - laditools to provide the applications.

diff --git a/debian/control b/debian/control
index ee9d9d0..6e5aa47 100644
--- a/debian/control
+++ b/debian/control
@@ -20,17 +20,14 @@ Package: laditools
 Architecture: all
 Depends:
  gir1.2-vte-2.90,
- jackd2,
- python-dbus,
  python-gi,
- python-yaml,
+ python-laditools,
  ${misc:Depends},
  ${python:Depends}
-Suggests:
- a2jmidid,
- g15composer
-Description: set of tools to control and monitor LADI (JACK+ladish) system
- LADITools is a set of tools aiming to achieve the goals of the LADI
+Recommends: gladish
+Suggests: g15composer
+Description: Linux Audio Desktop Integration Tools
+ LADI Tools is a set of tools aiming to achieve the goals of the LADI
  project to improve desktop integration and user workflow of Linux
  audio system based on JACK and ladish. Those tools take advantage of
  the D-Bus interfaces recently added to JACK and ladish to ease the
@@ -47,5 +44,27 @@ Description: set of tools to control and monitor LADI (JACK+ladish) system
                           stop and monitor JACK, as well as start some
                           JACK related applications
  .
- This package includes basic set of tools to control and monitor LADI
+ This package includes basic set of tools to control and monitor the LADI
  system, that is JACK and ladish in a D-Bus environment.
+
+Package: python-laditools
+Section: python
+Architecture: all
+Depends:
+ jackd2,
+ python-dbus,
+ python-gi,
+ ${misc:Depends},
+ ${python:Depends}
+Breaks: laditools (<< 1.0)
+Recommends: ladish
+Suggests: a2jmidid
+Description: Python module to control and monitor the LADI system
+ LADITools is a set of tools aiming to achieve the goals of the LADI
+ project to improve desktop integration and user workflow of Linux
+ audio system based on JACK and ladish. Those tools take advantage of
+ the D-Bus interfaces recently added to JACK and ladish to ease the
+ configuration and use of those two great softwares.
+ .
+ This package the Python module to communicate with JACK, ladish and
+ A2J.
diff --git a/debian/laditools.install b/debian/laditools.install
new file mode 100644
index 0000000..1879a36
--- /dev/null
+++ b/debian/laditools.install
@@ -0,0 +1,6 @@
+usr/bin
+usr/share/applications
+usr/share/icons
+usr/share/laditools
+usr/share/locale
+usr/share/man
diff --git a/debian/laditools.links b/debian/laditools.links
index 098780c..5d328fd 100644
--- a/debian/laditools.links
+++ b/debian/laditools.links
@@ -1,8 +1,3 @@
-usr/lib/laditools/ladi-control-center usr/bin/ladi-control-center
-usr/lib/laditools/ladi-player usr/bin/ladi-player
-usr/lib/laditools/ladi-system-log usr/bin/ladi-system-log
-usr/lib/laditools/ladi-system-tray usr/bin/ladi-system-tray
-usr/lib/laditools/g15ladi usr/bin/g15ladi
 usr/share/man/man1/laditools.1.gz usr/share/man/man1/ladi-player.1.gz
 usr/share/man/man1/laditools.1.gz usr/share/man/man1/ladi-system-tray.1.gz
 usr/share/man/man1/laditools.1.gz usr/share/man/man1/ladi-system-log.1.gz
diff --git a/debian/python-laditools.install b/debian/python-laditools.install
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/python-laditools.install
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/rules b/debian/rules
index 0f05f97..ad41496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
 	dh $@ --with python2,scour
 
 override_dh_auto_install:
-	dh_auto_install -- \
-		--install-scripts=/usr/lib/laditools \
-		--install-lib=/usr/lib/laditools
-	rm -rf debian/laditools/usr/share/doc
-	rm -f debian/laditools/usr/lib/laditools/wmladi
+	dh_auto_install
+	# Remove wmladi, Debian doesn't have wmdockapps
+	rm debian/tmp/usr/bin/wmladi

-- 
laditools packaging