Merge lp:~logan/ubuntu/raring/festival/1-2.1-release-5.1 into lp:ubuntu/raring/festival

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-06 23:35:31 +0000
+++ debian/changelog	2013-01-11 07:19:22 +0000
@@ -1,3 +1,23 @@
+festival (1:2.1~release-5.1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: Drop file-rc as an alternative to sysv-rc, as
+      Ubuntu doesn't support it.
+
+ -- Logan Rosen <[e-mail]>  Fri, 11 Jan 2013 02:10:49 -0500
+
+festival (1:2.1~release-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: does not define DEB_HOST_MULTIARCH":
+    set and export DEB_HOST_MULTIARCH in debian/rules, thanks to Ivo De Decker
+    for the solution.
+    Build-depend on dpkg-dev (>= 1.16.0) to ensure DEB_HOST_MULTIARCH is
+    available.
+    (Closes: #696507)
+
+ -- gregor herrmann <[e-mail]>  Sun, 06 Jan 2013 00:50:19 +0100
+
 festival (1:2.1~release-5ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
 
=== modified file 'debian/control'
--- debian/control	2012-12-06 23:35:31 +0000
+++ debian/control	2013-01-11 07:19:22 +0000
@@ -14,7 +14,8 @@
                libncurses5-dev,
                texinfo,
                quilt,
-               libaudiofile-dev
+               libaudiofile-dev,
+               dpkg-dev (>= 1.16.0)
 Standards-Version: 3.9.3
 Homepage: http://www.cstr.ed.ac.uk/projects/festival/
 Vcs-Git: git://git.debian.org/git/tts/festival.git
 
=== modified file 'debian/rules'
--- debian/rules	2012-12-06 23:35:31 +0000
+++ debian/rules	2013-01-11 07:19:22 +0000
@@ -6,6 +6,9 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_HOST_MULTIARCH
+
 override_dh_auto_configure:
 #Avoid conflicting with upstreams build system