[SCM] gmusicbrowser/master: Merge commit 'upstream/1.1.8', solved many conflicts.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Oct 27 00:23:08 UTC 2011


Imported Upstream version 1.1.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: af8c144b5f1d253c203f5485a376caa4941f1c70
X-Git-Newrev: 4f0f185b7fa8f4c0b0dd3988fa921a8627d04fb2

The following commit has been merged in the master branch:
commit 4f0f185b7fa8f4c0b0dd3988fa921a8627d04fb2
Merge: af8c144b5f1d253c203f5485a376caa4941f1c70 1fcc17aa5350dd09d46c340d8133a4206f77c7a5
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 27 02:21:22 2011 +0200

    Merge commit 'upstream/1.1.8', solved many conflicts.
    
    - debian/control:
      + Suggests on libgnome2-wnck-perl
      + Recommends on
        libcairo-perl
        libdigest-crc-perl
        libhtml-parser-perl
        libio-compress-perl

diff --combined debian/control
index a9b3d15,befcb6b..6c05c6b
--- a/debian/control
+++ b/debian/control
@@@ -1,44 -1,19 +1,49 @@@
  Source: gmusicbrowser
  Section: sound
 -Priority: optional
 -Maintainer: Quentin Sculo <squentin at free.fr>
 -Homepage: http://gmusicbrowser.org/
 -Build-Depends: debhelper (>= 5.0.0)
 -Standards-Version: 3.7.3
 +Priority: extra
 +Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Uploaders: Antonio Radici <antonio at dyne.org>,
 + Alessio Treglia <alessio at debian.org>,
 + Micah Gersten <micahg at ubuntu.com>
 +Build-Depends: debhelper (>= 7.0.50~)
 +Build-Depends-Indep: imagemagick
 +Standards-Version: 3.9.1
 +Homepage: http://www.gmusicbrowser.org/
 +Vcs-Git: git://git.debian.org/git/pkg-multimedia/gmusicbrowser.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gmusicbrowser.git
  
  Package: gmusicbrowser
  Architecture: all
 -Depends: perl, libgtk2-perl, libgtk2.0-0 (>= 2.6)
 -Recommends: liblocale-gettext-perl (>= 1.04), libnet-dbus-perl, libgstreamer-perl, libdigest-crc-perl, libcairo-perl, libhtml-parser-perl, libio-compress-perl
 -Suggests: mplayer, mpg321, vorbis-tools, alsa-utils, libgtk2-mozembed-perl, libgstreamer-interfaces-perl, libgtk2-notify-perl, libgnome2-wnck-perl
 -Description: very customizable jukebox for large collections of music files
 - The interface is extremely customizable. It has easy access to related songs
 - (same artist/album/title), supports multiple genres per song, ratings, and
 - customizable labels. Powerful search system, random mode and mass-tagging
 - dialog. Uses GStreamer, mpg321/ogg123/flac123 or mplayer for playback. 
 -
 +Depends: ${perl:Depends},
 + libgtk2-perl,
 + libgtk2.0-0 (>= 2.6),
 + mpg321 | flac123 | ogg123,
 + ${misc:Depends}
 +Recommends: liblocale-gettext-perl (>= 1.04),
++ libcairo-perl,
++ libdigest-crc-perl,
++ libhtml-parser-perl,
++ libio-compress-perl,
 + libnet-dbus-perl,
 + libgtk2-trayicon-perl,
 + libgtk2-notify-perl,
 + libgstreamer-perl
 +Suggests: mplayer,
 + vorbis-tools,
 + mpg321,
 + alsa-utils,
++ libgnome2-wnck-perl,
 + libgstreamer-interfaces-perl,
 + libgtk2-mozembed-perl
 +Description: graphic jukebox for large collections of mp3/ogg/flac/mpc files
 + gmusicbrower is a powerful graphic browser which supports libraries with
 + a great number of songs (>10,000)
 + .
 + It can use multiple inputs and plays MP3, OGG and flac files; it also supports
 + mass-renaming and mass-retagging of a song library, multiple genres per song,
 + ratings and customizable labels
 + .
 + The window layout is also customizable and it ships natively plugins to use
 + last.fm, retrieve lyrics, find album pictures and WebContext which, through
 + the mozilla/webkit engine will display the wikipedia artist's page and search
 + lyrics with google.

-- 
gmusicbrowser packaging



More information about the pkg-multimedia-commits mailing list