[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=b1bb3b7

The following commit has been merged in the kubuntu_xenial_archive branch:
commit b1bb3b75120ae64379165f5f7004b922e79b9ee2
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Tue Jan 29 08:30:23 2013 +0000

    * Build against mlt version 0.8.8.
    * Migrate package to minimal debhelper rules.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@4279 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog |  2 ++
 compat    |  2 +-
 control   |  6 ++---
 rules     | 90 +++++++++------------------------------------------------------
 4 files changed, 19 insertions(+), 81 deletions(-)

diff --git a/changelog b/changelog
index 5b1eddb..6f133cb 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
 kdenlive (0.9.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Build against mlt version 0.8.8.
+  * Migrate package to minimal debhelper rules.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 29 Jan 2013 09:10:44 +0100
 
diff --git a/compat b/compat
index 7f8f011..ec63514 100644
--- a/compat
+++ b/compat
@@ -1 +1 @@
-7
+9
diff --git a/control b/control
index 9b59455..8d097fb 100644
--- a/control
+++ b/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Patrick Matthäi <pmatthaei at debian.org>
 Homepage: http://www.kdenlive.org/
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
  pkg-config,
  cmake,
  kdelibs5-dev,
- libmlt-dev (>= 0.7.8),
- libmlt++-dev (>= 0.7.8),
+ libmlt-dev (>= 0.8.8),
+ libmlt++-dev (>= 0.8.8),
  libavcodec-dev,
  libavformat-dev,
  libavdevice-dev,
diff --git a/rules b/rules
index 6df3e4b..aa4c0ee 100755
--- a/rules
+++ b/rules
@@ -6,92 +6,28 @@ export DEB_BUILD_HARDENING=1
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-
-ifeq ($(NCPUS),-1)
-	NCPUS:=1
-endif
-
-ifeq ($(NCPUS),0)
-	NCPUS:=1
-endif
-
 EXTRAFLAGS :=
 ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
 	EXTRAFLAGS := -DNO_JOGSHUTTLE=YES
 endif
 
-CMAKE_SYSTEM_PROCESSOR = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+%:
+	dh $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	[ -d build ] || mkdir build
-	cd build && cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH:BOOL=YES $(EXTRAFLAGS)
-	touch $@
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 
-build: build-stamp
-build-stamp: configure
-	dh_testdir
-	cd build && $(MAKE) -j $(NCPUS)
-	touch $@
+override_dh_auto_clean:
+	rm -f $(CURDIR)/debian/kdenlive.menu
+	dh_auto_clean
 
-build-arch: build
-
-build-indep: build
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -rf build
-	rm -rf $(CURDIR)/debian/tmp
-	rm -f $(CURDIR)/kdenlive.menu
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/*/kdenlive/common
 	cp $(CURDIR)/data/kdenlive.menu $(CURDIR)/debian/
-	dh_install --list-missing
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installdirs -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i -- -Zxz
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installmenu -a
-	dh_strip -a --dbg-package=kdenlive-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a -- -Zxz
+	dh_install
 
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@uscan --force-download --destdir ../tarballs
+override_dh_strip:
+	dh_strip --dbg-package=kdenlive-dbg
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_builddeb:
+	dh_builddeb -- -Zxz

-- 
kdenlive packaging