[Demudi-commits] r1379 - in lash/trunk: . debian debian/patches
free-guest at alioth.debian.org
free-guest at alioth.debian.org
Fri May 18 02:00:19 UTC 2007
Author: free-guest
Date: 2007-05-18 02:00:19 +0000 (Fri, 18 May 2007)
New Revision: 1379
Added:
lash/trunk/debian/
lash/trunk/debian/changelog
lash/trunk/debian/compat
lash/trunk/debian/control
lash/trunk/debian/copyright
lash/trunk/debian/dirs
lash/trunk/debian/lash-bin.install
lash/trunk/debian/lash-bin.links
lash/trunk/debian/lash-bin.manpages
lash/trunk/debian/lash-bin.menu
lash/trunk/debian/lash-dev.dirs
lash/trunk/debian/lash-doc.install
lash/trunk/debian/lash.1
lash/trunk/debian/lashd.install
lash/trunk/debian/liblash-dev.install
lash/trunk/debian/liblash.postinst.debhelper
lash/trunk/debian/liblash.postrm.debhelper
lash/trunk/debian/liblash.substvars
lash/trunk/debian/liblash2.install
lash/trunk/debian/patches/
lash/trunk/debian/patches/00_service.patch
lash/trunk/debian/patches/01_fix64bit.patch
lash/trunk/debian/patches/02_pkgconfig.patch
lash/trunk/debian/rules
lash/trunk/debian/watch
lash/trunk/lash-0.5.1.tar.gz.cdbs-config_list
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: lash/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: lash/trunk/debian/changelog
===================================================================
--- lash/trunk/debian/changelog (rev 0)
+++ lash/trunk/debian/changelog 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,30 @@
+lash (0.5.1-2) unstable; urgency=low
+
+ * Added patch for pkgconfig file, use -llash to link and a Libs.static
+ entry (closes: #377040)
+
+ -- Guenter Geiger (Debian/GNU) <geiger at debian.org> Thu, 6 Jul 2006 14:59:13 +0200
+
+lash (0.5.1-1) unstable; urgency=low
+
+ * New upstream version
+ * Fixed problem with undefined lash_malloc (closes: #375758)
+ * mention lash_panel as graphical user interface in description
+ * Bumped standards version to 3.7.2
+ * adapted package name to match soname (liblash2)
+
+ -- Guenter Geiger (Debian/GNU) <geiger at debian.org> Thu, 6 Jul 2006 14:59:06 +0200
+
+lash (0.5.0-2) unstable; urgency=low
+
+ * short description updated
+
+ -- Guenter Geiger (Debian/GNU) <geiger at debian.org> Tue, 27 Jun 2006 12:00:12 +0200
+
+lash (0.5.0-1) unstable; urgency=low
+
+ * Initial release
+ * Should replace the ladcca system in the future.
+
+ -- Guenter Geiger (Debian/GNU) <geiger at debian.org> Wed, 1 Mar 2006 13:01:05 +0100
+
Added: lash/trunk/debian/compat
===================================================================
--- lash/trunk/debian/compat (rev 0)
+++ lash/trunk/debian/compat 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+4
Added: lash/trunk/debian/control
===================================================================
--- lash/trunk/debian/control (rev 0)
+++ lash/trunk/debian/control 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,59 @@
+Source: lash
+Section: sound
+Priority: optional
+Maintainer: Guenter Geiger (Debian/GNU) <geiger at debian.org>
+Build-Depends: debhelper (>> 4.0.0), cdbs, libjack0.100.0-dev, libasound2-dev, libreadline5-dev, uuid-dev, libgtk2.0-dev, libxml2-dev
+Standards-Version: 3.7.2
+
+Package: liblash-dev
+Section: libdevel
+Architecture: any
+Depends: liblash2 (= ${Source-Version}), uuid-dev
+Description: Linux Audio Session Handler (LASH) development files
+ LASH is a session management system for JACK and ALSA audio
+ applications on GNU/Linux.
+ .
+ This package is needed if you want to compile applications that
+ use the LASH system for audio session management.
+
+Package: lashd
+Section: sound
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Linux Audio Session Handler (LASH) server
+ LASH is a session management system for JACK and ALSA audio
+ applications on GNU/Linux.
+ .
+ This package is needed if you want to save and restore LASH audio sessions.
+
+Package: lash-bin
+Section: sound
+Architecture: any
+Depends: lashd, ${shlibs:Depends}
+Description: Linux Audio Session Handler (LASH) example clients
+ LASH is a session management system for JACK and ALSA audio
+ applications on GNU/Linux.
+ .
+ LASH client applications, the collection includes the lash_panel,
+ a graphical user interface to control LASH sessions.
+
+Package: liblash2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends} ${misc:Depends}
+Conflicts: liblash
+Replaces: liblash
+Description: Linux Audio Session Handler (LASH) shared library files
+ LASH is a session management system for JACK and ALSA audio
+ applications on GNU/Linux.
+ .
+ Dynamic library used by the LASH system
+
+Package: lash-doc
+Section: doc
+Architecture: all
+Description: Linux Audio Session Handler (LASH) documentation
+ LASH is a session management system for JACK and ALSA audio
+ applications on GNU/Linux.
+ .
+ This packages contains the LASH user manual.
Added: lash/trunk/debian/copyright
===================================================================
--- lash/trunk/debian/copyright (rev 0)
+++ lash/trunk/debian/copyright 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,27 @@
+This package was debianized by Guenter Geiger (Debian/GNU) <geiger at debian.org> on
+Wed, 1 Mar 2006 13:01:05 +0100.
+
+The homepage of LASH is http://www.nongnu.org/lash/
+
+Original Author:
+ Bob Ham <rah at bash.sh>
+
+Maintainer (as of Lash 0.5.0):
+ Dave Robillard <drobilla at connect.carelton.ca>
+
+Copyright (C) 2002, 2003 Robert Ham <rah at bash.sh>
+Copyright(C) 2005 Dave Robillarrd <drobilla at connect.carleton.ca>
+
+License(s):
+
+Distributed under GPL (see /usr/share/common-licenses/GPL)
+The file lash/list.h is under the LGPL (see /usr/share/common-licenses/LGPL)
+
+Documentation license:
+Permission is granted to copy, distribute and/or modify
+under the terms of the GNU Free Documentation License, Version 1.2
+or any later version published by the Free Software Foundation;
+
+
+
+
Added: lash/trunk/debian/dirs
===================================================================
--- lash/trunk/debian/dirs (rev 0)
+++ lash/trunk/debian/dirs 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
Added: lash/trunk/debian/lash-bin.install
===================================================================
--- lash/trunk/debian/lash-bin.install (rev 0)
+++ lash/trunk/debian/lash-bin.install 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/lash_*
Added: lash/trunk/debian/lash-bin.links
===================================================================
--- lash/trunk/debian/lash-bin.links (rev 0)
+++ lash/trunk/debian/lash-bin.links 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,7 @@
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_control.1.gz
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_gtk_client.1.gz
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_panel.1.gz
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_save_button.1.gz
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_save_button_2.1.gz
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_simple_client.1.gz
+usr/share/man/man1/lash.1.gz usr/share/man/man1/lash_synth.1.gz
Added: lash/trunk/debian/lash-bin.manpages
===================================================================
--- lash/trunk/debian/lash-bin.manpages (rev 0)
+++ lash/trunk/debian/lash-bin.manpages 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+debian/lash.1
Added: lash/trunk/debian/lash-bin.menu
===================================================================
--- lash/trunk/debian/lash-bin.menu (rev 0)
+++ lash/trunk/debian/lash-bin.menu 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,4 @@
+?package(lash-bin):needs="X11" \
+ section="Apps/Sound"\
+ title="LASH Panel" \
+ command="/usr/bin/lash_panel"
Added: lash/trunk/debian/lash-dev.dirs
===================================================================
--- lash/trunk/debian/lash-dev.dirs (rev 0)
+++ lash/trunk/debian/lash-dev.dirs 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
Added: lash/trunk/debian/lash-doc.install
===================================================================
--- lash/trunk/debian/lash-doc.install (rev 0)
+++ lash/trunk/debian/lash-doc.install 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+debian/tmp/usr/share/info/*
Added: lash/trunk/debian/lash.1
===================================================================
--- lash/trunk/debian/lash.1 (rev 0)
+++ lash/trunk/debian/lash.1 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,75 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH LASH 1 "March 1, 2006"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+lash-examples \- The
+.B Linux Audio Session Handler
+example clients
+.SH SYNOPSIS
+.B lash_control lash_panel lash_save_button lash_save_button_2 lash_simple_client lash_synth
+.br
+.SH DESCRIPTION
+This manual page describes the LASH example clients.
+.TP
+.B lash_control
+is a commandline interface fo controlling the lashd
+server. The commandline interface has support for a "help" command.
+.TP
+.B lash_gtk_client
+an example client based on the gtk toolkit.
+.TP
+.B lash_panel
+is a graphical interface for controlling the LASH server lashd.
+.TP
+.B lash_save_button
+is an example client, implementing the LASH save functionality.
+.TP
+.B lash_save_button_2
+is another button for saving LASH states.
+.TP
+.B lash_simple_client
+is a very basic LASH client. Shows how applications
+are supposed to integrate LASH funcionality.
+.TP
+.B lash_synth
+is a small synthesizer integrating LASH session handling.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR lashd (1)
+
+
+The programs are documented fully by
+.IR " LASH Audio Session Handler Reference Manual" ,
+available via the Info system (lash-manual).
+.SH AUTHOR
+LASH was written by Bob Ham.
+.PP
+This manual page was written by Guenter Geiger, for the Debian project (but may be used by others).
Added: lash/trunk/debian/lashd.install
===================================================================
--- lash/trunk/debian/lashd.install (rev 0)
+++ lash/trunk/debian/lashd.install 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/lashd*
Added: lash/trunk/debian/liblash-dev.install
===================================================================
--- lash/trunk/debian/liblash-dev.install (rev 0)
+++ lash/trunk/debian/liblash-dev.install 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,6 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/share/pkgconfig/*
Added: lash/trunk/debian/liblash.postinst.debhelper
===================================================================
--- lash/trunk/debian/liblash.postinst.debhelper (rev 0)
+++ lash/trunk/debian/liblash.postinst.debhelper 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,5 @@
+# Automatically added by dh_makeshlibs
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+# End automatically added section
Added: lash/trunk/debian/liblash.postrm.debhelper
===================================================================
--- lash/trunk/debian/liblash.postrm.debhelper (rev 0)
+++ lash/trunk/debian/liblash.postrm.debhelper 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,5 @@
+# Automatically added by dh_makeshlibs
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+# End automatically added section
Added: lash/trunk/debian/liblash.substvars
===================================================================
--- lash/trunk/debian/liblash.substvars (rev 0)
+++ lash/trunk/debian/liblash.substvars 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.6-6), libreadline5 (>= 5.1), libuuid1
Added: lash/trunk/debian/liblash2.install
===================================================================
--- lash/trunk/debian/liblash2.install (rev 0)
+++ lash/trunk/debian/liblash2.install 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
Added: lash/trunk/debian/patches/00_service.patch
===================================================================
--- lash/trunk/debian/patches/00_service.patch (rev 0)
+++ lash/trunk/debian/patches/00_service.patch 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,48 @@
+diff -ruN lash-0.5.1-old/lash/config.h lash-0.5.1/lash/config.h
+--- lash-0.5.1-old/lash/config.h 2005-09-15 10:15:33.000000000 +0200
++++ lash-0.5.1/lash/config.h 2006-06-28 11:40:40.000000000 +0200
+@@ -27,6 +27,8 @@
+
+ # include <lash/lash.h>
+
++#define LASH_PORT "14541"
++
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
+diff -ruN lash-0.5.1-old/lashd/conn_mgr.c lash-0.5.1/lashd/conn_mgr.c
+--- lash-0.5.1-old/lashd/conn_mgr.c 2005-10-02 08:09:29.000000000 +0200
++++ lash-0.5.1/lashd/conn_mgr.c 2006-06-28 11:40:40.000000000 +0200
+@@ -185,7 +185,7 @@
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_PASSIVE;
+
+- err = getaddrinfo(NULL, "lash", &hints, &addrs);
++ err = getaddrinfo(NULL, LASH_PORT, &hints, &addrs);
+ if (err) {
+ fprintf(stderr, "%s: could not look up service name: %s\n",
+ __FUNCTION__, gai_strerror(err));
+diff -ruN lash-0.5.1-old/liblash/comm.c lash-0.5.1/liblash/comm.c
+--- lash-0.5.1-old/liblash/comm.c 2005-09-15 10:15:30.000000000 +0200
++++ lash-0.5.1/liblash/comm.c 2006-06-28 11:40:40.000000000 +0200
+@@ -135,7 +135,7 @@
+ lash_comm_event_t connect_event;
+ int err;
+
+- err = lash_open_socket(&client->socket, server, "lash");
++ err = lash_open_socket(&client->socket, server, service);
+ if (err) {
+ fprintf(stderr, "%s: could not create server connection\n",
+ __FUNCTION__);
+diff -ruN lash-0.5.1-old/liblash/lash.c lash-0.5.1/liblash/lash.c
+--- lash-0.5.1-old/liblash/lash.c 2006-03-26 19:52:43.000000000 +0200
++++ lash-0.5.1/liblash/lash.c 2006-06-28 11:40:40.000000000 +0200
+@@ -168,7 +168,7 @@
+ cstr = lash_args_get_server(args);
+ err = lash_comm_connect_to_server(client,
+ cstr ? cstr : "localhost",
+- "lash", connect_params);
++ LASH_PORT, connect_params);
+
+ /* couldn't connect, try to start a new server */
+ /* but not if this client has been started by a server, in which
Added: lash/trunk/debian/patches/01_fix64bit.patch
===================================================================
--- lash/trunk/debian/patches/01_fix64bit.patch (rev 0)
+++ lash/trunk/debian/patches/01_fix64bit.patch 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,50 @@
+diff -ruN lash-0.5.1-old/liblash/client.c lash-0.5.1/liblash/client.c
+--- lash-0.5.1-old/liblash/client.c 2005-09-15 10:15:30.000000000 +0200
++++ lash-0.5.1/liblash/client.c 2006-06-28 12:02:56.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ #include <lash/types.h>
+ #include <lash/client.h>
+-#include <lash/xmalloc.h>
++#include <lash/list.h>
+ #include <lash/internal.h>
+
+ lash_client_t *
+diff -ruN lash-0.5.1-old/liblash/config.c lash-0.5.1/liblash/config.c
+--- lash-0.5.1-old/liblash/config.c 2005-09-15 10:15:30.000000000 +0200
++++ lash-0.5.1/liblash/config.c 2006-06-28 12:02:46.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <stdio.h>
+
+ #include <lash/config.h>
+-#include <lash/xmalloc.h>
++#include <lash/list.h>
+ #include <lash/internal.h>
+
+ void
+diff -ruN lash-0.5.1-old/liblash/event.c lash-0.5.1/liblash/event.c
+--- lash-0.5.1-old/liblash/event.c 2005-09-15 10:15:30.000000000 +0200
++++ lash-0.5.1/liblash/event.c 2006-06-28 12:02:33.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ #include <lash/types.h>
+ #include <lash/internal.h>
+-#include <lash/xmalloc.h>
++#include <lash/list.h>
+ #include <lash/event.h>
+
+ lash_event_t *
+diff -ruN lash-0.5.1-old/liblash/socket.c lash-0.5.1/liblash/socket.c
+--- lash-0.5.1-old/liblash/socket.c 2005-10-04 05:26:41.000000000 +0200
++++ lash-0.5.1/liblash/socket.c 2006-06-28 11:59:34.000000000 +0200
+@@ -34,6 +34,10 @@
+ #include <unistd.h>
+ #include <ctype.h>
+
++
++#include <lash/list.h> /* Something weird with mutual includes between list.h and xmalloc.h, which leaves
++ lash_malloc undefined. I am including list. h before xmalloc.h, which will pull in
++ xmalloc.h. In fact xmalloc.h include can be removed */
+ #include <lash/xmalloc.h>
+ #include <lash/debug.h>
+
Added: lash/trunk/debian/patches/02_pkgconfig.patch
===================================================================
--- lash/trunk/debian/patches/02_pkgconfig.patch (rev 0)
+++ lash/trunk/debian/patches/02_pkgconfig.patch 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,11 @@
+diff -ruN lash-0.5.1-old/lash-1.0.pc.in lash-0.5.1/lash-1.0.pc.in
+--- lash-0.5.1-old/lash-1.0.pc.in 2005-09-13 07:02:19.000000000 +0200
++++ lash-0.5.1/lash-1.0.pc.in 2006-07-06 14:58:16.000000000 +0200
+@@ -7,5 +7,6 @@
+ Description: Audio session management
+ Requires: jack alsa
+ Version: @PACKAGE_VERSION@
+-Libs: -Wl,--rpath -Wl,${libdir} -L${libdir} -llash -lpthread -luuid
++Libs: -llash
++Libs.static: -lpthread -luuid
+ Cflags: -I${includedir}/lash-1.0
Added: lash/trunk/debian/rules
===================================================================
--- lash/trunk/debian/rules (rev 0)
+++ lash/trunk/debian/rules 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+DEB_TAR_SRCDIR := lash-0.5.1
+
+include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-serv-inst
+
Property changes on: lash/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: lash/trunk/debian/watch
===================================================================
--- lash/trunk/debian/watch (rev 0)
+++ lash/trunk/debian/watch 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,22 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php lash-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+http://download.savannah.gnu.org/releases/lash/lash-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/lash-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to use Roland's hack for sourceforge based projects - YMMV!
+#http://people.debian.org/~lolando/sfdlr.php?project=lash lash-([\d.]*).tar.gz
+
+
Added: lash/trunk/lash-0.5.1.tar.gz.cdbs-config_list
===================================================================
--- lash/trunk/lash-0.5.1.tar.gz.cdbs-config_list (rev 0)
+++ lash/trunk/lash-0.5.1.tar.gz.cdbs-config_list 2007-05-18 02:00:19 UTC (rev 1379)
@@ -0,0 +1,5 @@
+lash-0.5.1/lash/config.h
+lash-0.5.1/liblash/config.c
+lash-0.5.1/config.guess
+lash-0.5.1/config.sub
+lash-0.5.1/config.h.in
More information about the Demudi-commits
mailing list