[SCM] libmusicbrainz/master: Major package clean up

Sat Apr 25 16:12:54 UTC 2015

The following commit has been merged in the master branch:
commit 11c277d8e3c9d144ccb40aa3f85082aec5fc4288
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Nov 24 22:16:05 2014 +0100

    Major package clean up
    
     - Change to 3.0 (quilt)
     - Use cmake out-of-tree builds
     - Register doc.base file
     - Use parallel builds
     - Bump Standards-Version to 3.9.6

diff --git a/debian/control b/debian/control
index 6eaf270..3efb3b5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,29 @@ Source: libmusicbrainz5
 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: https://anonscm.debian.org/cgit/libmusicbrainz.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/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 @@ Description: Library to access the MusicBrainz.org database (development files)
 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 @@ Description: Library to access the MusicBrainz.org database (developer documenta
 
 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
diff --git a/debian/libmusicbrainz5-doc.doc-base b/debian/libmusicbrainz5-doc.doc-base
new file mode 100644
index 0000000..aa03704
--- /dev/null
+++ b/debian/libmusicbrainz5-doc.doc-base
@@ -0,0 +1,8 @@
+Document: libmusicbrainz5
+Title: libmusicbrainz API documentation
+Abstract: This documentation descriptes libmusicbrainz's API.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/libmusicbrainz5-doc/doc/index.html
+Files: /usr/share/doc/libmusicbrainz5-doc/doc/*.html
diff --git a/debian/libmusicbrainz5-doc.docs b/debian/libmusicbrainz5-doc.docs
index 77f12ae..dd565cc 100644
--- a/debian/libmusicbrainz5-doc.docs
+++ b/debian/libmusicbrainz5-doc.docs
@@ -1 +1 @@
-docs/
+obj-*/docs
diff --git a/debian/patches/out-of-tree.patch b/debian/patches/out-of-tree.patch
new file mode 100644
index 0000000..63f9416
--- /dev/null
+++ b/debian/patches/out-of-tree.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 384cb65..e8d68c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,8 +29,8 @@ SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Install
+ SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc)
+-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
+-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
+ 
+ FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/musicbrainz5/*.h)
+ INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..916b366
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+out-of-tree.patch
diff --git a/debian/rules b/debian/rules
index 29129f6..03aee56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,16 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# Don't build a debug release
-DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_BUILD_TYPE=Release
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_DOCS_ALL += AUTHORS.txt README.txt NEWS.txt
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -f CMakeCache.txt \
-		Doxyfile \
-		Makefile \
-		config.h \
-		install_manifest.txt \
-		libmusicbrainz5.pc
-	rm -rf docs
-	find -name CMakeFiles -print | xargs /bin/rm -rf
-	find -name Makefile -delete
-	find -name cmake_install.cmake -delete
+%:
+	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
 
-override_dh_auto_build:
-	dh_auto_build
-	doxygen
-	rm docs/jquery.js
+override_dh_auto_build-indep:
+	dh_auto_build -- docs
+	rm -f obj-*/docs/jquery.js
+	rm -f obj-*/docs/*.md5
 
-# meh, force building in the pkgroot or it won't build
-%:
-	dh $@ --builddirectory=.
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
Library to access the MusicBrainz.org database

