updated with the files from puredata_0.41.4-1.diff.gz on the Debian page for the puredata package

svn path=/trunk/; revision=12794

17 files changed, 404 insertions, 95 deletions

diff --git a/packages/debian/README.Debian b/packages/debian/README.Debian
index 428c528a..68994f36 100644
--- a/packages/debian/README.Debian
+++ b/packages/debian/README.Debian
@@ -11,7 +11,7 @@ There are different methods to solve this problem.
 
 1) starting pd with certain flags:
 
- -frags <n>
+ -audiobuf <n>
 
  sets the number of fragments used in the OSS driver, and additionally
  triggers the "good old and stable" device interface.
@@ -23,11 +23,6 @@ There are different methods to solve this problem.
 
 2) Using ALSA with OSS emulation
 
-3) Try to install the OSS/Free version instead of OSS commercial.
-
-
-
-
 
 Configuration
 ==============
diff --git a/packages/debian/changelog b/packages/debian/changelog
index 33e9e509..3a030207 100644
--- a/packages/debian/changelog
+++ b/packages/debian/changelog
@@ -1,3 +1,280 @@
+puredata (0.41.4-1) unstable; urgency=low
+
+  * New upstream version
+  * Minimal changes in the README.Debian file
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon, 21 Jul 2008 11:00:16 +0200
+
+puredata (0.41.0-2) unstable; urgency=low
+
+  * First 0.41 upload to unstable
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri, 08 Feb 2008 12:00:47 +0100
+
+puredata (0.41.0-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 07 Feb 2008 17:38:40 +0100
+
+puredata (0.40.0~test05-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri, 25 Aug 2006 17:11:52 +0200
+
+puredata (0.40.0~test04-1) experimental; urgency=low
+
+  * New upstream version
+  * removed empty 64_bit_arrays patch
+  * removed fix_s_stuff_include.patch
+  * build depends conditionally on libasound2-dev
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 24 Aug 2006 11:53:48 +0200
+
+puredata (0.40.0~test03-1) experimental; urgency=low
+
+  * New upstream version
+  * added debhelper token to preinst
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 23 Aug 2006 12:23:00 +0200
+
+puredata (0.39.2-3) unstable; urgency=low
+
+  * Added 64bit.patch, deals with problems on 64 bit architectures and
+    arrays
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue,  1 Aug 2006 18:52:19 +0200
+
+puredata (0.39.2-2) unstable; urgency=low
+
+  * Added desktop file  (thanks to Emmet Hkory)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 29 Mar 2006 16:43:59 +0200
+
+puredata (0.39.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue, 13 Dec 2005 16:11:21 +0100
+
+puredata (0.39.1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon, 14 Nov 2005 12:27:12 +0100
+
+puredata (0.39.0test4) unstable; urgency=low
+
+  * New upstream version
+  * Added libjack-dev as build option (backporting)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed,  2 Nov 2005 17:42:39 +0100
+
+puredata (0.38.4+amidi-4) unstable; urgency=low
+
+  * recompile with new JACK API (closes: #317214)
+  * Fixed wrong path to html docs in manual (closes: #301689)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri,  8 Jul 2005 11:02:23 +0200
+
+puredata (0.38.4+amidi-3) unstable; urgency=low
+
+  * Incorporated mlock fix for 2.6 kernels
+  * moved allocation/deallocation out of midi poll() call for ALSA (this 
+    cause problems on 2.6 kernel series when using -rt)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri,  8 Apr 2005 16:21:52 +0200
+
+puredata (0.38.4+amidi-2) unstable; urgency=low
+
+  * Fixed -nomidi behaviour
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri,  8 Apr 2005 16:11:29 +0200
+
+puredata (0.38.4+amidi-1) unstable; urgency=low
+
+  * New upstream version
+  * Cleaned up ALSA midi patch
+  * Added icon (closes: #299411)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue, 22 Mar 2005 12:09:45 +0100
+
+puredata (0.38.2+amidi-3) unstable; urgency=low
+
+  * fixed CONFIGURE_EXTRA_FLAGS 
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 16 Feb 2005 16:44:55 +0100
+
+puredata (0.38.2+amidi-2) unstable; urgency=low
+
+  * Added patch to fix loading of documentation patches 04_helpdir.patch
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 10 Feb 2005 12:30:00 +0100
+
+puredata (0.38.2+amidi-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 10 Feb 2005 10:03:04 +0100
+
+puredata (0.38.0+amidi-3) unstable; urgency=low
+
+  * Fixed segfault when no alsa midi devices found
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 13 Jan 2005 13:51:44 +0100
+
+puredata (0.38.0+amidi-2) unstable; urgency=low
+
+  * fixed problem with gui crashes, see debian/patches/03_fixgui.patch
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri,  7 Jan 2005 16:38:00 +0100
+
+puredata (0.38.0+amidi-1) unstable; urgency=low
+
+  * New upstream version
+  * removed the -mcpu flag for alpha (closes: 265452)
+  * preinst now removes the doc/1.manual directory so it can be properly
+    linked by dh_link (closes: 283988)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue,  4 Jan 2005 10:18:03 +0100
+
+puredata (0.38.0test13-1) experimental; urgency=low
+
+  * New upstream test release
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue, 14 Dec 2004 15:26:45 +0100
+
+puredata (0.38.0test10-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 11 Nov 2004 11:15:39 +0100
+
+puredata (0.38.0test8-2) experimental; urgency=low
+
+  * Applied alsa midi patch
+  * patched tabreceive to fill whole signal block
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu,  4 Nov 2004 13:22:50 +0100
+
+puredata (0.38.0test8-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 14 Oct 2004 11:45:18 +0200
+
+puredata (0.38.0test7-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon,  4 Oct 2004 18:25:05 +0200
+
+puredata (0.38.0test4-1) experimental; urgency=low
+
+  * New upstream version
+  * removed the xterm dependency, changed menu entry
+  * Removed -mcpu=ev56 from alpha build 
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 16 Sep 2004 11:43:27 +0200
+
+puredata (0.37.r4-1) unstable; urgency=low
+
+  * New upstream version
+  * added audiobuf message in README.Debian
+  * Moved to cdbs
+  * readded expr external, seems to compile again with gcc-3.3.4
+  * 64 bit clean patch now in debian/patches directory
+  * files are installed only through debian/install
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu, 12 Aug 2004 16:52:15 +0200
+
+puredata (0.37.cvs1-5) unstable; urgency=low
+
+  * Fixed watch file
+  * Changed layout for html documentation (the whole manual is now in 
+  /usr/share/doc/puredata, and gets linked to /usr/lib/pd)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue, 27 Jul 2004 11:25:59 +0200
+
+puredata (0.37.cvs1-4) unstable; urgency=low
+
+  * vexp.c causes gcc segfault, temporarily disabled (closes: 248412)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon, 14 Jun 2004 10:51:47 +0200
+
+puredata (0.37.cvs1-3) unstable; urgency=low
+
+  * Fixed 64 bit problem with %x formater
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Sun, 16 May 2004 17:50:24 +0200
+
+puredata (0.37.cvs1-2) unstable; urgency=low
+
+  * Recompiled using JACK
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon, 10 May 2004 12:58:22 +0200
+
+puredata (0.37.cvs1-1) unstable; urgency=low
+
+  * New CVS snapshot
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Thu,  6 May 2004 11:50:44 +0200
+
+puredata (0.37.cvs-13) unstable; urgency=low
+
+  * updated jack support, fixes a bug with GUI updates
+  * fixed documentation locate (was still in /usr/share/doc/pd)
+  * adapted menu layout (Testtone in Media Menu)
+  * removed quoting feature
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue, 24 Feb 2004 11:26:12 +0100
+
+puredata (0.37.cvs-12) unstable; urgency=low
+
+  * fixed priority problem with lowlatency jack settings
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon, 19 Jan 2004 13:08:25 +0100
+
+puredata (0.37.cvs-11) unstable; urgency=low
+
+  * recompile for new JACK
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri, 16 Jan 2004 19:25:19 +0100
+
+puredata (0.37.cvs-10) unstable; urgency=low
+
+  * I am just too stupid for this, reupload with the jack package that
+    is actually in unstable
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 17 Dec 2003 09:10:38 +0100
+
+puredata (0.37.cvs-9) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 17 Dec 2003 08:30:53 +0100
+
+puredata (0.37.cvs-8) experimental; urgency=low
+
+  * fixed deletion error for bang
+  * removed Werror, because gcc 3.3.2 spits out very strange warnings 
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Fri,  7 Nov 2003 17:48:34 +0100
+
+puredata (0.37.cvs-7) unstable; urgency=low
+
+  * patched to actually work on 64 bit architectures
+  * changed %x formatters to %lx
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 29 Oct 2003 22:29:52 +0100
+
+puredata (0.37.cvs-6) unstable; urgency=low
+
+  * fixed 64 bit compilation problems (closes: #217840)
+
+ -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Wed, 29 Oct 2003 13:31:11 +0100
+
 puredata (0.37.cvs-5) unstable; urgency=low
 
   * fixed problems with jack
diff --git a/packages/debian/compat b/packages/debian/compat
new file mode 100644
index 00000000..b8626c4c
--- /dev/null
+++ b/packages/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/packages/debian/control b/packages/debian/control
index f8ef6470..efc74ccd 100644
--- a/packages/debian/control
+++ b/packages/debian/control
@@ -2,12 +2,12 @@ Source: puredata
 Section: sound
 Priority: optional
 Maintainer: Guenter Geiger (Debian/GNU) <geiger@debian.org>
-Build-Depends: tcl8.4-dev, tk8.4-dev, libasound2-dev, debhelper, libjack-dev
-Standards-Version: 3.6.0
+Build-Depends: cdbs, tcl8.4-dev, tk8.4-dev, libasound2-dev  [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], debhelper, libjack0.100.0-dev | libjack-dev
+Standards-Version: 3.7.2
 
 Package: puredata
 Architecture: any
-Depends: xterm | x-terminal-emulator, ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Replaces: pd-externals, pd
 Provides: pd
 Conflicts: pd
diff --git a/packages/debian/dirs b/packages/debian/dirs
index bb719ea7..4251802d 100644
--- a/packages/debian/dirs
+++ b/packages/debian/dirs
@@ -1,5 +1,3 @@
 usr/bin
-usr/sbin
 usr/include
-usr/share/man/man1
-usr/share/doc/pd/html
+usr/share/doc/puredata
diff --git a/packages/debian/doc-base.puredata b/packages/debian/doc-base.puredata
index 0119766c..6bd6be17 100644
--- a/packages/debian/doc-base.puredata
+++ b/packages/debian/doc-base.puredata
@@ -6,6 +6,6 @@ Abstract: This manual describes the usage of PD.
 Section: Apps/Sound
 
 Format: HTML
-Index: /usr/share/doc/pd/html/index.htm
-Files: /usr/share/doc/pd/html/*.htm
+Index: /usr/share/doc/puredata/1.manual/index.htm
+Files: /usr/share/doc/puredata/1.manual/*.htm
 
diff --git a/packages/debian/docs b/packages/debian/docs
index 71dfd5ba..2ad377c1 100644
--- a/packages/debian/docs
+++ b/packages/debian/docs
@@ -1 +1 @@
-README.txt
+build-tree/*/README.txt
diff --git a/packages/debian/install b/packages/debian/install
new file mode 100644
index 00000000..36d0ac33
--- /dev/null
+++ b/packages/debian/install
@@ -0,0 +1,18 @@
+build-tree/*/bin/pd usr/bin/
+build-tree/*/bin/pdsend usr/bin/
+build-tree/*/bin/pdreceive usr/bin/
+build-tree/*/bin/pd-gui usr/lib/pd/bin/
+build-tree/*/bin/pd-watchdog usr/lib/pd/bin/
+build-tree/*/bin/pd.tk usr/lib/pd/bin/
+build-tree/*/src/m_pd.h usr/include
+build-tree/*/extra/*/*.pd_linux usr/lib/pd/extra
+build-tree/*/doc/1.manual usr/share/doc/puredata/
+build-tree/*/doc/2.control.examples usr/lib/pd/doc
+build-tree/*/doc/3.audio.examples  usr/lib/pd/doc
+build-tree/*/doc/4.fft.examples usr/lib/pd/doc
+build-tree/*/doc/5.reference usr/lib/pd/doc
+build-tree/*/doc/6.externs usr/lib/pd/doc
+build-tree/*/doc/7.stuff usr/lib/pd/doc
+build-tree/*/doc/sound usr/lib/pd/doc
+debian/puredata.xpm usr/share/pixmaps
+debian/puredata.desktop usr/share/applications
diff --git a/packages/debian/links b/packages/debian/links
new file mode 100644
index 00000000..f3524826
--- /dev/null
+++ b/packages/debian/links
@@ -0,0 +1 @@
+usr/share/doc/puredata/1.manual usr/lib/pd/doc/1.manual
diff --git a/packages/debian/manpages b/packages/debian/manpages
new file mode 100644
index 00000000..4818b8e9
--- /dev/null
+++ b/packages/debian/manpages
@@ -0,0 +1 @@
+build-tree/pd-*/man/*
diff --git a/packages/debian/menu b/packages/debian/menu
index 6f5cdb55..6f852407 100644
--- a/packages/debian/menu
+++ b/packages/debian/menu
@@ -1,2 +1,4 @@
-?package(puredata):needs=x11 section="Apps/Sound"\
-  title="PureData" command="x-terminal-emulator -e /usr/bin/pd"
+?package(puredata):needs="x11" section="Applications/Sound"\
+  title="PureData" \
+  command="/usr/bin/pd" \
+  icon="/usr/share/pixmaps/puredata.xpm"
diff --git a/packages/debian/patches/00_buildsys.patch b/packages/debian/patches/00_buildsys.patch
new file mode 100644
index 00000000..94197a63
--- /dev/null
+++ b/packages/debian/patches/00_buildsys.patch
@@ -0,0 +1,21 @@
+diff -ruN pd-0.39-2-old/configure pd-0.39-2/configure
+--- configure	1970-01-01 01:00:00.000000000 +0100
++++ configure	2006-08-01 19:01:27.000000000 +0200
+@@ -0,0 +1,4 @@
++#!/bin/sh
++
++cd src; ./configure $@
++
+diff -ruN pd-0.39-2-old/Makefile pd-0.39-2/Makefile
+--- Makefile	1970-01-01 01:00:00.000000000 +0100
++++ Makefile	2006-08-01 19:01:32.000000000 +0200
+@@ -0,0 +1,9 @@
++
++all:
++	make -C src
++
++install:
++
++clean:
++	make -C src clean
++
diff --git a/packages/debian/puredata.desktop b/packages/debian/puredata.desktop
new file mode 100644
index 00000000..1434e5bd
--- /dev/null
+++ b/packages/debian/puredata.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=PureData
+GenericName=
+Comment=
+Icon=puredata.xpm
+Exec=/usr/bin/pd
+Terminal=false
+Categories=AudioVideo;Audio;
diff --git a/packages/debian/puredata.preinst b/packages/debian/puredata.preinst
new file mode 100644
index 00000000..cc3f5b80
--- /dev/null
+++ b/packages/debian/puredata.preinst
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+#DEBHELPER#
+
+if [ -d /usr/lib/pd/doc/1.manual ]
+then
+   rm -r /usr/lib/pd/doc/1.manual
+fi
+
+
diff --git a/packages/debian/puredata.xpm b/packages/debian/puredata.xpm
new file mode 100644
index 00000000..76818e53
--- /dev/null
+++ b/packages/debian/puredata.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * pd_xpm[] = {
+"32 32 3 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #000000",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"..++++++++++++++++++++++++++++..",
+"..++++++++..................+...",
+"..+........................+....",
+"..+...........+++.........+.....",
+"..+++++++......++........+......",
+"..+.++..++.....++........+......",
+"..+.++..++..+++++........+......",
+"..+.++..++.++..++........+......",
+"..+.+++++..++..++........+......",
+"..+.++.....++..++........+......",
+"..+.++.....++..++........+......",
+"..++++++....++++++.......+......",
+"..+......................+......",
+"..+......................+......",
+"..+.......................+.....",
+"..+........................+....",
+"..++++++++..................+...",
+"..++++++++++++++++++++++++++++..",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................"};
diff --git a/packages/debian/rules b/packages/debian/rules
index 39f919cb..a590f6ac 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -1,85 +1,20 @@
-#!/usr/bin/make -f 
-#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
+#!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_TAR_SRCDIR := pd-0.41-4
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+ARCH = $(shell dpkg --print-architecture)
+export ARCH
 
-	# Add here commands to compile the package.
-	chmod a+x src/configure
-	cd src && ./configure --prefix=/usr
-	cd src && $(MAKE) 
+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
 
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
+binary-post-install/puredata::
+	chmod 644 `find debian/puredata/usr/lib/pd/doc -type f`
+	chmod 755 debian/puredata/usr/lib/pd/bin/pd.tk
 
-	# Add here commands to clean up after the build process.
-	chmod a+x src/configure
-	-cd src && ./configure
-	-cd src && $(MAKE) distclean
-	-rm src/makefile
-	-rm -r `find . -name CVS`
-	-rm `find . -name "*.pd_linux*"`
-	dh_clean
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr --enable-jack --enable-alsa
+config.status: patch
 
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	cd src && $(MAKE) install prefix=/usr/ DESTDIR=`pwd`/../debian/tmp
-	-rm -r `pwd`/debian/tmp/usr/man
-	touch install-stamp
-
-# 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_testversion
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	mv `pwd`/debian/tmp/usr/lib/pd/doc/1.manual/*.{jpg,htm} \
-`pwd`/debian/tmp/usr/share/doc/pd/html
-#	dh_dhelp
-	dh_installexamples
-	dh_installmenu
-#	dh_installemacsen
-#	dh_installinit
-	dh_installcron
-	dh_installman man/pd.1 man/pdsend.1  man/pdreceive.1
-#	dh_undocumented
-	dh_installchangelogs 
-#	dh_link
-	dh_strip 
-	dh_compress
-	dh_fixperms
-	# You may want to make some executables suid here
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl 
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
diff --git a/packages/debian/watch b/packages/debian/watch
new file mode 100644
index 00000000..7acaa66f
--- /dev/null
+++ b/packages/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://crca.ucsd.edu/~msp/Software/pd-(.*).src.tar.gz