[SCM] libcoverart/master: Use out of tree build

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Jul 6 19:45:51 UTC 2015


The following commit has been merged in the master branch:
commit 564cdb33559f1d6bb455207fa4ae832c73d70f78
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jul 6 20:59:09 2015 +0200

    Use out of tree build

diff --git a/debian/libcoverart-doc.docs b/debian/libcoverart-doc.docs
index 77f12ae..bdab15d 100644
--- a/debian/libcoverart-doc.docs
+++ b/debian/libcoverart-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..63f03f1
--- /dev/null
+++ b/debian/patches/out-of-tree.patch
@@ -0,0 +1,16 @@
+Description: Fix out of tree install
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: https://github.com/metabrainz/libcoverart/pull/9
+Last-Update: 2015-07-06
+
+--- libcoverart-1.0.0+git20150706.orig/CMakeLists.txt
++++ libcoverart-1.0.0+git20150706/CMakeLists.txt
+@@ -48,7 +48,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ 
+ FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/coverart/*.h)
+-INSTALL(FILES ${headers} include/coverart/caa_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/coverart)
++INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/coverart/caa_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/coverart)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcoverartcc.pc ${CMAKE_CURRENT_BINARY_DIR}/libcoverart.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ 
+ ADD_SUBDIRECTORY(src)
diff --git a/debian/patches/series b/debian/patches/series
index cd736eb..9f486af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-unused-code.patch
 PATH_MAX.patch
+out-of-tree.patch
diff --git a/debian/rules b/debian/rules
index 6bbb34b..70c6d74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,31 +3,15 @@
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 %:
-	dh $@ --parallel --builddirectory=$(CURDIR)
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf docs
-	# This needs to be fixed in upstream's build system.
-	rm -f CMakeCache.txt \
-		Doxyfile \
-		Makefile \
-		config.h \
-		install_manifest.txt \
-		libcoverart.pc \
-		ImportExecutables.cmake
-	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=/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_build-indep:
-	$(MAKE) docs
-	rm docs/jquery.js
-	ln -s /usr/share/javascript/jquery/jquery.js docs/jquery.js
+	dh_auto_build -- docs
+	find obj-*/docs -name jquery.js -delete
 
 override_dh_auto_test-indep override_dh_auto_install-indep:
 	# no tests and install for indep

-- 
libcoverart packaging



More information about the pkg-multimedia-commits mailing list