[Demudi-commits] r1236 - in clalsadrv/trunk/debian: . patches

Free Ekanayaka free-guest at alioth.debian.org
Mon Apr 23 11:27:54 UTC 2007


Author: free-guest
Date: 2007-04-23 11:27:52 +0000 (Mon, 23 Apr 2007)
New Revision: 1236

Added:
   clalsadrv/trunk/debian/patches/makefile.dpatch
Removed:
   clalsadrv/trunk/debian/patches/10makefile.dpatch
Modified:
   clalsadrv/trunk/debian/changelog
   clalsadrv/trunk/debian/control
   clalsadrv/trunk/debian/dirs
   clalsadrv/trunk/debian/patches/00list
   clalsadrv/trunk/debian/rules
   clalsadrv/trunk/debian/watch
Log:
releasing version 1.1.0+1-1

Modified: clalsadrv/trunk/debian/changelog
===================================================================
--- clalsadrv/trunk/debian/changelog	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/changelog	2007-04-23 11:27:52 UTC (rev 1236)
@@ -1,3 +1,12 @@
+clalsadrv (1.1.0+1-1) unstable; urgency=low
+
+  * New upstream release
+  * Set Maintainer to debian-multimedia
+  * Added myself to the uploaders
+  * Fixed watch file
+
+ -- Free Ekanayaka <freee at debian.org>  Sun, 22 Apr 2007 22:15:41 +0200
+
 clalsadrv (1.0.1-3) unstable; urgency=low
 
   * Fixed broken Depends line for libclalsadrv-dev depending on the old

Modified: clalsadrv/trunk/debian/control
===================================================================
--- clalsadrv/trunk/debian/control	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/control	2007-04-23 11:27:52 UTC (rev 1236)
@@ -1,8 +1,9 @@
 Source: clalsadrv
 Priority: optional
-Maintainer: Free Ekanayaka <free at agnula.org>
+Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
+Uploaders: Free Ekanayaka <freee at debian.org>
 Build-Depends: debhelper (>= 4.0.0), libasound2-dev, dpatch
-Standards-Version: 3.6.1.1
+Standards-Version: 3.7.2
 
 Package: libclalsadrv-dev
 Section: devel

Modified: clalsadrv/trunk/debian/dirs
===================================================================
--- clalsadrv/trunk/debian/dirs	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/dirs	2007-04-23 11:27:52 UTC (rev 1236)
@@ -1,2 +1,2 @@
-usr/bin
-usr/sbin
+usr/include
+usr/lib

Modified: clalsadrv/trunk/debian/patches/00list
===================================================================
--- clalsadrv/trunk/debian/patches/00list	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/patches/00list	2007-04-23 11:27:52 UTC (rev 1236)
@@ -1 +1 @@
-10makefile
+makefile

Deleted: clalsadrv/trunk/debian/patches/10makefile.dpatch
===================================================================
--- clalsadrv/trunk/debian/patches/10makefile.dpatch	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/patches/10makefile.dpatch	2007-04-23 11:27:52 UTC (rev 1236)
@@ -1,72 +0,0 @@
-#! /bin/sh -e
-## 10makefile.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/free/demudi/packages/clalsadrv/clalsadrv-1.0.0/Makefile clalsadrv-1.0.0/Makefile
---- /home/free/demudi/packages/clalsadrv/clalsadrv-1.0.0/Makefile	2004-08-31 16:15:31.000000000 +0200
-+++ clalsadrv-1.0.0/Makefile	2004-08-31 16:16:09.000000000 +0200
-@@ -2,12 +2,14 @@
- LDFLAGS += -L/usr/local/lib
- LDLIBS += -lclalsadrv -lclthreads -lrt
- 
-+DESTDIR = 
- 
- #CLALSADRV_LIBDIR = /usr/local/lib
- #CLALSADRV_INCDIR = /usr/local/include
--CLALSADRV_LIBDIR = /usr/lib
--CLALSADRV_INCDIR = /usr/include
-+CLALSADRV_LIBDIR = $(DESTDIR)/usr/lib
-+CLALSADRV_INCDIR = $(DESTDIR)/usr/include
- CLALSADRV_SO = libclalsadrv.so
-+CLALSADRV_A  = libclalsadrv.a
- CLALSADRV_MAJ = $(CLALSADRV_SO).1
- CLALSADRV_MIN = $(CLALSADRV_MAJ).0.0
- CLALSADRV_DEP = -lasound
-@@ -15,15 +17,23 @@
- CLALSADRV_H = clalsadrv.h
- 
- 
-+all: $(CLALSADRV_A) $(CLALSADRV_MIN)
-+
-+$(CLALSADRV_A): $(CLALSADRV_O)
-+	ar cr $(CLALSADRV_A) *.o 
-+
- $(CLALSADRV_MIN): $(CLALSADRV_O)
- 	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP)
- 
- 
--install:	$(CLALSADRV_MIN)
-+install: $(CLALSADRV_MIN) $(CLALSADRV_A)
-+	mkdir -p $(CLALSADRV_LIBDIR)
-+	mkdir -p $(CLALSADRV_INCDIR)
- 	cp -f $(CLALSADRV_H) $(CLALSADRV_INCDIR)
- 	cp -f $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)
--	/sbin/ldconfig -n $(CLALSADRV_LIBDIR)
--	ln -sf $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_SO)
-+	cp -f $(CLALSADRV_A) $(CLALSADRV_LIBDIR)
-+#	/sbin/ldconfig -n $(CLALSADRV_LIBDIR)
-+	cd $(CLALSADRV_LIBDIR) && ln -sf $(CLALSADRV_MIN) $(CLALSADRV_SO) && ln -sf $(CLALSADRV_MIN) $(CLALSADRV_MAJ) && cd -
- 
- 
- loopback:	loopback.cc

Added: clalsadrv/trunk/debian/patches/makefile.dpatch
===================================================================
--- clalsadrv/trunk/debian/patches/makefile.dpatch	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/patches/makefile.dpatch	2007-04-23 11:27:52 UTC (rev 1236)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile.dpatch by  <@localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad clalsadrv-1.1.0+1~/Makefile clalsadrv-1.1.0+1/Makefile
+--- clalsadrv-1.1.0+1~/Makefile	2006-05-15 16:58:38.000000000 +0000
++++ clalsadrv-1.1.0+1/Makefile	2007-04-22 20:23:46.000000000 +0000
+@@ -14,11 +14,12 @@
+ #  along with this program; if not, write to the Free Software
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
++DESTDIR =
+ 
+ # Modify as required.
+ #
+ PREFIX = /usr
+-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
++#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+ LIBDIR = lib$(SUFFIX)
+ 
+ 
+@@ -46,10 +47,10 @@
+ 
+ 
+ install:	$(CLALSADRV_MIN)
+-	/usr/bin/install -m 644 $(CLALSADRV_H) $(PREFIX)/include
+-	/usr/bin/install -m 755 $(CLALSADRV_MIN) $(PREFIX)/$(LIBDIR)
+-	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
+-	ln -sf $(CLALSADRV_MIN) $(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO)
++	/usr/bin/install -m 644 $(CLALSADRV_H) $(DESTDIR)$(PREFIX)/include
++	/usr/bin/install -m 755 $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO)
+ 
+ 
+ clean:


Property changes on: clalsadrv/trunk/debian/patches/makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: clalsadrv/trunk/debian/rules
===================================================================
--- clalsadrv/trunk/debian/rules	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/rules	2007-04-23 11:27:52 UTC (rev 1236)
@@ -62,6 +62,8 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib
+	mkdir -p $(CURDIR)/debian/tmp/usr/include
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 

Modified: clalsadrv/trunk/debian/watch
===================================================================
--- clalsadrv/trunk/debian/watch	2007-04-22 20:12:39 UTC (rev 1235)
+++ clalsadrv/trunk/debian/watch	2007-04-23 11:27:52 UTC (rev 1236)
@@ -1,3 +1,3 @@
 # Site		Directory	Pattern		Version	Script
 version=3
-http://users.skynet.be/solaris/linuxaudio/ downloads/clalsadrv-(.*)\.tar.bz2	debian	uupdate
+http://users.skynet.be/solaris/linuxaudio/getit.html downloads/clalsadrv-(.*)\.tar\.bz2




More information about the Demudi-commits mailing list