--- kwave-0.7.10/admin/debianrules	2008-10-07 16:59:50.000000000 +0200
+++ kwave-0.8.0/admin/debianrules	1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-#!/usr/bin/perl -w
-
-use Shell qw(mv cp mkdir rm) ;
-use File::Find;
-use Cwd;
-
-$origPwd = `pwd`;
-chomp $origPwd;
-
-$kde_prefix	=	"/usr";
-$sysconfdir	=	"/etc";
-$kde_includedir	=	"$kde_prefix/include/kde";
-$infodir	=	"$kde_prefix/share/info";
-$mandir		=	"$kde_prefix/share/man";
-$qtdir		=	"/usr/share/qt3";
-
-$kde_cgidir	=	"$kde_prefix/lib/cgi-bin";
-$kde_confdir	=	"$sysconfdir/kde3";
-$kde_htmldir	=	"$kde_prefix/share/doc/kde/HTML";
-
-if (defined $ENV{DEB_BUILD_OPTIONS} &&
-    $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
-	$enable_debug="--enable-debug=full";
-} else {
-	$enable_debug="--disable-debug";
-}
-
-if (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export kde_prefix=$kde_prefix\n";
-  print STDOUT "export sysconfdir=$sysconfdir\n";
-  print STDOUT "export kde_includedir=$kde_includedir\n";
-  print STDOUT "export infodir=$infodir\n";
-  print STDOUT "export mandir=$mandir\n";
-  print STDOUT "export qtdir=$qtdir\n";
-
-  print STDOUT "export kde_cgidir=$kde_cgidir\n";
-  print STDOUT "export kde_confdir=$kde_confdir\n";
-  print STDOUT "export kde_htmldir=$kde_htmldir\n";
-
-  print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
-
-  exit
-}
--- kwave-0.7.10/debian/changelog	2008-10-07 16:59:50.000000000 +0200
+++ kwave-0.8.0/debian/changelog	2008-10-07 16:59:50.000000000 +0200
@@ -1,3 +1,9 @@
+kwave (0.8.0-0ubuntu1) intrepid; urgency=low
+
+  * New Upstream version (closes LP: #271630 and LP: #258667)
+
+ -- Fabrice Coutadeur <coutadeurf@gmail.com>  Sat, 04 Oct 2008 09:03:50 +0000
+
 kwave (0.7.10-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
--- kwave-0.7.10/debian/control	2008-10-07 16:59:50.000000000 +0200
+++ kwave-0.8.0/debian/control	2008-10-07 16:59:50.000000000 +0200
@@ -1,14 +1,15 @@
 Source: kwave
 Section: kde
 Priority: optional
-Maintainer: Bertrand Songis <bsongis@gmail.com>
-Build-Depends: debhelper (>> 4.0), automake1.7, autoconf, autotools-dev, perl, imagemagick, recode, textutils, libid3-3.8.3-dev (>= 3.8.3-4.2), libaudiofile-dev, libogg-dev, libvorbis-dev (>= 1.0.0-2), libflac++-dev (>= 1.1.4-1), libmad0-dev, libgsl0-dev, kdemultimedia-dev (>= 4:3.4.2-1), poxml, debianutils (>= 1.13.1), dpatch, cmake 
-Standards-Version: 3.7.3
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bertrand Songis <bsongis@gmail.com>
+Build-Depends: debhelper (>> 4.0), automake1.7, autoconf, autotools-dev, imagemagick, recode, textutils, libid3-3.8.3-dev (>= 3.8.3-4.2), libaudiofile-dev, libogg-dev, libvorbis-dev (>= 1.0.0-2), libflac++-dev (>= 1.2.1), libmad0-dev, libgsl0-dev, kdemultimedia-dev (>= 4:4.1.2), poxml, debianutils (>= 1.13.1), quilt, cmake, libgsl0-dev
+Standards-Version: 3.8.0
 Homepage: http://kwave.sourceforge.net
 
 Package: kwave
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol (>> 4:3.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kwave-doc-en, kwave-doc-de, kwave-doc-fr
 Provides: kwave-doc, kwave-doc-en, kwave-doc-de, kwave-doc-fr
 Description: sound editor for KDE
--- kwave-0.7.10/debian/patches/fix_link_errors	1970-01-01 01:00:00.000000000 +0100
+++ kwave-0.8.0/debian/patches/fix_link_errors	2008-10-07 16:59:50.000000000 +0200
@@ -0,0 +1,55 @@
+Index: kwave-0.8.0/CMakeLists.txt
+===================================================================
+--- kwave-0.8.0.orig/CMakeLists.txt	2008-10-05 05:04:19.000000000 +0000
++++ kwave-0.8.0/CMakeLists.txt	2008-10-05 05:06:47.000000000 +0000
+@@ -161,7 +161,8 @@
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_KDEUI_LIBRARY}
+     ${KDE4_KIO_LIBRARY}
+-    ${KDE4_KDE3SUPPORT_LIBRARY}
++    pthread
++    dl
+ )
+ 
+ INCLUDE_DIRECTORIES(
+Index: kwave-0.8.0/kwave/CMakeLists.txt
+===================================================================
+--- kwave-0.8.0.orig/kwave/CMakeLists.txt	2008-10-05 05:04:59.000000000 +0000
++++ kwave-0.8.0/kwave/CMakeLists.txt	2008-10-05 05:09:58.000000000 +0000
+@@ -117,8 +117,8 @@
+ TARGET_LINK_LIBRARIES(kwave_core
+     kwavegui
+     kwave
+-    ${QT_AND_KDECORE_LIBS}
+     ${AUDIOFILE_LIBS}
++    ${QT_AND_KDECORE_LIBS}
+ )
+ 
+ ADD_DEPENDENCIES(kwave_core libkwavegui libkwave)
+Index: kwave-0.8.0/libkwave/CMakeLists.txt
+===================================================================
+--- kwave-0.8.0.orig/libkwave/CMakeLists.txt	2008-10-05 05:04:48.000000000 +0000
++++ kwave-0.8.0/libkwave/CMakeLists.txt	2008-10-05 05:10:35.000000000 +0000
+@@ -109,7 +109,6 @@
+ TARGET_LINK_LIBRARIES(libkwave
+     audiofile
+     ${QT_AND_KDECORE_LIBS}
+-    dl
+ )
+ 
+ #############################################################################
+Index: kwave-0.8.0/plugins/CMakeLists.txt
+===================================================================
+--- kwave-0.8.0.orig/plugins/CMakeLists.txt	2008-10-05 05:04:38.000000000 +0000
++++ kwave-0.8.0/plugins/CMakeLists.txt	2008-10-05 05:11:11.000000000 +0000
+@@ -36,9 +36,8 @@
+     TARGET_LINK_LIBRARIES(plugin_${_plugin}
+         kwavegui
+         kwave
+-        ${QT_AND_KDECORE_LIBS}
+         ${plugin_${_plugin}_LIBS}
+-        dl
++        ${QT_AND_KDECORE_LIBS}
+     )
+ 
+     SET_TARGET_PROPERTIES(plugin_${_plugin} PROPERTIES PREFIX "")
--- kwave-0.7.10/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ kwave-0.8.0/debian/patches/series	2008-10-07 16:59:50.000000000 +0200
@@ -0,0 +1 @@
+fix_link_errors
--- kwave-0.7.10/debian/rules	2008-10-07 16:59:50.000000000 +0200
+++ kwave-0.8.0/debian/rules	2008-10-07 16:59:50.000000000 +0200
@@ -18,15 +18,10 @@
 	INSTALL_PROGRAM += -s
 endif
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build: patch build-stamp
 
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs	
-
 build-stamp: 
 	dh_testdir
 
@@ -35,7 +30,7 @@
 	-test -r /usr/share/misc/config.guess && \
 	cp -f /usr/share/misc/config.guess admin/config.guess
 	mkdir build
-	cd build && cmake ..
+	cd build && cmake -DWITH_GSL=OFF ..
 #	QTDIR=/usr/share/qt3 CONFIGURE_OPTS="--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde)" $(MAKE) -f Makefile.dist
 	cd build && $(MAKE)
 	touch build-stamp
@@ -80,11 +75,9 @@
 	mv $(CURDIR)/debian/kwave/usr/lib/libkwavegui.so.0.* $(CURDIR)/debian/kwave/usr/lib/libkwavegui.so.0
 
 	# Make common links for docs.
-	for i in `find $(CURDIR)/debian/kwave/usr/share/doc/kde/HTML -type d -name kwave -not -regex .*/en/kwave`; do \
+	for i in `find $(CURDIR)/debian/kwave/usr/share/doc/kde4/HTML -type d -name kwave -not -regex .*/en/kwave`; do \
 	  ln -f -n -s ../../en/common $$i/common ; done
 
-	perl -w admin/debianrules cleanup
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.