[SCM] ladish/master: Wrap and sort
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed May 16 18:36:30 UTC 2012
The following commit has been merged in the master branch:
commit 66398c90c8995bbb73d899990de0970868e49707
Author: Alessio Treglia <alessio at debian.org>
Date: Wed May 16 19:45:05 2012 +0200
Wrap and sort
Git-Dch: Ignore
diff --git a/debian/control b/debian/control
index b6f3c7e..5cbe553 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: ladish
Section: sound
Priority: optional
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Uploaders:
+ Alessio Treglia <alessio at debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~),
intltool,
libasound2-dev,
libboost-dev,
- libjack-jackd2-dev (>= 1.9.6~dfsg.1-5),
libdbus-1-dev,
libdbus-glib-1-dev,
libexpat1-dev,
@@ -15,6 +16,7 @@ Build-Depends: debhelper (>= 7.0.50~),
libglade2-dev,
libgnomecanvasmm-2.6-dev,
libgtk2.0-dev,
+ libjack-jackd2-dev (>= 1.9.6~dfsg.1-5),
python-all (>= 2.6.6-3),
uuid-dev
X-Python-Version: >= 2.6
@@ -25,13 +27,16 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ladish.git
Package: ladish
Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
jackd,
python-dbus,
+ ${misc:Depends},
${python:Depends},
- ${misc:Depends}
-Suggests: gladish
-Recommends: a2jmidid
+ ${shlibs:Depends}
+Suggests:
+ gladish
+Recommends:
+ a2jmidid
Description: session management system for JACK applications
LADI Session Handler or simply ladish is a session management
system for JACK applications on GNU/Linux. Its aim is to allow
@@ -45,10 +50,12 @@ Description: session management system for JACK applications
Package: gladish
Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
ladish (= ${binary:Version}),
- ${misc:Depends}
-Recommends: laditools
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ laditools
Description: graphical interface for LADI Session Handler
LADI Session Handler or simply ladish is a session management
system for JACK applications on GNU/Linux. Its aim is to allow
@@ -61,9 +68,11 @@ Description: graphical interface for LADI Session Handler
Package: liblash-compat-1debian0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Breaks: lashd,
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks:
+ lashd,
python-lash
Description: LASH compatibility library
liblash-compat is a library and associated header files, that aims
@@ -75,13 +84,16 @@ Description: LASH compatibility library
Package: liblash-compat-dev
Section: libdevel
Architecture: all
-Depends: liblash-compat-1debian0 (>= ${source:Version}),
+Depends:
+ libdbus-1-dev,
liblash-compat-1debian0 (<< ${source:Upstream-Version}+1~),
+ liblash-compat-1debian0 (>= ${source:Version}),
uuid-dev,
- libdbus-1-dev,
${misc:Depends}
-Breaks: liblash-dev
-Replaces: liblash-dev
+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
@@ -98,7 +110,8 @@ Package: ladish-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ladish (= ${binary:Version}),
+Depends:
+ ladish (= ${binary:Version}),
${misc:Depends}
Description: Debugging symbols for ladish
LADI Session Handler or simply ladish is a session management
diff --git a/debian/copyright b/debian/copyright
index f86595e..b647b03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,7 +32,7 @@ Files: example-apps/level1-qt.cpp
Copyright: 2010 Guido Scholz
License: GPL-2
-Files: dbus/*
+Files: dbus/*
Copyright:
2008, 2009, 2010 Nedko Arnaudov <nedko at arnaudov.name>
2008 Juuso Alasuutari <juuso.alasuutari at gmail.com>
@@ -266,37 +266,37 @@ License: AFL-2.1
the express written permission of its copyright owner.
.
.
- --
- END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential
- differences between the Academic Free License (AFL) version 1.0 and other
+ --
+ END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential
+ differences between the Academic Free License (AFL) version 1.0 and other
open source licenses:
.
- The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache
- licenses in many respects but it is intended to solve a few problems with
+ The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache
+ licenses in many respects but it is intended to solve a few problems with
those licenses.
.
- * The AFL is written so as to make it clear what software is being
- licensed (by the inclusion of a statement following the copyright notice
- in the software). This way, the license functions better than a template
+ * The AFL is written so as to make it clear what software is being
+ licensed (by the inclusion of a statement following the copyright notice
+ in the software). This way, the license functions better than a template
license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software.
.
- * The AFL contains a complete copyright grant to the software. The BSD
+ * The AFL contains a complete copyright grant to the software. The BSD
and Apache licenses are vague and incomplete in that respect.
.
- * The AFL contains a complete patent grant to the software. The BSD, MIT,
- UoI/NCSA and Apache licenses rely on an implied patent license and contain
+ * The AFL contains a complete patent grant to the software. The BSD, MIT,
+ UoI/NCSA and Apache licenses rely on an implied patent license and contain
no explicit patent grant.
.
- * The AFL makes it clear that no trademark rights are granted to the
- licensor's trademarks. The Apache license contains such a provision, but the
+ * The AFL makes it clear that no trademark rights are granted to the
+ licensor's trademarks. The Apache license contains such a provision, but the
BSD, MIT and UoI/NCSA licenses do not.
.
- * The AFL includes the warranty by the licensor that it either owns the
- copyright or that it is distributing the software under a license. None of
- the other licenses contain that warranty. All other warranties are disclaimed,
+ * The AFL includes the warranty by the licensor that it either owns the
+ copyright or that it is distributing the software under a license. None of
+ the other licenses contain that warranty. All other warranties are disclaimed,
as is the case for the other licenses.
.
- * The AFL is itself copyrighted (with the right granted to copy and distribute
- without modification). This ensures that the owner of the copyright to the
- license will control changes. The Apache license contains a copyright notice,
+ * The AFL is itself copyrighted (with the right granted to copy and distribute
+ without modification). This ensures that the owner of the copyright to the
+ license will control changes. The Apache license contains a copyright notice,
but the BSD, MIT and UoI/NCSA licenses do not.
diff --git a/debian/gladish.install b/debian/gladish.install
index 8b72fba..9fabf40 100644
--- a/debian/gladish.install
+++ b/debian/gladish.install
@@ -1,4 +1,4 @@
-usr/share/ladish
-usr/share/icons
-usr/share/applications
usr/bin/gladish
+usr/share/applications
+usr/share/icons
+usr/share/ladish
diff --git a/debian/ladish.install b/debian/ladish.install
index 8deddca..30e847c 100644
--- a/debian/ladish.install
+++ b/debian/ladish.install
@@ -1,7 +1,7 @@
-usr/bin/ladish_control
usr/bin/jmcore
usr/bin/ladiconfd
+usr/bin/ladish_control
+usr/bin/ladishd usr/lib/ladish
+usr/lib/libalsapid.so usr/lib/ladish/
usr/share/dbus-1
usr/share/locale
-usr/lib/libalsapid.so usr/lib/ladish/
-usr/bin/ladishd usr/lib/ladish
--
ladish packaging
More information about the pkg-multimedia-commits
mailing list