Hi,
I've tweaked a bit more the package here's a second diff. Ciao! Free
Index: debian/control
===================================================================
--- debian/control (revision 1380)
+++ debian/control (working copy)
@@ -2,7 +2,7 @@
Section: sound
Priority: optional
Maintainer: Guenter Geiger (Debian/GNU) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), cdbs, libjack0.100.0-dev, libasound2-dev, libreadline5-dev, uuid-dev, libgtk2.0-dev, libxml2-dev
+Build-Depends: debhelper (>> 4.0.0), cdbs, libjack0.100.0-dev, libasound2-dev, libreadline5-dev, uuid-dev, libgtk2.0-dev, libxml2-dev, chrpath
Standards-Version: 3.7.2
Package: liblash-dev
Index: debian/patches/02_pkgconfig.patch
===================================================================
--- debian/patches/02_pkgconfig.patch (revision 1380)
+++ debian/patches/02_pkgconfig.patch (working copy)
@@ -1,11 +0,0 @@
-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
Index: debian/patches/00_include-headers.patch
===================================================================
--- debian/patches/00_include-headers.patch (revision 0)
+++ debian/patches/00_include-headers.patch (revision 0)
@@ -0,0 +1,37 @@
+--- old/lash/Makefile.in 2007-05-09 03:41:24.000000000 +0200
++++ new/lash/Makefile.in 2006-03-26 19:53:05.000000000 +0200
+@@ -171,27 +159,27 @@
+ target_alias = @target_alias@
+ lashincludedir = $(includedir)/lash-1.0/lash
+ lashinclude_HEADERS = \
+ types.h \
+ lash.h \
++ xmalloc.h \
+ config.h \
+ event.h \
++ list.h \
++ file.h \
+ client_interface.h \
+- protocol.h
++ protocol.h \
++ loader.h \
++ exec_params.h
+
+ noinst_HEADERS = \
+- types.h \
+- xmalloc.h \
+- list.h \
+- file.h \
+ client.h \
+- loader.h \
+- exec_params.h \
+ comm_buffer.h \
+ debug.h \
+ internal.h \
+ socket.h \
+ comm_event.h \
+ config.h \
++ internal.h \
+ args.h \
+ internal_headers.h \
+ server_client.h \
Index: debian/patches/00_service.patch
===================================================================
--- debian/patches/00_service.patch (revision 1380)
+++ debian/patches/00_service.patch (working copy)
@@ -1,48 +0,0 @@
-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
Index: debian/patches/01_fix64bit.patch
===================================================================
--- debian/patches/01_fix64bit.patch (revision 1380)
+++ debian/patches/01_fix64bit.patch (working copy)
@@ -1,50 +0,0 @@
-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>
-
Index: debian/changelog
===================================================================
--- debian/changelog (revision 1380)
+++ debian/changelog (working copy)
@@ -1,3 +1,19 @@
+lash (0.5.3-0.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream release (closes: #423419, #407814)
+ * debian/rules:
+ - include simple-patchsys.mk before tarball.mk (closes: #424489)
+ - run chrpath to fix binary-or-shlib-defines-rpath lintian warnings
+ * debian/control:
+ - build-depend on chrpath
+ * debian/patches:
+ - drop 00_service, 01_fix64bit and 02_pkgconfig.patch, the have
+ been merged upstream
+ - added 00_include-headers, some files are needed by apps like glashctl
+
+ -- Free Ekanayaka <[EMAIL PROTECTED]> Fri, 18 May 2007 04:08:42 +0200
+
lash (0.5.1-2) unstable; urgency=low
* Added patch for pkgconfig file, use -llash to link and a Libs.static
Index: debian/rules
===================================================================
--- debian/rules (revision 1380)
+++ debian/rules (working copy)
@@ -1,11 +1,16 @@
#!/usr/bin/make -f
-DEB_TAR_SRCDIR := lash-0.5.1
+DEB_TAR_SRCDIR := lash-0.5.3
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
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
+# after the directories are created but before dh_compress is run.
+common-binary-post-install-arch::
+ chrpath -d debian/lashd/usr/bin/lashd
+ chrpath -d debian/lash-bin/usr/bin/lash_simple_client
+ chrpath -d debian/lash-bin/usr/bin/lash_synth
Index: lash-0.5.1.tar.gz.cdbs-config_list
===================================================================
--- lash-0.5.1.tar.gz.cdbs-config_list (revision 1380)
+++ lash-0.5.1.tar.gz.cdbs-config_list (working copy)
@@ -1,5 +0,0 @@
-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
