[SCM] live-manual branch, debian, updated. debian/3.0_a10-1-39-g216427c

Daniel Baumann daniel at debian.org
Tue Apr 3 07:21:43 UTC 2012


The following commit has been merged in the debian branch:
commit 41811104effb42127288e16a768cd9f3adee008e
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 30 09:07:54 2012 +0200

    Generating en_US.UTF-8 locale during build in order to fix FTBFS (Closes: #662227, #665067).

diff --git a/debian/control b/debian/control
index 1f78e28..5ec1bb7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Ben Armstrong <synrg at sanctuary.nslug.ns.ca>,
  Daniel Baumann <daniel at debian.org>,
  Chris Lamb <lamby at debian.org>
-Build-Depends: debhelper (>= 9), ruby, ruby-nokogiri
+Build-Depends: debhelper (>= 9), libc-bin, ruby, ruby-nokogiri
 Build-Depends-Indep: sisu-complete (>= 3), po4a
 Standards-Version: 3.9.3
 Homepage: http://live.debian.net/devel/live-manual/
diff --git a/debian/rules b/debian/rules
index 7415fad..56354cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,17 @@
 %:
 	dh ${@}
 
+override_dh_auto_build:
+	mkdir -p debian/build/locale
+	localdef -f UTF-8 -i en_US debian/build/locale/en_US.UTF-8
+
+	LOCPATH=$(CURDIR)/debian/build/locale LC_ALL=en_US.UTF-8 dh_auto_build
+
+override_dh_auto_clean:
+	dh_auto_clean
+
+	rm -rf debian/build
+
 override_dh_builddeb:
 	dh_builddeb -- -Zgzip -z9
 

-- 
live-manual



More information about the debian-live-changes mailing list