Control: tags 905813 + pending
Dear maintainer,
I've prepared an NMU for orc (versioned as 1:0.4.28-3.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru orc-0.4.28/debian/changelog orc-0.4.28/debian/changelog
--- orc-0.4.28/debian/changelog 2018-09-27 13:44:57.000000000 +0000
+++ orc-0.4.28/debian/changelog 2019-01-02 11:00:22.000000000 +0000
@@ -1,3 +1,18 @@
+orc (1:0.4.28-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Niels Thykier ]
+ * Set Rules-Requires-Root to no because orc does not need
+ (fake)root for building the binary package.
+ * Pass --parallel to dh to support using multiple cores when
+ building the package.
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: Use debhelpers meson buildsystem. (Closes: #905813)
+
+ -- Niels Thykier <ni...@thykier.net> Wed, 02 Jan 2019 11:00:22 +0000
+
orc (1:0.4.28-3) unstable; urgency=medium
[ Hugh McMaster ]
diff -Nru orc-0.4.28/debian/control orc-0.4.28/debian/control
--- orc-0.4.28/debian/control 2018-09-27 13:44:55.000000000 +0000
+++ orc-0.4.28/debian/control 2019-01-02 10:56:45.000000000 +0000
@@ -8,6 +8,7 @@
meson (>= 0.41.0),
pkg-config,
gtk-doc-tools
+Rules-Requires-Root: no
Standards-Version: 3.9.3
Homepage: https://cgit.freedesktop.org/gstreamer/orc
Vcs-Git: https://salsa.debian.org/gstreamer-team/orc.git
diff -Nru orc-0.4.28/debian/rules orc-0.4.28/debian/rules
--- orc-0.4.28/debian/rules 2017-11-20 16:40:44.000000000 +0000
+++ orc-0.4.28/debian/rules 2019-01-02 10:58:46.000000000 +0000
@@ -2,35 +2,32 @@
include /usr/share/dpkg/default.mk
-export MAKE = ninja -v
-
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
%:
- dh $@
+ dh $@ --buildsystem=meson --parallel
override_dh_auto_configure:
if test -r /proc/cpuinfo; then \
cat /proc/cpuinfo; \
fi
- mkdir -p deb-build && meson --buildtype plain --prefix /usr
--default-library shared . deb-build
- mkdir -p deb-build-static && meson --buildtype plain --prefix /usr
--default-library static -Db_staticpic=true -Ddisable_gtkdoc=true
-Ddisable_tests=true . deb-build-static
+ dh_auto_configure --builddirectory=deb-build -- --default-library shared
+ dh_auto_configure --builddirectory=deb-build-static --
--default-library=static -Db_staticpic=true -Ddisable_gtkdoc=true
-Ddisable_tests=true
override_dh_auto_build:
- $(MAKE) -C deb-build all
- $(MAKE) -C deb-build-static all
+ dh_auto_build --builddirectory=deb-build
+ dh_auto_build --builddirectory=deb-build-static
override_dh_auto_clean:
rm -rf deb-build deb-build-static
dh_auto_clean
override_dh_auto_install:
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C deb-build install
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C deb-build-static install
- dh_auto_install
+ dh_auto_install --builddirectory=deb-build
+ dh_auto_install --builddirectory=deb-build-static
override_dh_auto_test:
- $(MAKE) -C deb-build test || true
+ dh_auto_test --builddirectory=test || true
override_dh_strip:
dh_strip -pliborc-0.4-0 --dbg-package=liborc-0.4-0-dbg
