[SCM] rtmpdump/master: Include files from dpkg-dev for DEB_ variables

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Mon Jan 18 20:55:31 UTC 2016


The following commit has been merged in the master branch:
commit 1f88585ffa72ef383cb44de2ff3651ab9fea408d
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Mon Jan 18 21:39:25 2016 +0100

    Include files from dpkg-dev for DEB_ variables

diff --git a/debian/control b/debian/control
index d0503e9..e3f30b3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Sebastian Dröge <slomo at debian.org>,
            Sebastian Ramacher <sramacher at debian.org>
 Build-Depends:
- debhelper (>= 9~),
+ debhelper (>= 9),
  libgmp-dev,
  libgnutls28-dev (>= 2.4.1),
  nettle-dev,
diff --git a/debian/rules b/debian/rules
index 741cc34..5ac6a51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,28 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildflags.mk
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-MAKEVARS=prefix=/usr CRYPTO=GNUTLS libdir=/usr/lib/$(DEB_HOST_MULTIARCH) XCFLAGS="$(CFLAGS) $(CPPFLAGS)" XLDFLAGS="$(LDFLAGS)"
+MAKEVARS= \
+	prefix=/usr \
+	CRYPTO=GNUTLS \
+	libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+	XCFLAGS="$(CFLAGS) $(CPPFLAGS)" \
+	XLDFLAGS="$(LDFLAGS)"
 
-
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	MAKEVARS += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
 endif
 
+%:
+	dh $@
+
 override_dh_auto_build:
 	dh_auto_build -- $(MAKEVARS)
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKEVARS)
 
-override_dh_auto_clean:
-	rm -rf get-orig-source
-	dh_auto_clean
-
 get-orig-source:
 	debian/get-git-source.sh
-
-%:
-	dh $@

-- 
rtmpdump packaging



More information about the pkg-multimedia-commits mailing list