diff -u audacity-1.3.2/debian/audacity.xpm audacity-1.3.2/debian/audacity.xpm --- audacity-1.3.2/debian/audacity.xpm +++ audacity-1.3.2/debian/audacity.xpm @@ -1,7 +1,7 @@ /* XPM */ static char * audacity_xpm[] = { "32 32 534 2", -" c #FFFFFF", +" c None", ". c #FDFDFF", "+ c #F1F1FB", "@ c #D6D5F4", diff -u audacity-1.3.2/debian/control audacity-1.3.2/debian/control --- audacity-1.3.2/debian/control +++ audacity-1.3.2/debian/control @@ -1,7 +1,8 @@ Source: audacity Section: sound Priority: optional -Maintainer: Debian Multimedia Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Multimedia Team Uploaders: Matt Brubeck , Free Ekanayaka , Joost Yervante Damad Standards-Version: 3.7.2 Build-Depends: cdbs (>=0.4.4), debhelper (>= 5.0.0), libwxgtk2.6-dev, libvorbis-dev (>=1.0.0-3), libogg-dev (>=1.0.0-1), libmad0-dev, libid3tag0-dev, libsndfile1-dev, gettext, zip, libflac++-dev, libexpat1-dev, libjack-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] @@ -9,7 +10,7 @@ Package: audacity Architecture: any Depends: ${shlibs:Depends} -Suggests: ladspa-plugin +Suggests: ladspa-plugin, liblame-dev Description: A fast, cross-platform audio editor Audacity is a multi-track audio editor for Linux/Unix, MacOS and Windows. It is designed for easy recording, playing and editing of diff -u audacity-1.3.2/debian/patches/desktop_file.patch audacity-1.3.2/debian/patches/desktop_file.patch --- audacity-1.3.2/debian/patches/desktop_file.patch +++ audacity-1.3.2/debian/patches/desktop_file.patch @@ -1,8 +1,22 @@ ---- src/audacity.desktop.orig 2006-11-11 01:19:26.000000000 +0100 -+++ src/audacity.desktop 2006-11-11 01:19:47.000000000 +0100 +diff -Nur audacity-1.3.2/src/audacity.desktop audacity-1.3.2.new/src/audacity.desktop +--- audacity-1.3.2/src/audacity.desktop 2006-10-29 08:05:29.000000000 +0900 ++++ audacity-1.3.2.new/src/audacity.desktop 2007-05-02 14:24:59.729413039 +0900 @@ -1,4 +1,4 @@ -[Desktop Entry] +[Desktop Entry] Encoding=UTF-8 Name=Audacity Sound Editor +@@ -11,10 +11,10 @@ + Comment[de]=Audio-Dateien aufnehmen und bearbeiten + Comment[ru]=Запись и редактирование звуковых файлов + +-Icon=/usr/share/audacity/audacity.xpm ++Icon=audacity + + Type=Application +-Categories=Application;AudioVideo;Audio;Multimedia; ++Categories=AudioVideo;Audio;Recorder; + + Exec=audacity + StartupNotify=false diff -u audacity-1.3.2/debian/audacity.menu audacity-1.3.2/debian/audacity.menu --- audacity-1.3.2/debian/audacity.menu +++ audacity-1.3.2/debian/audacity.menu @@ -4,2 +4,2 @@ - icon32x32="/usr/share/audacity/audacity.xpm" \ - icon16x16="/usr/share/audacity/audacity16.xpm" + icon32x32="/usr/share/pixmaps/audacity.xpm" \ + icon16x16="/usr/share/pixmaps/audacity16.xpm" diff -u audacity-1.3.2/debian/audacity.install audacity-1.3.2/debian/audacity.install --- audacity-1.3.2/debian/audacity.install +++ audacity-1.3.2/debian/audacity.install @@ -1,2 +1,2 @@ -debian/audacity.xpm usr/share/audacity -debian/audacity16.xpm usr/share/audacity +debian/audacity.xpm usr/share/pixmaps +debian/audacity16.xpm usr/share/pixmaps diff -u audacity-1.3.2/debian/changelog audacity-1.3.2/debian/changelog --- audacity-1.3.2/debian/changelog +++ audacity-1.3.2/debian/changelog @@ -1,3 +1,14 @@ +audacity (1.3.2-2ubuntu1) gutsy; urgency=low + + * Merged from Debian. Retained changes: + - .xpm transparency & relocation + - .desktop validation + - Suggest the LAME libs + * Added XSBC-Original-Maintainer + * Disabled JACK for !{i386,ppc} to match system portaudio changes + + -- Emmet Hikory Sat, 05 May 2007 22:07:36 +0900 + audacity (1.3.2-2) unstable; urgency=high [Joost Yervante Damad] @@ -34,6 +45,26 @@ -- Free Ekanayaka Tue, 16 Jan 2007 15:53:30 +0100 +audacity (1.2.6-0ubuntu1) feisty; urgency=low + + * New upstream release. + * debian/{control,rules}: + - Use system portaudio 19 to gain native ALSA and JACK support, + - Use system soundtouch and samplerate, + - Suggest the LAME libs (Closes Ubuntu: #51063), + - Disable resample support. + * {configure,lib-src/Makefile}.in: Build & link against system + portaudio 19. + * Reinvoke autoconf to fix FTBFS. + + -- Daniel T Chen Tue, 21 Nov 2006 02:38:07 -0500 + +audacity (1.2.4b-2.1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Stephan Hermann Fri, 7 Jul 2006 14:10:48 +0200 + audacity (1.2.4b-2.1) unstable; urgency=low * NMU as part of the GCC 4.1 transition. @@ -41,6 +72,19 @@ -- Martin Michlmayr Fri, 26 May 2006 12:26:18 +0200 +audacity (1.2.4b-2ubuntu2) dapper; urgency=low + + * Added transparency to audacity.xpm (closes Malone #2396) + * More .desktop file updates (also closes Malone #32740) + + -- Emmet Hikory Tue, 9 May 2006 08:24:33 +0900 + +audacity (1.2.4b-2ubuntu1) dapper; urgency=low + + * Install audacity.xpm to /usr/share/pixmaps & update the .desktop file + + -- Emmet Hikory Thu, 4 May 2006 09:58:18 +0900 + audacity (1.2.4b-2) unstable; urgency=low * src/effects/Silence.cpp: Fix bug that caused Generate Silence to affect @@ -358,0 +403 @@ + diff -u audacity-1.3.2/debian/rules audacity-1.3.2/debian/rules --- audacity-1.3.2/debian/rules +++ audacity-1.3.2/debian/rules @@ -5,6 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk +ifeq (i386,$(DEB_HOST_ARCH)) DEB_CONFIGURE_EXTRA_FLAGS := --with-libsndfile=system \ --with-vorbis=system \ --with-id3tag=system \ @@ -13,6 +14,28 @@ --with-expat=system \ --with-portaudio=v19 \ --enable-unicode +else +ifeq (powerpc,$(DEB_HOST_ARCH)) +DEB_CONFIGURE_EXTRA_FLAGS := --with-libsndfile=system \ + --with-vorbis=system \ + --with-id3tag=system \ + --with-libmad=system \ + --with-libflac=system \ + --with-expat=system \ + --with-portaudio=v19 \ + --enable-unicode +else +DEB_CONFIGURE_EXTRA_FLAGS := --with-libsndfile=system \ + --with-vorbis=system \ + --with-id3tag=system \ + --with-libmad=system \ + --with-libflac=system \ + --with-expat=system \ + --with-portaudio=v19 \ + --with-jack=no \ + --enable-unicode +endif +endif DEB_COMPRESS_EXCLUDE := *.htb diff -u audacity-1.3.2/debian/audacity16.xpm audacity-1.3.2/debian/audacity16.xpm --- audacity-1.3.2/debian/audacity16.xpm +++ audacity-1.3.2/debian/audacity16.xpm @@ -1,7 +1,7 @@ /* XPM */ static char * audacity16_xpm[] = { "16 16 161 2", -" c #FFFFFF", +" c None", ". c #E8E8F9", "+ c #9F9FE4", "@ c #7574C9", only in patch2: unchanged: --- audacity-1.3.2.orig/debian/audacity.dirs +++ audacity-1.3.2/debian/audacity.dirs @@ -0,0 +1 @@ +usr/share/pixmaps