From: Sebastian Ramacher Date: Sun, 20 Sep 2020 17:19:15 +0000 (+0200) Subject: Bump to debhelper compat 13 X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1~1^2~35^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=840ab612416252c59cd64032269c7c0b9caab0ec;p=gpac.git Bump to debhelper compat 13 --- diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 62cdbf0..62779cf 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Reinhard Tartler , Alessio Treglia Build-Depends: - debhelper (>= 10~), + debhelper-compat (= 13), freeglut3-dev, liba52-0.7.4-dev, libasound2-dev, diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000..d762163 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,2 @@ +usr/share/gpac/gui +usr/share/gpac/shaders diff --git a/debian/rules b/debian/rules index 5f067a5..58e060b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,13 @@ #!/usr/bin/make -f -export REPACK_SH=$(CURDIR)/debian/repack.sh - -export GPAC_BASE_VER ?= $(shell dpkg-parsechangelog | sed -n 's/Version: \([0-9.]*\)\+.*/\1/p') -export GPAC_GIT_REVISION ?= $(shell dpkg-parsechangelog | grep Version | sed 's/Version:.*+svn\([0-9]\+\).*/\1/') +include /usr/share/dpkg/architecture.mk +include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/pkg-info.mk ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) DEB_CONFIGURE_EXTRA_FLAGS = --disable-opt endif -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH -DEB_CFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CFLAGS) -DEB_LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS) - %: dh $@ @@ -21,14 +16,14 @@ override_dh_auto_configure: --prefix=/usr \ --libdir=lib/$(DEB_HOST_MULTIARCH) \ --mandir=\$${prefix}/share/man \ - --extra-cflags="-Wall -fPIC -DPIC -I/usr/include/mozjs -DXP_UNIX $(DEB_CFLAGS)" \ - --extra-ldflags="$(DEB_LDFLAGS)" \ + --extra-cflags="-Wall -fPIC -DPIC -I/usr/include/mozjs -DXP_UNIX $(CPPFLAGS) $(CFLAGS)" \ + --extra-ldflags="$(LDFLAGS)" \ --enable-joystick \ --enable-debug \ --disable-ssl \ --verbose \ $(DEB_EXTRA_CONFIGURE_FLAGS) - echo "#define GPAC_GIT_REVISION \"$(GPAC_GIT_REVISION)\"" > include/gpac/revision.h + echo "#define GPAC_GIT_REVISION \"$(DEB_VERSION)\"" > include/gpac/revision.h # workaround broken libav detection sed -i 's,CONFIG_LIBAV=no,CONFIG_LIBAV=yes,' config.mak