--- serpentine-0.9.orig/config.log +++ serpentine-0.9/config.log @@ -0,0 +1,247 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by serpentine configure 0.9, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ /home/sam/src/serpentine/serpentine-0.9/./configure --build=i486-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=${prefix}/lib/serpentine --disable-maintainer-mode --disable-dependency-tracking --srcdir=. + +## --------- ## +## Platform. ## +## --------- ## + +hostname = xerces +uname -m = i686 +uname -r = 2.6.26-1-686 +uname -s = Linux +uname -v = #1 SMP Wed Aug 20 12:56:41 UTC 2008 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = unknown +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +/usr/bin/hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /usr/local/bin +PATH: /usr/bin +PATH: /bin +PATH: /usr/games +PATH: /home/sam/bin + + +## ----------- ## +## Core tests. ## +## ----------- ## + +configure:1871: checking for a BSD-compatible install +configure:1927: result: /usr/bin/install -c +configure:1938: checking whether build environment is sane + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_env_CC_set=set +ac_cv_env_CC_value=cc +ac_cv_env_CFLAGS_set=set +ac_cv_env_CFLAGS_value='-g -O2 -g -Wall -O2' +ac_cv_env_CPPFLAGS_set=set +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_LDFLAGS_set=set +ac_cv_env_LDFLAGS_value= +ac_cv_env_LIBS_set= +ac_cv_env_LIBS_value= +ac_cv_env_MUINE_PLUGIN_CFLAGS_set= +ac_cv_env_MUINE_PLUGIN_CFLAGS_value= +ac_cv_env_MUINE_PLUGIN_LIBS_set= +ac_cv_env_MUINE_PLUGIN_LIBS_value= +ac_cv_env_PKG_CONFIG_set= +ac_cv_env_PKG_CONFIG_value= +ac_cv_env_build_alias_set=set +ac_cv_env_build_alias_value=i486-linux-gnu +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_path_install='/usr/bin/install -c' + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +ACLOCAL='' +ALL_LINGUAS='' +AMDEPBACKSLASH='' +AMDEP_FALSE='' +AMDEP_TRUE='' +AMTAR='' +AUTOCONF='' +AUTOHEADER='' +AUTOMAKE='' +AWK='' +CATALOGS='' +CATOBJEXT='' +CC='cc' +CCDEPMODE='' +CFLAGS='-g -O2 -g -Wall -O2' +CPP='' +CPPFLAGS='' +CSC='' +CYGPATH_W='' +DATADIRNAME='' +DEFS='' +DEPDIR='' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +EGREP='' +EXEEXT='' +GCONFTOOL='' +GCONF_SCHEMAS_INSTALL_FALSE='' +GCONF_SCHEMAS_INSTALL_TRUE='' +GCONF_SCHEMA_CONFIG_SOURCE='' +GCONF_SCHEMA_FILE_DIR='' +GETTEXT_PACKAGE='' +GMOFILES='' +GMSGFMT='' +GREP='' +INSTALL_DATA='${INSTALL} -m 644' +INSTALL_PROGRAM='${INSTALL}' +INSTALL_SCRIPT='${INSTALL}' +INSTALL_STRIP_PROGRAM='' +INSTOBJEXT='' +INTLLIBS='' +INTLTOOL_CAVES_RULE='' +INTLTOOL_DESKTOP_RULE='' +INTLTOOL_DIRECTORY_RULE='' +INTLTOOL_EXTRACT='' +INTLTOOL_ICONV='' +INTLTOOL_KBD_RULE='' +INTLTOOL_KEYS_RULE='' +INTLTOOL_MERGE='' +INTLTOOL_MSGFMT='' +INTLTOOL_MSGMERGE='' +INTLTOOL_OAF_RULE='' +INTLTOOL_PERL='' +INTLTOOL_PONG_RULE='' +INTLTOOL_PROP_RULE='' +INTLTOOL_SCHEMAS_RULE='' +INTLTOOL_SERVER_RULE='' +INTLTOOL_SERVICE_RULE='' +INTLTOOL_SHEET_RULE='' +INTLTOOL_SOUNDLIST_RULE='' +INTLTOOL_THEME_RULE='' +INTLTOOL_UI_RULE='' +INTLTOOL_UPDATE='' +INTLTOOL_XAM_RULE='' +INTLTOOL_XGETTEXT='' +INTLTOOL_XML_NOMERGE_RULE='' +INTLTOOL_XML_RULE='' +LDFLAGS='' +LIBOBJS='' +LIBS='' +LTLIBOBJS='' +MAINT='' +MAINTAINER_MODE_FALSE='' +MAINTAINER_MODE_TRUE='' +MAKEINFO='' +MCS='' +MKINSTALLDIRS='' +MONO='' +MSGFMT='' +MSGFMT_OPTS='' +MUINE_FALSE='' +MUINE_PLUGIN_CFLAGS='' +MUINE_PLUGIN_LIBS='' +MUINE_TRUE='' +OBJEXT='' +PACKAGE='' +PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=serpentine' +PACKAGE_NAME='serpentine' +PACKAGE_STRING='serpentine 0.9' +PACKAGE_TARNAME='serpentine' +PACKAGE_VERSION='0.9' +PATH_SEPARATOR=':' +PKG_CONFIG='' +POFILES='' +POSUB='' +PO_IN_DATADIR_FALSE='' +PO_IN_DATADIR_TRUE='' +PYTHON='' +PYTHON_EXEC_PREFIX='' +PYTHON_PLATFORM='' +PYTHON_PREFIX='' +PYTHON_VERSION='' +SET_MAKE='' +SHELL='/bin/sh' +STRIP='' +USE_NLS='' +VERSION='' +XGETTEXT='' +ac_ct_CC='' +am__fastdepCC_FALSE='' +am__fastdepCC_TRUE='' +am__include='' +am__leading_dot='' +am__quote='' +am__tar='' +am__untar='' +bindir='${exec_prefix}/bin' +build='i486-linux-gnu' +build_alias='i486-linux-gnu' +build_cpu='' +build_os='' +build_vendor='' +datadir='${datarootdir}' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' +exec_prefix='NONE' +host='' +host_alias='' +host_cpu='' +host_os='' +host_vendor='' +htmldir='${docdir}' +includedir='${prefix}/include' +infodir='${prefix}/share/info' +install_sh='' +libdir='${exec_prefix}/lib' +libexecdir='${prefix}/lib/serpentine' +localedir='${datarootdir}/locale' +localstatedir='/var' +mandir='${prefix}/share/man' +mkdir_p='' +oldincludedir='/usr/include' +pdfdir='${docdir}' +pkgpyexecdir='' +pkgpythondir='' +prefix='/usr' +program_transform_name='s,x,x,' +psdir='${docdir}' +pyexecdir='' +pythondir='' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='/etc' +target_alias='' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +#define PACKAGE_NAME "serpentine" +#define PACKAGE_TARNAME "serpentine" +#define PACKAGE_VERSION "0.9" +#define PACKAGE_STRING "serpentine 0.9" +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=serpentine" + +configure: caught signal 2 +configure: exit 1 --- serpentine-0.9.orig/debian/serpentine.manpages +++ serpentine-0.9/debian/serpentine.manpages @@ -0,0 +1 @@ +debian/serpentine.1 --- serpentine-0.9.orig/debian/muine-plugin-serpentine.install +++ serpentine-0.9/debian/muine-plugin-serpentine.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/muine/plugins --- serpentine-0.9.orig/debian/changelog +++ serpentine-0.9/debian/changelog @@ -0,0 +1,141 @@ +serpentine (0.9-6) unstable; urgency=low + + * Disable building of muine-plugin-serpentine. Muine is orphaned and broken + (closes: #497674). + * Drop XS- prefix for DM-Upload-Allowed control field. + + -- Sam Morris Wed, 03 Sep 2008 19:34:52 +0100 + +serpentine (0.9-5) unstable; urgency=low + + * Only remove /usr/lib if it has been created by python-central (closes: + #472027). + * Depend on python-4suite-xml so that we don't need python-xml any more + (closes: #471913). + * Split Dependencies over multiple lines. + + -- Sam Morris Sat, 22 Mar 2008 13:24:23 +0000 + +serpentine (0.9-4) unstable; urgency=low + + * fix-no-cd-crash.patch taken from upstream BZR: fixes a crash when + Serpentine is launched on a system without any CD recorders (closes: + #459527). + * drop-pyxml.patch taken from upstream BZR: no longer use pyxml (closes: + #468616). z99_automake.patch generated by running 'automake-1.9' and + removing the autom4te.cache directory. + * fix-borken-plparser.py.patch: comment out some useless code that prevented + parsing of playlists by the totem-plparser plugin (closes: #455506). + * Add README.Debian-source documenting where upstream's BZR repostiroy + lives. + + -- Sam Morris Fri, 14 Mar 2008 21:54:55 +0000 + +serpentine (0.9-3) unstable; urgency=low + + * Set gnome-vfs' autoburn_audio_cd_command so that the drive that the CD was + inserted into is selected for burning by default. + * Correct spelling of "GStreamer" in package description. + * Remove empty directory /usr/lib from serpentine binary package. + + -- Sam Morris Sat, 08 Mar 2008 14:07:11 +0000 + +serpentine (0.9-2) unstable; urgency=low + + * Register as a CD-audio burning application with gnome-volume-manager + (closes: #450859). + * Added plugsuspend_new-interface.patch: work with the new dbus interface + provided by gnome-power-manager 2.20 (closes: #459239). Thanks Sebastian + Dröge! + * Build-Depend upon cli-common-dev 0.4.4 as needed by dh_clideps. + * Add Dm-Upload-Allowed field to control fields. + * No longer run the obsolete dh_python. + * Split build dependencies over multiple lines. + * Build-depend on gconf2 because the configure script tries to run + gconftool-2. + * Update to policy 3.7.3 (no changes). + * Quote the '.' characters in the domain name in the watch file. + * Relax build-dependancy on cdbs: remove the Debian revision. + + -- Sam Morris Sat, 16 Feb 2008 12:11:48 +0000 + +serpentine (0.9-1) unstable; urgency=low + + * New upstream release. + - fixes API change in totem.plparser module (closes: #445062). + * Depend on python-cairo for drawing of disc usage diagram. + * Depend on python-dbus for the suspend plugin. + * Update man page with info about new --device argument. + * New patch 'python2.4-compat.patch' changes the k3b playlist plugin to not + use Pyton 2.5 exception-handling syntax. + * Add Homepage to package control fields. + * Add a watch file. + + -- Sam Morris Sat, 18 Aug 2007 02:18:38 +0100 + +serpentine (0.7-4) unstable; urgency=low + + * Reduce redundant wording from description of muine-plugin-serpentine + package + * Now that python-defaults provides Python 2.4, drop dependencies on + python2.4-foo packages, no longer override the python interpreter path + when building the package and patch the launch script to use + /usr/bin/python. + * Rename debian/patches/02_python2.4.patch to + debian/patches/02_no_use_env.patch since the patch now only makes sure + we use /usr/bin/python instead of running python via env(1) + * Bump python-central build-dependency to 0.5 to make lintian happy + + -- Sam Morris Tue, 5 Sep 2006 16:05:29 +0100 + +serpentine (0.7-3) unstable; urgency=low + + * Update to new python policy + * Enable playlist parser plugin, now that python-gnome2-desktop is available + * Call dh_clideps correctly (previous it was not run) + + -- Sam Morris Thu, 27 Jul 2006 13:30:38 +0100 + +serpentine (0.7-2) unstable; urgency=low + + * Actually update the man page with the new options from 0.7 + * Stop using CDBS' automatic build-dependancy generation, at least until + duplicate entries can be pruned + + -- Sam Morris Wed, 5 Jul 2006 20:10:16 +0100 + +serpentine (0.7-1) unstable; urgency=low + + * New upstream release + * Switch to python 2.4 + * Switch to gstreamer 0.10 + * Recommend gstreamer0.10-gnomevfs + * Update man page with options new in version 0.7 + + -- Sam Morris Tue, 13 Jun 2006 20:29:52 +0100 + +serpentine (0.6.4-3) unstable; urgency=low + + * Add misc:Depends for all packages + * Make the muine plugin recommend muine + * Make the muine plugin arch:all since it *should* be architecture + independent + * Improve accuracy of copyright information + + -- Sam Morris Sun, 28 May 2006 15:25:47 +0100 + +serpentine (0.6.4-2) UNRELEASED; urgency=low + + * Update FSF address in copyright file + * Add man page (thanks Julien Valroff) + * Don't package the plparser plugin since the 'totem' python module is not + yet available in Debian + * Depend on python-gnome2-extras (for nautilusburn module) + + -- Sam Morris Sat, 27 May 2006 22:43:25 +0100 + +serpentine (0.6.4-1) UNRELEASED; urgency=low + + * Initial release. (Closes: #286806) + + -- Sam Morris Wed, 24 May 2006 21:41:13 +0100 --- serpentine-0.9.orig/debian/README.Debian-source +++ serpentine-0.9/debian/README.Debian-source @@ -0,0 +1,2 @@ +Upstream BZR repository location: +https://code.launchpad.net/~cogumbreiro/serpentine/main --- serpentine-0.9.orig/debian/serpentine.1 +++ serpentine-0.9/debian/serpentine.1 @@ -0,0 +1,54 @@ +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.de MTO +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH serpentine 1 "Thu, 25 May 2006 12:19:20 +0100" "Serpentine 0.6.91" +.SH NAME +serpentine \- an application for creating audio CDs +.SH SYNOPSIS +.B serpentine +[ +.I options +] +.SH DESCRIPTION +.B serpentine +is an application that lets you master (create) audio CDs. +.SH OPTIONS +These options follow the GNU command line syntax. +.TP +\fB\-h\fR, \fB\-\-help +Show a help message and exit. +.TP +\fB\-s\fR, \fB--simulate +Simulate the recording of the CD. +.TP +\fB\-d\fR, \fB--debug +Show debugging information while recording the CD. +.TP +\fB\-p\fR, \fB--preferences +Show preferences dialog and exit. +.TP +\fB\-e\fR, \fB--device +Sets the default device to be used. +.TP +\fB\-w\fR, \fB--write\fR \fIfilename\fR ... +Immediatly record the specified filenames to a CD. +This will show a dialog suitable for embedding in other applications. +.TP +\fB\-o\fR, \fB\-\-open\fR \fIfilename\fR ... +Start off with the specified filenames in the playlist, ready to be recorded. +.TP +\fB\-n\fR, \fB\-\-no\-gnomevfs +Do not use gnome-vfs. +.SH AUTHORS +.B serpentine +was written by +.MTO "cogumbreiro@users.sf.net" "Tiago Cogumbreiro" . +This manual page was written for the Debian system by +.MTO "julien@kirya.net" "Julien Valroff" , +but may be used by others. +.SH SEE ALSO +.URL "http://s1x.homelinux.net/projects/serpentine/" "Serpentine home page" --- serpentine-0.9.orig/debian/rules +++ serpentine-0.9/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_DESTDIR := $(CURDIR)/debian/tmp + +#DEB_CONFIGURE_EXTRA_FLAGS += --enable-muine + +#export MONO_SHARED_DIR := $(CURDIR) + +binary-install/serpentine:: + dh_pycentral -pserpentine + if test -d debian/serpentine/usr/lib; then rmdir debian/serpentine/usr/lib; fi + +#common-binary-predeb-indep:: +# dh_clideps -i + +#clean:: +# rm -f muine-plugin/SerpentinePlugin.dll +# if test -d $(MONO_SHARED_DIR)/.wapi; then rmdir $(MONO_SHARED_DIR)/.wapi; fi --- serpentine-0.9.orig/debian/watch +++ serpentine-0.9/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://developer.berlios.de/project/showfiles.php?group_id=3081 http://prdownload\.berlios\.de/serpentine/serpentine-(\S+)\.tar\.gz debian uupdate --- serpentine-0.9.orig/debian/serpentine.gconf-defaults +++ serpentine-0.9/debian/serpentine.gconf-defaults @@ -0,0 +1 @@ +/desktop/gnome/volume_manager/autoburn_audio_cd_command "serpentine --device %d" --- serpentine-0.9.orig/debian/serpentine.install +++ serpentine-0.9/debian/serpentine.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/serpentine +debian/tmp/usr/lib/python* +debian/tmp/usr/share/applications +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/serpentine --- serpentine-0.9.orig/debian/control +++ serpentine-0.9/debian/control @@ -0,0 +1,58 @@ +Source: serpentine +Section: gnome +Priority: optional +Maintainer: Sam Morris +Build-Depends: + cdbs (>= 0.4.24), + debhelper (>= 5.0.37.2), + gconf2, + patchutils (>= 0.2.25) +Build-Depends-Indep: + autotools-dev, +# cli-common-dev (>= 0.4.4), + libxml-parser-perl, +# mono-mcs (>= 1.0) | c-sharp-compiler, +# muine, + pkg-config, + python (>= 2.4), + python-central (>= 0.5) +Standards-Version: 3.7.3 +XS-Python-Version: >= 2.4 +#Homepage: http://s1x.homelinux.net/projects/serpentine/ +Homepage: http://developer.berlios.de/projects/serpentine/ +DM-Upload-Allowed: yes + +Package: serpentine +Architecture: all +Depends: + ${python:Depends}, + python-4suite-xml, + python-cairo, + python-dbus, + python-gst0.10 (>= 0.10.4-4), + python-gnome2 (>= 2.12.4-4), + python-gnome2-extras (>= 2.14.2-1), + python-gnome2-desktop (>= 2.14.0-3), + python-glade2 (>= 2.8.6-5), + gstreamer0.10-plugins-base, + gstreamer0.10-plugins-good, + gstreamer0.10-plugins-ugly, + ${misc:Depends} +XB-Python-Version: ${python:Versions} +Recommends: gstreamer0.10-gnomevfs +Description: An application for creating audio CDs + Serpentine is an application that lets you master (create) audio CDs. + . + * Supports multiple file formats such as WAV, MP3, OGG, FLAC and every other + format that GStreamer can read + * Supports PLS, M3U and XSPF playlists + * Can extract the audio track from video files + * Supports drag and drop: files can be dropped from Rhythmbox, Nautilus, etc. + * Clean and easy to use GNOME interface +# +#Package: muine-plugin-serpentine +#Architecture: all +#Depends: ${cli:Depends}, serpentine, ${misc:Depends} +#Description: Audio CD burning plugin for the Muine audio player +# A plugin for the Muine audio player that lets you burn the current playlist +# to an audio CD. --- serpentine-0.9.orig/debian/copyright +++ serpentine-0.9/debian/copyright @@ -0,0 +1,82 @@ +This package was debianized by Sam Morris on +Wed, 24 May 2006 21:42:54 +0100. It is based on the Ubuntu package of +Serpentine 0.6.91-0ubuntu3, maintained by Sebastien Bacher . + +The project home page is . This +release was downloaded from +. + +Copyright Holder: Tiago Cogumbreiro + +The following license applies to the file serpentine/components.py: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +The GNU LGPL applies to the following files: + serpentine/audio.py + serpentine/constants.py + serpentine/converting.py + serpentine/errors.py + serpentine/gaw.py + serpentine/gdkpiechart.py + serpentine/gtkutil.py + serpentine/mastering.py + serpentine/operations.py + serpentine/plugins/__init__.py + serpentine/plugins/plugfilter_dir.py + serpentine/plugins/plugfilter_k3b.py + serpentine/plugins/plugfilter_plparser.py + serpentine/plugins/plugfilter_plsave.py + serpentine/plugins/plugfilter_xspf.py + serpentine/urlutil.py + serpentine/xspf.py + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + +On Debian systems, the complete text of the GNU Lesser General Public License +can be found in '/usr/share/common-licenses/LGPL'. + +The remainder of the files in this package are licensed under the terms of the +GNU GPL: + + 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; either version 2 of the License, or + (at your option) any later version. + + 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., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License can be +found in '/usr/share/common-licenses/GPL'. --- serpentine-0.9.orig/debian/pycompat +++ serpentine-0.9/debian/pycompat @@ -0,0 +1 @@ +2 --- serpentine-0.9.orig/debian/compat +++ serpentine-0.9/debian/compat @@ -0,0 +1 @@ +5 --- serpentine-0.9.orig/debian/patches/fix-borken-plparser.py.patch +++ serpentine-0.9/debian/patches/fix-borken-plparser.py.patch @@ -0,0 +1,18 @@ +diff -Nur serpentine-0.9/serpentine/plugins/plugfilter_plparser.py serpentine-0.9.new/serpentine/plugins/plugfilter_plparser.py +--- serpentine-0.9/serpentine/plugins/plugfilter_plparser.py 2007-08-15 19:10:04.000000000 +0100 ++++ serpentine-0.9.new/serpentine/plugins/plugfilter_plparser.py 2008-03-15 12:39:32.000000000 +0000 +@@ -38,10 +38,10 @@ + def _on_entry_parsed(self, parser, uri, data, hints_list): + hints = {'location': uri} + +- for src_key, dst_key in (('title', 'title'), ('author', 'artist')): +- val = data[src_key] +- if val is not None: +- data[dst_key] = val ++ #for src_key, dst_key in (('title', 'title'), ('author', 'artist')): ++ # val = data[src_key] ++ # if val is not None: ++ # data[dst_key] = val + + hints_list.append(hints) + --- serpentine-0.9.orig/debian/patches/drop-pyxml.patch +++ serpentine-0.9/debian/patches/drop-pyxml.patch @@ -0,0 +1,164 @@ +=== modified file 'Makefile.am' +--- Makefile.am 2007-08-13 15:30:11 +0000 ++++ Makefile.am 2008-03-07 16:05:24 +0000 +@@ -34,6 +34,7 @@ + serpentine/common.py \ + serpentine/urlutil.py \ + serpentine/errors.py \ ++ serpentine/compatxml.py \ + serpentine/release.py + + serpentine_pluginsdir = $(pythondir)/serpentine/plugins + +=== modified file 'serpentine/__init__.py' +--- serpentine/__init__.py 2007-10-15 10:55:52 +0000 ++++ serpentine/__init__.py 2008-03-07 16:05:24 +0000 +@@ -458,7 +458,7 @@ + """ + # Clean window object + Application.stop(self) +- self.__window.destroy() ++# self.__window.destroy() + del self.__window + + + +=== added file 'serpentine/compatxml.py' +--- serpentine/compatxml.py 1970-01-01 00:00:00 +0000 ++++ serpentine/compatxml.py 2008-03-07 16:05:24 +0000 +@@ -0,0 +1,29 @@ ++""" ++Compability layer of XML. ++""" ++try: ++ from Ft.Xml.Domlette import NonvalidatingReader ++ parseUri = NonvalidatingReader.parseUri ++ parseString = NonvalidatingReader.parseString ++ del NonvalidatingReader ++ from Ft.Xml.XPath import Evaluate ++except ImportError: ++ from xml.dom.minidom import parse as parseUri ++ from xml.dom.minidom import parseString ++ from xml.xpath import Evaluate ++ ++def get_node_attr(node, attr): ++ """ ++ Tries to uniform the way to get the *value* of an attribute in ++ both minidom and in 4Suite. ++ """ ++ try: ++ return node.attributes[attr].value ++ except KeyError: ++ return node.attributes[(None, attr)].value ++ ++def node_contains_attr(node, attr): ++ """ ++ Uniforms the attributes in both minidom and in 4Suite. ++ """ ++ return attr in node.attributes or (None, attr) in node.attributes + +=== modified file 'serpentine/plugins/plugfilter_k3b.py' +--- serpentine/plugins/plugfilter_k3b.py 2007-08-02 17:26:16 +0000 ++++ serpentine/plugins/plugfilter_k3b.py 2008-03-07 16:05:24 +0000 +@@ -21,8 +21,8 @@ + + import zipfile, gnomevfs + +-from xml.dom import minidom +-from xml.xpath import Evaluate ++from serpentine.compatxml import parseString, Evaluate, get_node_attr ++ + from xml.parsers.expat import ExpatError + + from serpentine.mastering import HintsFilter +@@ -70,7 +70,7 @@ + try: + zfile = zipfile.ZipFile(fd) + buff = zfile.read("maindata.xml") +- root = minidom.parseString(buff) ++ root = parseString(buff) + + except (zipfile.BadZipfile, IOError, KeyError, ExpatError): + raise UnsupportedLocationError() +@@ -81,7 +81,7 @@ + hints_list = [] + for node in Evaluate ("/k3b_audio_project/contents/track", root): + try: +- hints_list.append ({"location": node.attributes["url"].value}) ++ hints_list.append ({"location": get_node_attr(node, "url")}) + except KeyError: + # skip elements without the 'url' attribute set + pass +@@ -92,9 +92,8 @@ + for node in Evaluate ("/k3b_audio_project/contents/track/sources/file", + root): + try: +- hints_list.append ({"location": node.attributes["url"].value}) ++ hints_list.append ({"location": get_node_attr(node, "url")}) + except KeyError: +- # skip elements with not 'url' attribute set + pass + + return hints_list + +=== modified file 'serpentine/plugins/plugrhythmbox.py' +--- serpentine/plugins/plugrhythmbox.py 2007-08-14 08:43:07 +0000 ++++ serpentine/plugins/plugrhythmbox.py 2008-03-07 16:05:24 +0000 +@@ -3,8 +3,8 @@ + import os.path + import weakref + +-from xml.xpath import Evaluate +-from xml.dom import minidom ++from serpentine.compatxml import Evaluate, parseUri, get_node_attr, node_contains_attr ++ + from gettext import gettext as _ + + if __name__ == '__main__': +@@ -20,17 +20,17 @@ + + def rhythmbox_list_names(): + try: +- root = minidom.parse(PLAYLISTS) ++ root = parseUri(PLAYLISTS) + except IOError: + return () + + nodes = Evaluate("/rhythmdb-playlists/playlist", root) +- return [node.attributes["name"].value for node in nodes] ++ return [get_node_attr(node, "name") for node in nodes if node_contains_attr(node, "name")] + + + def rhythmbox_get_playlist(playlist_name): + try: +- root = minidom.parse(PLAYLISTS) ++ root = parseUri(PLAYLISTS) + except IOError: + return () + + +=== modified file 'serpentine/xspf.py' +--- serpentine/xspf.py 2007-08-02 17:20:48 +0000 ++++ serpentine/xspf.py 2008-03-07 16:05:24 +0000 +@@ -23,8 +23,8 @@ + This is a very simple utility module for retrieving basic XSPF playlist data. + Basically it retrieves the playlist tracks' title, artist, location and duration. + """ +-from xml.dom import minidom +-from xml.xpath import Evaluate ++ ++from serpentine.compatxml import parseUri, Evaluate + from xml.dom.minidom import getDOMImplementation + + class _Field(object): +@@ -121,7 +121,8 @@ + return doc + + def parse (self, file_or_filename): +- root = minidom.parse (file_or_filename) ++ #root = minidom.parse (file_or_filename) ++ root = parseUri(file_or_filename) + # Iterate over tracks + for track_node in Evaluate ("/playlist/trackList/track", root): + t = Track() + --- serpentine-0.9.orig/debian/patches/z99_automake.patch +++ serpentine-0.9/debian/patches/z99_automake.patch @@ -0,0 +1,11 @@ +diff -Nur serpentine-0.9/Makefile.in serpentine-0.9.new/Makefile.in +--- serpentine-0.9/Makefile.in 2007-08-13 21:30:24.000000000 +0100 ++++ serpentine-0.9.new/Makefile.in 2008-03-14 22:46:47.000000000 +0000 +@@ -286,6 +286,7 @@ + serpentine/common.py \ + serpentine/urlutil.py \ + serpentine/errors.py \ ++ serpentine/compatxml.py \ + serpentine/release.py + + serpentine_pluginsdir = $(pythondir)/serpentine/plugins --- serpentine-0.9.orig/debian/patches/02_no_use_env.patch +++ serpentine-0.9/debian/patches/02_no_use_env.patch @@ -0,0 +1,9 @@ +diff -Nur serpentine-0.7/scripts/serpentine serpentine-0.7.new/scripts/serpentine +--- serpentine-0.7/scripts/serpentine 2006-06-13 19:59:51.000000000 +0100 ++++ serpentine-0.7.new/scripts/serpentine 2006-06-13 20:14:13.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + import gtk + import sys + import gobject --- serpentine-0.9.orig/debian/patches/plugsuspend_new-interface.patch +++ serpentine-0.9/debian/patches/plugsuspend_new-interface.patch @@ -0,0 +1,23 @@ +--- serpentine-0.9.orig/serpentine/plugins/plugsuspend.py ++++ serpentine-0.9/serpentine/plugins/plugsuspend.py +@@ -28,9 +28,17 @@ + """ + def __init__(self): + self.bus = dbus.Bus(dbus.Bus.TYPE_SESSION) +- self.devobj = self.bus.get_object('org.gnome.PowerManager', +- '/org/gnome/PowerManager') +- self.dev = dbus.Interface(self.devobj, "org.gnome.PowerManager") ++ try: ++ self.devobj = self.bus.get_object('org.freedesktop.PowerManagement', ++ '/org/freedesktop/PowerManagement/Inhibit') ++ self.dev = dbus.Interface(self.devobj, "org.freedesktop.PowerManagement.Inhibit") ++ except dbus.DBusException: ++ try: ++ self.devobj = self.bus.get_object('org.gnome.PowerManager', ++ '/org/gnome/PowerManager') ++ self.dev = dbus.Interface(self.devobj, "org.gnome.PowerManager") ++ except dbus.DBusException: ++ raise Exception ("No gnome-power-manager running") + + def on_writing_started(self, app): + self.cookie = self.dev.Inhibit('Serpentine', _('Writing audio disc')) --- serpentine-0.9.orig/debian/patches/fix-no-cd-crash.patch +++ serpentine-0.9/debian/patches/fix-no-cd-crash.patch @@ -0,0 +1,14 @@ +diff -Nur serpentine-0.9/serpentine/preferences.py serpentine-0.9.new/serpentine/preferences.py +--- serpentine-0.9/serpentine/preferences.py 2007-08-15 20:55:01.000000000 +0100 ++++ serpentine-0.9.new/serpentine/preferences.py 2008-03-14 21:22:47.000000000 +0000 +@@ -452,7 +452,9 @@ + + def _on_gconf_device_changed(self, *args): + self.__drive_selection.set_device(self._device.data) +- self._device.data = self.__drive_selection.get_device() ++ dev = self.__drive_selection.get_device() ++ if dev is not None: ++ self._device.data = dev + + def __on_destroy (self, *args): + self.dialog.hide () --- serpentine-0.9.orig/debian/patches/python2.4-compat.patch +++ serpentine-0.9/debian/patches/python2.4-compat.patch @@ -0,0 +1,22 @@ +diff -Nur serpentine-0.9/serpentine/plugins/plugfilter_k3b.py serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py +--- serpentine-0.9/serpentine/plugins/plugfilter_k3b.py 2008-03-14 22:42:19.000000000 +0000 ++++ serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py 2008-03-14 22:43:08.000000000 +0000 +@@ -68,12 +68,13 @@ + + + try: +- zfile = zipfile.ZipFile(fd) +- buff = zfile.read("maindata.xml") +- root = parseString(buff) ++ try: ++ zfile = zipfile.ZipFile(fd) ++ buff = zfile.read("maindata.xml") ++ root = parseString(buff) + +- except (zipfile.BadZipfile, IOError, KeyError, ExpatError): +- raise UnsupportedLocationError() ++ except (zipfile.BadZipfile, IOError, KeyError, ExpatError): ++ raise UnsupportedLocationError() + finally: + fd.close() + --- serpentine-0.9.orig/debian/patches/01_desktop_name.patch +++ serpentine-0.9/debian/patches/01_desktop_name.patch @@ -0,0 +1,14 @@ +diff -Nur serpentine-0.6.91/data/serpentine.desktop.in serpentine-0.6.91.new/data/serpentine.desktop.in +--- serpentine-0.6.91/data/serpentine.desktop.in 2006-02-11 00:40:05.000000000 +0100 ++++ serpentine-0.6.91.new/data/serpentine.desktop.in 2006-03-16 12:36:28.000000000 +0100 +@@ -1,8 +1,8 @@ + [Desktop Entry] + Version=1.0 + Encoding=UTF-8 +-_Name=Serpentine Audio-CD Creator +-_Comment=Create Audio-CD's from music files and playlists ++_Name=Serpentine Audio CD Creator ++_Comment=Create audio CDs from music files and playlists + Type=Application + Exec=serpentine -o %U + Icon=gnome-dev-cdrom-audio.png