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

Free Ekanayaka free-guest at alioth.debian.org
Sun Apr 22 20:10:42 UTC 2007


Author: free-guest
Date: 2007-04-22 20:10:36 +0000 (Sun, 22 Apr 2007)
New Revision: 1233

Added:
   clalsadrv/trunk/debian/
   clalsadrv/trunk/debian/changelog
   clalsadrv/trunk/debian/compat
   clalsadrv/trunk/debian/control
   clalsadrv/trunk/debian/copyright
   clalsadrv/trunk/debian/dirs
   clalsadrv/trunk/debian/libclalsadrv-dev.dirs
   clalsadrv/trunk/debian/libclalsadrv-dev.install
   clalsadrv/trunk/debian/libclalsadrv1.dirs
   clalsadrv/trunk/debian/libclalsadrv1.install
   clalsadrv/trunk/debian/patches/
   clalsadrv/trunk/debian/patches/00list
   clalsadrv/trunk/debian/patches/10makefile.dpatch
   clalsadrv/trunk/debian/rules
   clalsadrv/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: clalsadrv/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: clalsadrv/trunk/debian/changelog
===================================================================
--- clalsadrv/trunk/debian/changelog	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/changelog	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,32 @@
+clalsadrv (1.0.1-3) unstable; urgency=low
+
+  * Fixed broken Depends line for libclalsadrv-dev depending on the old
+    shared library name
+
+ -- Free Ekanayaka <free at agnula.org>  Thu, 21 Jul 2005 12:30:21 +0200
+
+clalsadrv (1.0.1-2) unstable; urgency=low
+
+  * Rebuilt against the GCC 4.0
+  * Changed the library package name to libclalsadrv1, no
+    need of the c2 suffix, as the so number (1) was not present
+    in the previous package name (was simply libclalsadrv)
+  * Conflicts with previous library package name
+
+ -- Free Ekanayaka <free at agnula.org>  Thu,  7 Jul 2005 10:13:26 +0200
+
+clalsadrv (1.0.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed watch file
+
+ -- Free Ekanayaka <free at agnula.org>  Fri,  8 Apr 2005 22:55:07 +0200
+
+clalsadrv (1.0.0-1) unstable; urgency=low
+
+  * Initial Release.
+  * First Debian upload (closes: #269394), sponsored by 
+    Cosimo Alfarano <kalfa at debian.org>
+
+ -- Free Ekanayaka <free at agnula.org>  Wed,  1 Sep 2004 11:55:33 +0200
+

Added: clalsadrv/trunk/debian/compat
===================================================================
--- clalsadrv/trunk/debian/compat	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/compat	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1 @@
+4

Added: clalsadrv/trunk/debian/control
===================================================================
--- clalsadrv/trunk/debian/control	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/control	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,23 @@
+Source: clalsadrv
+Priority: optional
+Maintainer: Free Ekanayaka <free at agnula.org>
+Build-Depends: debhelper (>= 4.0.0), libasound2-dev, dpatch
+Standards-Version: 3.6.1.1
+
+Package: libclalsadrv-dev
+Section: devel
+Architecture: any
+Depends: libclalsadrv1 (= ${Source-Version})
+Description: Development file for libclalsadrv
+ ALSA driver C++ access library. This package includes 
+ the development tools.
+
+Package: libclalsadrv1
+Conflicts: libclalsadrv
+Replaces: libclalsadrv
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ALSA driver C++ access library
+ C++ wrapper around the ALSA API. This package includes 
+ the shared library object.

Added: clalsadrv/trunk/debian/copyright
===================================================================
--- clalsadrv/trunk/debian/copyright	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/copyright	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,26 @@
+This package was debianized by Free Ekanayaka <free at agnula.org> on
+Tue, 31 Aug 2004 15:01:34 +0200.
+
+It was downloaded from http://users.skynet.be/solaris/linuxaudio/
+
+Upstream Author: Fons Adriaensen <fons.adriaensen at skynet.be>
+
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Added: clalsadrv/trunk/debian/dirs
===================================================================
--- clalsadrv/trunk/debian/dirs	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/dirs	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

Added: clalsadrv/trunk/debian/libclalsadrv-dev.dirs
===================================================================
--- clalsadrv/trunk/debian/libclalsadrv-dev.dirs	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/libclalsadrv-dev.dirs	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include

Added: clalsadrv/trunk/debian/libclalsadrv-dev.install
===================================================================
--- clalsadrv/trunk/debian/libclalsadrv-dev.install	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/libclalsadrv-dev.install	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*

Added: clalsadrv/trunk/debian/libclalsadrv1.dirs
===================================================================
--- clalsadrv/trunk/debian/libclalsadrv1.dirs	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/libclalsadrv1.dirs	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1 @@
+usr/lib

Added: clalsadrv/trunk/debian/libclalsadrv1.install
===================================================================
--- clalsadrv/trunk/debian/libclalsadrv1.install	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/libclalsadrv1.install	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

Added: clalsadrv/trunk/debian/patches/00list
===================================================================
--- clalsadrv/trunk/debian/patches/00list	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/patches/00list	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1 @@
+10makefile

Added: clalsadrv/trunk/debian/patches/10makefile.dpatch
===================================================================
--- clalsadrv/trunk/debian/patches/10makefile.dpatch	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/patches/10makefile.dpatch	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,72 @@
+#! /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


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

Added: clalsadrv/trunk/debian/rules
===================================================================
--- clalsadrv/trunk/debian/rules	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/rules	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+build: build-stamp
+build-stamp: patch-stamp configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure


Property changes on: clalsadrv/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: clalsadrv/trunk/debian/watch
===================================================================
--- clalsadrv/trunk/debian/watch	2007-04-22 20:10:07 UTC (rev 1232)
+++ clalsadrv/trunk/debian/watch	2007-04-22 20:10:36 UTC (rev 1233)
@@ -0,0 +1,3 @@
+# Site		Directory	Pattern		Version	Script
+version=3
+http://users.skynet.be/solaris/linuxaudio/ downloads/clalsadrv-(.*)\.tar.bz2	debian	uupdate




More information about the Demudi-commits mailing list