[SCM] libmusicbrainz/master: Merge branch 'experimental'

[sramacher at users.alioth.debian.org]

Major package clean up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d923fa31400d2cd723999aca28e568cb63e8d10d
X-Git-Newrev: 22be18ae6da076621dea3727485eb899b3669437

The following commit has been merged in the master branch:
commit 90325ddd3723ddf1bbec99f2039191e72f44ef7c
Merge: d923fa31400d2cd723999aca28e568cb63e8d10d 11c277d8e3c9d144ccb40aa3f85082aec5fc4288
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Apr 25 18:01:29 2015 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 1e92c94,3efb3b5..d315347
--- a/debian/control
+++ b/debian/control
@@@ -2,25 -2,29 +2,29 @@@ Source: libmusicbrainz
  Priority: optional
  Maintainer: Debian Multimedia Team <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Sebastian Ramacher <sramacher at debian.org>
- Build-Depends: debhelper (>= 9.20120417),
+ Build-Depends:
+  debhelper (>= 9.20120417),
   cmake,
-  libneon27-gnutls-dev| libneon-dev,
-  libxml2-dev,
-  doxygen,
- Standards-Version: 3.9.3
+  libneon27-gnutls-dev | libneon-dev,
+  libxml2-dev
+ Build-Depends-Indep:
+  doxygen
+ Standards-Version: 3.9.6
  Section: libs
  Homepage: http://musicbrainz.org/doc/libmusicbrainz
 -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libmusicbrainz.git -b experimental
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libmusicbrainz.git
 +Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libmusicbrainz.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/libmusicbrainz.git
  
  Package: libmusicbrainz5-dev
  Section: libdevel
  Architecture: any
- Depends: ${misc:Depends},
+ Depends:
+  ${misc:Depends},
   libmusicbrainz5-1 (= ${binary:Version}),
-  libneon27-gnutls-dev| libneon-dev,
+  libneon27-gnutls-dev | libneon-dev,
   libxml2-dev
- Suggests: libmusicbrainz5-doc,
+ Suggests:
+  libmusicbrainz5-doc
  Description: Library to access the MusicBrainz.org database (development files)
   MusicBrainz is a community music metadatabase that attempts to create a
   comprehensive music information site.
@@@ -30,8 -34,9 +34,9 @@@
  Package: libmusicbrainz5-doc
  Section: doc
  Architecture: all
- Depends: ${misc:Depends},
-  libjs-jquery,
+ Depends:
+  ${misc:Depends},
+  libjs-jquery
  Description: Library to access the MusicBrainz.org database (developer documentation)
   MusicBrainz is a community music metadatabase that attempts to create a
   comprehensive music information site.
@@@ -40,8 -45,11 +45,11 @@@
  
  Package: libmusicbrainz5-1
  Architecture: any
- Pre-Depends: ${misc:Pre-Depends},
- Depends: ${shlibs:Depends}, ${misc:Depends},
+ Pre-Depends:
+  ${misc:Pre-Depends},
+ Depends:
+  ${shlibs:Depends},
+  ${misc:Depends}
  Multi-Arch: same
  Description: Library to access the MusicBrainz.org database
   MusicBrainz is a community music metadatabase that attempts to create a

-- 
Library to access the MusicBrainz.org database