[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: RFS: xmms2 (updated package)



Am Freitag, den 05.06.2009, 15:37 +0200 schrieb Sandro Tosi:
> Hi Benjamin,
> 
> On Fri, Jun 5, 2009 at 15:15, Benjamin Drung<benjamin.drung@gmail.com> wrote:
> > Dear mentors,
> >
> > I am looking for a sponsor for the new version 0.6DrMattDestruction-2
> > of my package "xmms2".
> 
> >From a fast look:
> 
> 1. there seems to be upstream file modificed without a patch system:
> would you please add one (or consider it and if you choose not to use
> one explain the reason)?
> 
> $ zcat xmms2_0.6DrMattDestruction-2.diff.gz | filterdiff -x
> "*/debian/*" | diffstat
>  .gitignore                                    |   31 ++++++++++++++++++++++++++
>  COPYING                                       |    6 ++---
>  src/clients/lib/perl/wscript                  |    6 ++---
>  src/include/xmmsclient/xmmsclient++/helpers.h |    1
>  4 files changed, 38 insertions(+), 6 deletions(-)

The package is maintained in git. These changes are cherry-picked.
Florian, how about using a patch system?

> 2. there is no debian/watch file - please add one

Done.

> 3. no need to b-d on python, since python-all-dev takes it already in

Done.

> 4. debian copyright
>    - there should be a section about debian packaging copyright

Florian, I think that is your task. Is that correct, that the Debian
package copyright is also owned by the XMMS2 Team?

>    - please separate copyright and license sections

Do you have an example how to seperate it.

> 5. the package is absolutely *not* lintian clean! use

That was copied from the template.

> $ lintian -iIv --pedantic /path/tot/xmms2_0.6DrMattDestruction-2_i386.changes
> 
> and you'll see  a lot of output. Many items are to be discarded (like
> no upstream changelog, long description too short and so) but:

I have added now the upstream changelog. To fix the "long description
too short" we can add the generic block

 XMMS2 is a redesign of the XMMS music player. It features a client-server
 model, allowing multiple (even simultaneous!) user interfaces, both textual
 and graphical. All common audio formats are supported using plugins. On top of
 this, there is a flexible media library to organize your music.

to all packages.

> - binary-without-manpage

Writing manpages is very time-consuming.

> - hyphen-used-as-minus-sign

I will fix this.

> - no-symbols-control-file

I do not know how to solve this.

> - unused-override

Solved.

> should be addressed.
> 
> At this point, I didn't check further.
> 
> > Florian Ragwitz, the maintainer of xmms2, is very busy and have no time
> > for it. He agreed on asking here for a sponsor.
> >
> > Please CC Florian and me, if you response to this mail, because we did
> > not subscribe this mailing list.
> 
> done.
> 
> Cheers,

I have added a debdiff to version 0.6DrMattDestruction-1.

Cheers,
Benjamin
diff -u xmms2-0.6DrMattDestruction/debian/changelog xmms2-0.6DrMattDestruction/debian/changelog
--- xmms2-0.6DrMattDestruction/debian/changelog
+++ xmms2-0.6DrMattDestruction/debian/changelog
@@ -1,3 +1,22 @@
+xmms2 (0.6DrMattDestruction-2) unstable; urgency=low
+
+  * debian/control:
+    + Move libxmmsclient-ruby* from section interpreters to ruby.
+    + Break Uploaders and add myself.
+    + Sort Build-Depends and Depends.
+    + Bump Standards-Version to 3.8.1.
+    + Do not build depend on python, depending on python-all-dev is enough.
+  * debian/rules: Don't refer to python2.[45] in clean; expand from PYVERS
+    instead.
+  * debian/python-xmmsclient.install: Wildcard out the need for 2.[45] or
+    site-packages references.
+  * Move icons into new xmms2-icon package.
+  * Add debian/watch file.
+  * Remove debian/*.lintian-overrides, they are not longer necessary.
+  * Install changelog file.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 05 Jun 2009 18:08:38 +0200
+
 xmms2 (0.6DrMattDestruction-1) unstable; urgency=low
 
   * New upstream release.
reverted:
--- xmms2-0.6DrMattDestruction/debian/xmms2-et.lintian-overrides
+++ xmms2-0.6DrMattDestruction.orig/debian/xmms2-et.lintian-overrides
@@ -1 +0,0 @@
-xmms2-et: manpage-has-errors-from-man usr/share/man/man1/xmms2-et.1.gz 147: warning: can't find numbered character 246
diff -u xmms2-0.6DrMattDestruction/debian/control xmms2-0.6DrMattDestruction/debian/control
--- xmms2-0.6DrMattDestruction/debian/control
+++ xmms2-0.6DrMattDestruction/debian/control
@@ -2,52 +2,55 @@
 Section: sound
 Priority: optional
 Maintainer: Florian Ragwitz <rafl@debian.org>
-Uploaders: Jens Taprogge <jlt@taprogge.org>, Jonne Lehtinen <jms@modeemi.fi>, Thomas Jollans <thomas@jollans.com>, Anders Waldenborg <anders@0x63.nu>
-Standards-Version: 3.8.0
+Uploaders: Jens Taprogge <jlt@taprogge.org>,
+           Jonne Lehtinen <jms@modeemi.fi>,
+           Thomas Jollans <thomas@jollans.com>,
+           Anders Waldenborg <anders@0x63.nu>,
+           Benjamin Drung <bdrung@ubuntu.com>
+Standards-Version: 3.8.1
 Build-Depends: debhelper (>= 5.0.37.2),
-               libsqlite3-dev,
-               ruby,
-               ruby1.8-dev,
-               libperl-dev,
-               python,
-               python-all-dev (>= 2.3.5-11),
-               libglib2.0-dev,
-               libreadline5-dev,
-               libcurl4-openssl-dev,
-               libsmbclient-dev,
-               libvorbis-dev,
-               libshout-dev,
-               libflac-dev,
-               libmodplug-dev,
-               libmad0-dev,
-               libmpg123-dev (>= 1.5.1),
+               libao-dev,
                libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64],
-               libjack-dev,
                libavahi-client-dev,
                libavahi-glib-dev,
-               libgamin-dev,
-               libmpcdec-dev,
-               libmms-dev,
-               libsidplay2-dev,
-               libresid-builder-dev,
                libavcodec-dev [!kfreebsd-i386 !kfreebsd-amd64],
                libboost-dev,
                libboost-signals-dev,
-               python-support (>= 0.3),
-               python-pyrex,
-               libfaad-dev,
-               libfftw3-dev,
-               libsamplerate-dev,
-               libao-dev,
                libcdio-cdda-dev,
+               libcurl4-openssl-dev,
                libdiscid0-dev,
-               libxml2-dev,
                libexpat1-dev,
+               libfaad-dev,
+               libfftw3-dev,
+               libflac-dev,
+               libgamin-dev,
+               libglib2.0-dev,
+               libjack-dev,
+               libmad0-dev,
+               libmms-dev,
+               libmodplug-dev,
+               libmpcdec-dev,
+               libmpg123-dev (>= 1.5.1),
                libofa0-dev,
+               libperl-dev,
+               libpulse-dev,
+               libreadline5-dev,
+               libresid-builder-dev,
+               libsamplerate-dev,
                libsdl1.2-dev,
+               libshout-dev,
+               libsidplay2-dev,
+               libsmbclient-dev,
+               libsqlite3-dev,
                libvisual-0.4-dev,
-               libpulse-dev,
-               libwavpack-dev
+               libvorbis-dev,
+               libwavpack-dev,
+               libxml2-dev,
+               python-all-dev (>= 2.3.5-11),
+               python-pyrex,
+               python-support (>= 0.3),
+               ruby,
+               ruby1.8-dev
 Vcs-Git: git://git.debian.org/git/pkg-xmms2/xmms2
 Vcs-Browser: http://git.debian.org/?p=pkg-xmms2/xmms2.git
 Homepage: http://xmms2.xmms.se/
@@ -55,14 +58,15 @@
 
 Package: xmms2
 Architecture: all
-Depends: ${misc:Depends},
+Depends: xmms2-client-cli,
          xmms2-core,
-         xmms2-client-cli,
-         xmms2-plugin-vorbis,
-         xmms2-plugin-mad,
-         xmms2-plugin-id3v2,
+         xmms2-icon,
          xmms2-plugin-alsa [!kfreebsd-i386 !kfreebsd-amd64],
-         xmms2-plugin-oss [kfreebsd-i386 kfreebsd-amd64]
+         xmms2-plugin-id3v2,
+         xmms2-plugin-mad,
+         xmms2-plugin-oss [kfreebsd-i386 kfreebsd-amd64],
+         xmms2-plugin-vorbis,
+         ${misc:Depends}
 Conflicts: xmms2-plugin-nulstripper
 Replaces: xmms2-plugin-nulstripper
 Description: Client/server based media player system
@@ -77,52 +81,52 @@
 
 Package: xmms2-plugin-all
 Architecture: all
-Depends: ${misc:Depends},
-         xmms2-plugin-curl,
-         xmms2-plugin-smb,
-         xmms2-plugin-mms,
-         xmms2-plugin-vorbis,
-         xmms2-plugin-flac,
-         xmms2-plugin-faad,
-         xmms2-plugin-modplug,
-         xmms2-plugin-mad,
-         xmms2-plugin-musepack,
-         xmms2-plugin-avcodec,
-         xmms2-plugin-wma,
-         xmms2-plugin-sid,
-         xmms2-plugin-oss,
+Depends: xmms2-plugin-airplay,
          xmms2-plugin-alsa [!kfreebsd-i386 !kfreebsd-amd64],
-         xmms2-plugin-jack,
-         xmms2-plugin-id3v2,
-         xmms2-plugin-icymetaint,
-         xmms2-plugin-daap,
-         xmms2-plugin-ices,
-         xmms2-plugin-vocoder,
          xmms2-plugin-ao,
-         xmms2-plugin-mp4,
-         xmms2-plugin-xml,
-         xmms2-plugin-xspf,
+         xmms2-plugin-apefile,
+         xmms2-plugin-asf,
+         xmms2-plugin-asx,
+         xmms2-plugin-avcodec,
          xmms2-plugin-cdda,
          xmms2-plugin-cue,
-         xmms2-plugin-pls,
-         xmms2-plugin-asx,
-         xmms2-plugin-rss,
+         xmms2-plugin-curl,
+         xmms2-plugin-daap,
+         xmms2-plugin-faad,
+         xmms2-plugin-flac,
+         xmms2-plugin-flv,
+         xmms2-plugin-gme,
+         xmms2-plugin-gvfs,
+         xmms2-plugin-html,
+         xmms2-plugin-ices,
+         xmms2-plugin-icymetaint,
+         xmms2-plugin-id3v2,
+         xmms2-plugin-jack,
+         xmms2-plugin-karaoke,
          xmms2-plugin-m3u,
-         xmms2-plugin-ofa,
-         xmms2-plugin-asf,
+         xmms2-plugin-mad,
+         xmms2-plugin-mms,
+         xmms2-plugin-modplug,
+         xmms2-plugin-mp4,
+         xmms2-plugin-mpg123,
+         xmms2-plugin-musepack,
          xmms2-plugin-normalize,
+         xmms2-plugin-ofa,
+         xmms2-plugin-oss,
+         xmms2-plugin-pls,
          xmms2-plugin-pulse,
-         xmms2-plugin-karaoke,
-         xmms2-plugin-airplay,
+         xmms2-plugin-rss,
+         xmms2-plugin-sid,
+         xmms2-plugin-smb,
          xmms2-plugin-speex,
-         xmms2-plugin-gme,
-         xmms2-plugin-gvfs,
-         xmms2-plugin-flv,
-         xmms2-plugin-html,
-         xmms2-plugin-apefile,
          xmms2-plugin-tta,
-         xmms2-plugin-mpg123,
-         xmms2-plugin-wavpack
+         xmms2-plugin-vocoder,
+         xmms2-plugin-vorbis,
+         xmms2-plugin-wavpack,
+         xmms2-plugin-wma,
+         xmms2-plugin-xml,
+         xmms2-plugin-xspf,
+         ${misc:Depends}
 Description: XMMS2 - all plugins
  This is a metapackage depending on all available XMMS2 plugins to make
  installation easier.
@@ -130,9 +134,9 @@
 Package: xmms2-dev
 Architecture: all
 Section: libdevel
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         pkg-config
+Depends: pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - plugin development files
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -167,6 +171,17 @@
  This package contains a small program that (anonymously) reports back
  information on your computer and xmms2 configuration to the xmms2 developers.
 
+Package: xmms2-icon
+Architecture: all
+Conflicts: xmms2-core (<= 0.6DrMattDestruction-1)
+Description: XMMS2 - icon package
+ XMMS2 is a redesign of the XMMS music player. It features a client-server
+ model, allowing multiple (even simultaneous!) user interfaces, both textual
+ and graphical. All common audio formats are supported using plugins. On top of
+ this, there is a flexible media library to organize your music.
+ .
+ This package just contains the icon files.
+
 Package: libxmmsclient5
 Architecture: any
 Section: libs
@@ -189,11 +204,11 @@
 Package: libxmmsclient-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libxmmsclient5,
+Depends: libxmmsclient5,
+         pkg-config,
          xmms2-dev,
-         pkg-config
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - client library devel files
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -218,12 +233,12 @@
 Package: libxmmsclient-glib-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libxmmsclient-glib1,
+Depends: libglib2.0-dev,
          libxmmsclient-dev,
-         libglib2.0-dev,
-         pkg-config
+         libxmmsclient-glib1,
+         pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - glib client library - development files
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -253,12 +268,12 @@
 Package: libxmmsclient++-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: libboost-signals-dev,
          libxmmsclient++3,
          libxmmsclient-dev,
-         libboost-signals-dev,
-         pkg-config
+         pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - client library for c++ - development files
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -284,12 +299,12 @@
 Package: libxmmsclient++-glib-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: libxmmsclient++-dev,
          libxmmsclient++-glib1,
-         libxmmsclient++-dev,
          libxmmsclient-glib-dev,
-         pkg-config
+         pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - glib client library for c++ - development files
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -301,11 +316,11 @@
 
 Package: libxmmsclient-ruby
 Architecture: all
-Section: interpreters
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libxmmsclient-ruby1.8,
-         ruby
+Section: ruby
+Depends: libxmmsclient-ruby1.8,
+         ruby,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - Ruby client library
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -320,10 +335,10 @@
 
 Package: libxmmsclient-ruby1.8
 Architecture: any
-Section: interpreters
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ruby1.8
+Section: ruby
+Depends: ruby1.8,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - Ruby bindings
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -339,8 +354,8 @@
 Architecture: any
 Section: python
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${python:Depends}
+         ${python:Depends},
+         ${shlibs:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: XMMS2 - Python bindings
@@ -364,17 +379,17 @@
 
 Package: xmms2-client-avahi
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - avahi client
  This package contains the avahi client.
 
 Package: xmms2-client-medialib-updater
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - medialib-updater client
  The media library is where XMMS2 stores metadata about files as it plays them.
  Having a media library allows XMMS2 to 'remember' the songs it has played, and
@@ -385,55 +400,56 @@
 
 Package: xmms2-plugin-curl
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
-Recommends: xmms2-plugin-icymetaint, xmms2-plugin-mad
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: xmms2-plugin-icymetaint,
+            xmms2-plugin-mad
 Enhances: xmms2-core
 Description: XMMS2 - curl transport for HTTP
  This package contains a HTTP transport for xmms2.
 
 Package: xmms2-plugin-smb
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - Samba transport
  This package contains a Samba transport for xmms2.
 
 Package: xmms2-plugin-mms
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - MMS transport
  THis package contains an MMS transport for xmms2.
 
 Package: xmms2-plugin-vorbis
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - vorbis decoder
  This package enables ogg-vorbis decoding for xmms2.
 
 Package: xmms2-plugin-flac
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - flac decoder
  This package enables flac decoding for xmms2.
 
 Package: xmms2-plugin-faad
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Recommends: xmms2-plugin-mp4
 Description: XMMS2 - faad decoder
@@ -443,18 +459,18 @@
 
 Package: xmms2-plugin-modplug
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - modplug decoder
  This package enables modplug decoding for xmms2.
 
 Package: xmms2-plugin-mad
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: xmms2-plugin-id3v2
 Enhances: xmms2-core
 Description: XMMS2 - libmad based mp3 decoder
@@ -462,18 +478,18 @@
 
 Package: xmms2-plugin-musepack
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - mpc decoder
  This package enables musepack (mpc) decoding for xmms2.
 
 Package: xmms2-plugin-avcodec
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Recommends: xmms2-plugin-asf, xmms2-plugin-mp4
 Replaces: xmms2-plugin-avformat
@@ -484,10 +500,10 @@
 
 Package: xmms2-plugin-wma
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-plugin-asf (= ${binary:Version}),
-         xmms2-plugin-avcodec (= ${binary:Version})
+Depends: xmms2-plugin-asf (= ${binary:Version}),
+         xmms2-plugin-avcodec (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - wma decoder
  This is a transitional package that depends on all plugins required for
@@ -497,64 +513,64 @@
 
 Package: xmms2-plugin-sid
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - libsidplay2 based decoder
  This package enables decoding for tunes from C64 and C128.
 
 Package: xmms2-plugin-oss
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - OSS output
  This package enables OSS output for xmms2.
 
 Package: xmms2-plugin-alsa
 Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m32r m68k mips mipsel powerpc s390 sparc
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - ALSA output
  This package enables ALSA output for xmms2.
 
 Package: xmms2-plugin-jack
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - JACK output
  This package enables JACK output for xmms2.
 
 Package: xmms2-plugin-id3v2
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - ID3v2 plugin
  This package enables handling of ID3v2 tag containers.
 
 Package: xmms2-plugin-icymetaint
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
-         xmms2-plugin-curl
+Depends: xmms2-core (= ${binary:Version}),
+         xmms2-plugin-curl,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - shoutcast metadata plugin
  This package allows to decode and use shoutcast stream metadata in xmms2.
 
 Package: xmms2-plugin-daap
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - daap plugin
  This package contains a plugin which allows you to share your media
@@ -562,39 +578,39 @@
 
 Package: xmms2-plugin-ices
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - ogg streaming output
  This package contains an output plugin for ogg/vorbis streaming.
 
 Package: xmms2-plugin-vocoder
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - vocoder plugin
  This package contains a phase vocoder effect plugin.
 
 Package: xmms2-plugin-ao
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - libao output plugin
  This package enables libao output for xmms2.
 
 Package: xmms2-plugin-mp4
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core,
-          xmms2-plugin-faad,
-          xmms2-plugin-avcodec
+          xmms2-plugin-avcodec,
+          xmms2-plugin-faad
 Description: XMMS2 - MPEG-4 plugin
  This package enables decoding of data inside of mp4 containers for xmms2.
  Together with xmms2-plugin-faad it's possible to decode .mp4 fieles. Combined
@@ -602,9 +618,9 @@
 
 Package: xmms2-plugin-xml
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - XML plugin
  This package allows xmms2 to read XML based formats. This package is used by
@@ -613,74 +629,74 @@
 
 Package: xmms2-plugin-xspf
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
-         xmms2-plugin-xml (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         xmms2-plugin-xml (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - XSPF playist plugin
  This package enables xmms2 to read XSPF playlists.
 
 Package: xmms2-plugin-cdda
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - CDDA plugin
  This package enables audio CD playback for xmms2.
 
 Package: xmms2-plugin-cue
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - CUE playlist plugin
  This package enables xmms2 to read cue files.
 
 Package: xmms2-plugin-pls
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - PLS playlist plugin
  This package enables xmms2 to read pls playlists.
 
 Package: xmms2-plugin-asx
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - ASX playlist plugin
  This package enables xmms2 to read asx playlists.
 
 Package: xmms2-plugin-rss
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
-         xmms2-plugin-xml (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         xmms2-plugin-xml (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - RSS podcast plugin
  This package enables xmms2 to use podcast rss feeds as playlists.
 
 Package: xmms2-plugin-m3u
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - M3U playlist plugin
  This package enables xmms2 to read M3U playlists.
 
 Package: xmms2-plugin-ofa
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - OFA plugin
  This package enables xmms2 to calcuate Open Fingerprint Architecture (OFA)
@@ -688,73 +704,73 @@
 
 Package: xmms2-plugin-asf
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - ASF plugin
  This plugin enables Advanced Systems Format decoding for xmms2.
 
 Package: xmms2-plugin-normalize
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - Normalize plugin
  This plugin enables volume normalization for xmms2.
 
 Package: xmms2-plugin-pulse
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - pulseaudio output plugin
  This package enables pulseaudio output for xmms2.
 
 Package: xmms2-plugin-karaoke
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - karaoke plugin
  Voice removal effect plugin for xmms2.
 
 Package: xmms2-plugin-airplay
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - airplay output plugin
  This package enables airplay output for xmms2.
 
 Package: xmms2-plugin-speex
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - speex decoder
  This package enables speex decoding for xmms2.
 
 Package: xmms2-plugin-gme
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version})
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - gme plugin
  Game Music Emulator music decoder for xmms2.
 
 Package: xmms2-plugin-gvfs
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: gvfs-backends,
          xmms2-core (= ${binary:Version}),
-         gvfs-backends
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - gvfs plugin
  Glib virtual filesystem trasport for xmms2.
@@ -763,8 +779,8 @@
 Architecture: any
 Section: perl
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${perl:Depends}
+         ${perl:Depends},
+         ${shlibs:Depends}
 Description: XMMS2 - perl client library
  XMMS2 is a redesign of the XMMS music player. It features a client-server
  model, allowing multiple (even simultaneous!) user interfaces, both textual
@@ -784,45 +800,45 @@
 
 Package: xmms2-plugin-flv
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - flv plugin
  This package enables audio extraction from Flash Video files for xmms2.
 
 Package: xmms2-plugin-html
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - html playlist plugin
  This package enables loading html playlists for xmms2.
 
 Package: xmms2-plugin-apefile
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - apefile decoder plugin
  This package enables Monkey's Audio file decoding for xmms2.
 
 Package: xmms2-plugin-tta
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - TTA decoder plugin
  This package enables True Audio file decoding for xmms2.
 
 Package: xmms2-plugin-mpg123
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: xmms2-plugin-id3v2
 Enhances: xmms2-core
 Description: XMMS2 - libmpg123 based mp3 decoder
@@ -830,9 +846,9 @@
 
 Package: xmms2-plugin-wavpack
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         xmms2-core (= ${binary:Version}),
+Depends: xmms2-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Enhances: xmms2-core
 Description: XMMS2 - wavpack decoder plugin
  This package enables wavpack decoding for xmms2.
reverted:
--- xmms2-0.6DrMattDestruction/debian/xmms2-client-avahi.lintian-overrides
+++ xmms2-0.6DrMattDestruction.orig/debian/xmms2-client-avahi.lintian-overrides
@@ -1 +0,0 @@
-xmms2-client-avahi: manpage-has-errors-from-man usr/share/man/man1/xmms2-mdns-avahi.1.gz 75: warning: can't find numbered character 246
diff -u xmms2-0.6DrMattDestruction/debian/python-xmmsclient.install xmms2-0.6DrMattDestruction/debian/python-xmmsclient.install
--- xmms2-0.6DrMattDestruction/debian/python-xmmsclient.install
+++ xmms2-0.6DrMattDestruction/debian/python-xmmsclient.install
@@ -1,2 +1 @@
-usr/lib/python2.4/site-packages/*
-usr/lib/python2.5/site-packages/*
+usr/lib/python*/*-packages/*
diff -u xmms2-0.6DrMattDestruction/debian/xmms2-core.install xmms2-0.6DrMattDestruction/debian/xmms2-core.install
--- xmms2-0.6DrMattDestruction/debian/xmms2-core.install
+++ xmms2-0.6DrMattDestruction/debian/xmms2-core.install
@@ -13 +12,0 @@
-usr/share/pixmaps/*
reverted:
--- xmms2-0.6DrMattDestruction/debian/xmms2-core.lintian-overrides
+++ xmms2-0.6DrMattDestruction.orig/debian/xmms2-core.lintian-overrides
@@ -1,2 +0,0 @@
-xmms2-core: manpage-has-errors-from-man usr/share/man/man1/xmms2d.1.gz 171: warning: can't find numbered character 246
-xmms2-core: manpage-has-errors-from-man usr/share/man/man1/xmms2-launcher.1.gz 107: warning: can't find numbered character 246
diff -u xmms2-0.6DrMattDestruction/debian/rules xmms2-0.6DrMattDestruction/debian/rules
--- xmms2-0.6DrMattDestruction/debian/rules
+++ xmms2-0.6DrMattDestruction/debian/rules
@@ -35,7 +35,7 @@
 clean1:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp install-stamp build-python2.4 build-python2.5 install-default
+	rm -f build-stamp install-stamp $(PYVERS:%=build-python%) install-default
 	-./waf distclean
 	rm -rf \
 		_build_ \
@@ -90,7 +90,7 @@
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i README TODO AUTHORS
-	dh_installchangelogs -i
+	dh_installchangelogs -i ChangeLog
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -102,7 +102,7 @@
 	dh_testdir -s
 	dh_testroot -s
 	dh_installdocs -s README TODO AUTHORS
-	dh_installchangelogs -s
+	dh_installchangelogs -s ChangeLog
 	dh_link -s
 	dh_strip -s
 	dh_compress -s
reverted:
--- xmms2-0.6DrMattDestruction/debian/xmms2-client-cli.lintian-overrides
+++ xmms2-0.6DrMattDestruction.orig/debian/xmms2-client-cli.lintian-overrides
@@ -1 +0,0 @@
-xmms2-client-cli: manpage-has-errors-from-man usr/share/man/man1/xmms2.1.gz 383: warning: can't find numbered character 246
only in patch2:
unchanged:
--- xmms2-0.6DrMattDestruction.orig/.gitignore
+++ xmms2-0.6DrMattDestruction/.gitignore
@@ -8,3 +8,6 @@
 *.orig
 *.rej
 \#*\#
+install-*
+_build_*
+build-*
only in patch2:
unchanged:
--- xmms2-0.6DrMattDestruction.orig/debian/.gitignore
+++ xmms2-0.6DrMattDestruction/debian/.gitignore
@@ -0,0 +1,29 @@
+!xmms2-plugin-*.*
+xmms2
+xmms2-plugin-*
+*.log
+*.substvars
+*.debhelper
+files
+libaudio-xmmsclient-perl/
+libxmmsclient++-dev/
+libxmmsclient++-glib-dev/
+libxmmsclient++-glib1/
+libxmmsclient++3/
+libxmmsclient-dev/
+libxmmsclient-glib-dev/
+libxmmsclient-glib1/
+libxmmsclient-ruby/
+libxmmsclient-ruby1.8/
+libxmmsclient5/
+python-xmmsclient/
+tmp/
+xmms2-client-avahi/
+xmms2-client-cli/
+xmms2-client-medialib-updater/
+xmms2-client-nycli/
+xmms2-client-vis/
+xmms2-core/
+xmms2-dev/
+xmms2-et/
+xmms2-icon/
only in patch2:
unchanged:
--- xmms2-0.6DrMattDestruction.orig/debian/watch
+++ xmms2-0.6DrMattDestruction/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/xmms2/xmms2-(.*)\.tar\.bz2
only in patch2:
unchanged:
--- xmms2-0.6DrMattDestruction.orig/debian/xmms2-icon.install
+++ xmms2-0.6DrMattDestruction/debian/xmms2-icon.install
@@ -0,0 +1 @@
+usr/share/pixmaps/*

Attachment: signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil


Reply to: