[SCM] frei0r/master: Switched from cdbs to dh-11

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Mon Jan 15 13:43:12 UTC 2018


The following commit has been merged in the master branch:
commit 888df8a74da82c30e20adb514641e52f42d5b405
Author: IOhannes m zmölnig <zmoelnig at umlautS.umlaeute.mur.at>
Date:   Mon Jan 15 14:19:39 2018 +0100

    Switched from cdbs to dh-11

diff --git a/debian/control b/debian/control
index b805327..d07f0ab 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,9 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/frei0r.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/frei0r.git
 Homepage: http://frei0r.dyne.org/
-Build-Depends: cdbs,
- autotools-dev,
- debhelper (>= 10~),
+Build-Depends:
+ debhelper (>= 11~),
  dh-buildinfo,
- dh-autoreconf,
- licensecheck,
  pkg-config,
  libgavl-dev,
  libcairo2-dev,
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 6b6393d..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,77 +0,0 @@
-Source: frei0r
-Section: video
-Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr at jones.dk>,
- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>,
-Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/frei0r.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/frei0r.git
-Homepage: http://frei0r.dyne.org/
-Build-Depends: @cdbs@,
- pkg-config,
- libgavl-dev,
- libcairo2-dev,
- libopencv-dev,
-Build-Depends-Indep: doxygen
-Standards-Version: 4.0.0
-
-Package: frei0r-plugins
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Suggests: opencv-data
-Breaks: frei0r (<= 1.1.22)
-Replaces: frei0r
-Description: minimalistic plugin API for video effects, plugins collection
- frei0r is a minimalistic plugin API for video sources and filters. The
- behavior of the effects can be controlled from the host by simple
- parameters. The intent is to solve the recurring reimplementation or
- adaptation issue of standard effects. It is not meant as a generic API
- for all kinds of video applications.
- .
- frei0r plugins are used by several projects (e.g.: LiVES, Veejay, Open
- Movie Editor, FreeJ, Pure Data Visual Junk Tools, MLT framework).
- .
- This package contains a collection of plugins.
-
-Package: frei0r-plugins-dev
-Section: devel
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
-Breaks: frei0r-dev (<= 1.1.22)
-Replaces: frei0r-dev
-Description: minimalistic plugin API for video effects, header files
- frei0r is a minimalistic plugin API for video sources and filters. The
- behavior of the effects can be controlled from the host by simple
- parameters. The intent is to solve the recurring reimplementation or
- adaptation issue of standard effects. It is not meant as a generic API
- for all kinds of video applications.
- .
- frei0r plugins are used by several projects (e.g.: LiVES, Veejay, Open
- Movie Editor, FreeJ, Pure Data Visual Junk Tools, MLT framework).
- .
- This package contains the header needed to enable frei0r in other
- package at build time.
-
-Package: frei0r-plugins-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends:
- ${misc:Depends},
-Breaks: frei0r-doc (<= 1.1.22)
-Replaces: frei0r-doc
-Description: minimalistic plugin API for video effects, API documentation
- frei0r is a minimalistic plugin API for video sources and filters. The
- behavior of the effects can be controlled from the host by simple
- parameters. The intent is to solve the recurring reimplementation or
- adaptation issue of standard effects. It is not meant as a generic API
- for all kinds of video applications.
- .
- frei0r plugins are used by several projects (e.g.: LiVES, Veejay, Open
- Movie Editor, FreeJ, Pure Data Visual Junk Tools, MLT framework).
- .
- This package contains the API documentation.
diff --git a/debian/rules b/debian/rules
index 9ae621e..10245dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,18 @@
 #!/usr/bin/make -f
 
--include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-# regenerate configure, so that patches to configure.ac take effect
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^((.*\.jpg)|debian/(changelog|copyright(|_hints|_newhints)))$
-
-pkg = $(DEB_SOURCE_PACKAGE)
-pkgdoc = frei0r-plugins-doc
+%:
+	dh $@
 
 # to be used with `debian/rules get-orig-source`
 DEB_UPSTREAM_URL = http://releases.dyne.org/$(pkg)/releases
 DEB_UPSTREAM_PACKAGE = frei0r-plugins
 DEB_UPSTREAM_TARBALL_MD5 = 202375d1bcb545c1b6eb8f34e0260ec5
 
-build/frei0r-plugins-doc::
+override_dh_auto_build-indep:
+	dh_auto_build -i
 	make -C doc/
 
-clean::
+override_dh_clean:
+	dh_clean
 	rm -rf doc/html/
 	rm -f doc/Makefile

-- 
frei0r packaging



More information about the pkg-multimedia-commits mailing list