[SCM] libopenshot/master: Support the nodoc build profile

ghisvail-guest at users.alioth.debian.org ghisvail-guest at users.alioth.debian.org
Tue Jan 31 11:12:08 UTC 2017


The following commit has been merged in the master branch:
commit 9a00ddc002187457c749d859778273cd107ea3da
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jan 31 11:02:13 2017 +0000

    Support the nodoc build profile
    
    - Add versioned build dependency on dpkg-dev
    - Mark documentation b-deps and packages as !nodoc
    - Do not build the documentation if nodoc is requested
    
    Gbp-Dch: full

diff --git a/debian/control b/debian/control
index 7adfcb6..1577bc0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Priority: optional
 Build-Depends: cmake,
                debhelper (>= 10),
                dh-python,
+               dpkg-dev (>= 1.17.14),
                ffmpeg,
                libavcodec-dev,
                libavdevice-dev,
@@ -23,7 +24,7 @@ Build-Depends: cmake,
                qtbase5-dev,
                qtmultimedia5-dev,
                swig
-Build-Depends-Indep: doxygen
+Build-Depends-Indep: doxygen <!nodoc>
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/libopenshot.git/
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/libopenshot.git
@@ -48,7 +49,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: libopenshot9 (= ${binary:Version}),
          ${misc:Depends}
-Suggests: libopenshot-doc
+Suggests: libopenshot-doc <!nodoc>
 Description: development files for the OpenShot video library
  OpenShot Library (libopenshot) is an open-source project dedicated to
  delivering high quality video editing, animation, and playback solutions
@@ -67,6 +68,7 @@ Description: documentation for the OpenShot video library
  to the world. The API currently supports C++, Python, and Ruby.
  .
  This package provides the documentation.
+Build-Profiles: <!nodoc>
 
 Package: python3-openshot
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 254c183..633adf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,12 @@ override_dh_auto_configure:
 		-DUSE_SYSTEM_JSONCPP=ON
 
 override_dh_auto_build-indep:
+ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
 	dh_auto_build -- doc
+endif
 
 override_dh_installdocs-indep:
+ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
 	dh_installdocs --indep
 	dh_doxygen --indep
+endif

-- 
libopenshot packaging



More information about the pkg-multimedia-commits mailing list