diff --git a/debian/changelog b/debian/changelog index 4058760..f1875b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,12 @@ dvdisaster (0.79.6-1) experimental; urgency=medium -- Carlos Maddela Thu, 21 Dec 2017 05:51:54 +1100 +dvdisaster (0.79.5-8) unstable; urgency=medium + + * Fix parallel build of locale strings. + + -- Carlos Maddela Fri, 01 Feb 2019 23:03:13 +1100 + dvdisaster (0.79.5-7) unstable; urgency=medium * Add debian/gbp.conf to conform with DEP14 conventions. diff --git a/debian/patches/36-fix-parallelism.patch b/debian/patches/36-fix-parallelism.patch new file mode 100644 index 0000000..542ea58 --- /dev/null +++ b/debian/patches/36-fix-parallelism.patch @@ -0,0 +1,54 @@ +From: Carlos Maddela +Date: Fri, 1 Feb 2019 22:28:18 +1100 +Subject: Fix parallel build of locale strings. + +Description: Fix parallel build of locale strings. +Author: Carlos Maddela +Forwarded: no +Last-Update: 2019-02-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + GNUmakefile.template | 1 + + locale/create-makefile | 10 +++++++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/GNUmakefile.template b/GNUmakefile.template +index 4509c48..3aae04e 100644 +--- a/GNUmakefile.template ++++ b/GNUmakefile.template +@@ -297,6 +297,7 @@ clean: + rm -f simple-md5sum + $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean; + $(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean; ++ $(MAKE) --no-print-directory -C $(SRCDIR)/locale clean; + + BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3` + arch: archclean time-stamp +diff --git a/locale/create-makefile b/locale/create-makefile +index 5ed31ed..83a4abf 100644 +--- a/locale/create-makefile ++++ b/locale/create-makefile +@@ -30,15 +30,19 @@ locale: \$(LOCALEFILES) + + # Create the locale files. + ++messages.pot: \$(CFILES) ++ @cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP) ++ ++clean: ++ rm -f messages.pot ++ + EOF + + for i in $prefixes; do + cat >> Makefile <