Removing l10n support for 2.0 branch.

debian/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Live Project <debian-live@lists.debian.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: gettext
 Standards-Version: 3.9.1
 Homepage: http://live.debian.net/devel/live-build/
 Vcs-Browser: http://live.debian.net/gitweb/?p=live-build.git
@@ -15,7 +14,7 @@ Architecture: all
 Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static
 Conflicts: live-helper (<< 2.0~a20)
 Replaces: live-helper
-Recommends: cpio, gettext-base, gnu-fdisk
+Recommends: cpio, gnu-fdisk
 Suggests:
  dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
  squashfs-tools | genext2fs | mtd-tools, sudo | fakeroot, syslinux | grub,

debian/rules

@@ -3,15 +3,8 @@
 %:
 	dh ${@}
 
-override_dh_auto_clean:
-	$(MAKE) -C po clean
-
-override_dh_auto_build:
-	$(MAKE) -C po update-po
-
 override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/live-build install
-	$(MAKE) -C po DESTDIR=$(CURDIR)/debian/live-build install
 
 	mv debian/live-build/usr/share/doc/live-build/ChangeLog.live-package debian/live-build/usr/share/doc/live-build/changelog.live-package
 	mv debian/live-build/usr/share/doc/live-build/ChangeLog.live-webhelper debian/live-build/usr/share/doc/live-build/changelog.live-webhelper

functions/echo.sh

@@ -13,12 +13,7 @@ Echo ()
 	STRING="${1}"
 	shift
 
-	if [ "${_L10N}" = "false" ]
-	then
-		printf "${STRING}\n" "${@}"
-	else
-		printf "$(eval_gettext "${STRING}")" "${@}"; echo;
-	fi
+	printf "${STRING}\n" "${@}"
 }
 
 Echo_debug ()
@@ -28,12 +23,7 @@ Echo_debug ()
 		STRING="${1}"
 		shift
 
-		if [ "${_L10N}" = "false" ]
-		then
-			printf "D: ${STRING}\n" "${@}"
-		else
-			printf "D: $(eval_gettext "${STRING}")" "${@}"; echo;
-		fi
+		printf "D: ${STRING}\n" "${@}"
 	fi
 }
 
@@ -44,12 +34,7 @@ Echo_debug_running ()
 		STRING="${1}"
 		shift
 
-		if [ "${_L10N}" = "false" ]
-		then
-			printf "D: ${STRING}" "${@}"
-		else
-			printf "D: $(eval_gettext "${STRING}")" "${@}"
-		fi
+		printf "D: ${STRING}" "${@}"
 
 		if [ "${_COLOR}" = "false" ]
 		then
@@ -72,12 +57,7 @@ Echo_error ()
 		printf "${RED}E${NO_COLOR}:"
 	fi
 
-	if [ "${_L10N}" = "false" ]
-	then
-		printf " ${STRING}\n" "${@}" >&2
-	else
-		(printf " $(eval_gettext "${STRING}")" "${@}"; echo;) >&2
-	fi
+	printf " ${STRING}\n" "${@}" >&2
 }
 
 Echo_message ()
@@ -94,12 +74,7 @@ Echo_message ()
 			printf "${WHITE}P${NO_COLOR}:"
 		fi
 
-		if [ "${_L10N}" = "false" ]
-		then
-			printf " ${STRING}\n" "${@}"
-		else
-			printf " $(eval_gettext "${STRING}")" "${@}"; echo;
-		fi
+		printf " ${STRING}\n" "${@}"
 	fi
 }
 
@@ -117,12 +92,7 @@ Echo_message_running ()
 			printf "${WHITE}P${NO_COLOR}:"
 		fi
 
-		if [ "${_L10N}" = "false" ]
-		then
-			printf " ${STRING}" "${@}"
-		else
-			printf " $(eval_gettext "${STRING}")" "${@}";
-		fi
+		printf " ${STRING}" "${@}"
 
 		if [ "${_COLOR}" = "false" ]
 		then
@@ -140,12 +110,7 @@ Echo_verbose ()
 		STRING="${1}"
 		shift
 
-		if [ "${_L10N}" = "false" ]
-		then
-			printf "I: ${STRING}\n" "${@}"
-		else
-			printf "I: $(eval_gettext "${STRING}")" "${@}"; echo;
-		fi
+		printf "I: ${STRING}\n" "${@}"
 	fi
 }
 
@@ -156,12 +121,7 @@ Echo_verbose_running ()
 		STRING="${1}"
 		shift
 
-		if [ "${_L10N}" = "false" ]
-		then
-			printf "I: ${STRING}" "${@}"
-		else
-			printf "I: $(eval_gettext "${STRING}")" "${@}";
-		fi
+		printf "I: ${STRING}" "${@}"
 
 		if [ "${_COLOR}" = "false" ]
 		then
@@ -184,12 +144,7 @@ Echo_warning ()
 		printf "${YELLOW}W${NO_COLOR}:"
 	fi
 
-	if [ "${_L10N}" = "false" ]
-	then
-		printf " ${STRING}\n" "${@}"
-	else
-		printf " $(eval_gettext "${STRING}")" "${@}"; echo;
-	fi
+	printf " ${STRING}\n" "${@}"
 }
 
 Echo_status ()

functions/l10n.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-if [ -x "$(which gettext.sh 2>/dev/null)" ] && Find_files /usr/share/locale/*/LC_MESSAGES/${PACKAGE}.mo
-then
-	_L10N="true"
-
-	# gettext domain (.mo file name)
-	TEXTDOMAIN="${PACKAGE}"
-	export TEXTDOMAIN
-
-	# locale dir for gettext codes
-	TEXTDOMAINDIR="/usr/share/locale"
-	export TEXTDOMAINDIR
-
-	# load gettext functions
-	. gettext.sh
-else
-	_L10N="false"
-fi

po/Makefile

@@ -1,39 +0,0 @@
-# Makefile to manage gettext files
-
-DOMAIN=live-helper
-ECHO_FUNCTIONS="Echo_message Echo_verbose Echo_warning Echo_debug Echo_error Echo_breakage Echo"
-
-POFILES=$(wildcard *.po)
-MOFILES=$(patsubst %.po,%.mo,$(POFILES))
-LINGUAS=$(basename $(POFILES))
-GETTEXTFILES=$(shell find ../scripts/build ../functions -type f)
-POTFILE=$(DOMAIN).pot
-DESTDIR=/
-XGETTEXT_KEYWORDS=$(shell echo $(ECHO_FUNCTIONS) |sed -e 's,\S\+,-k&,g')
-
-%.mo: %.po
-	msgfmt --statistics -o $@ $<
-
-%.po: $(DOMAIN).pot
-	msgmerge -U $*.po $(DOMAIN).pot
-
-$(DOMAIN).pot: $(GETTEXTFILES)
-	$(shell xgettext $(XGETTEXT_KEYWORDS) -L Shell -o $(DOMAIN).pot $(GETTEXTFILES))
-
-update-po: live-helper.pot
-	-for lang in $(LINGUAS); do\
-	    msgmerge -U $$lang.po $(DOMAIN).pot; \
-	done
-
-install: $(MOFILES)
-	-for lang in $(LINGUAS); do\
-	    install -d $(DESTDIR)/usr/share/locale/$$lang/LC_MESSAGES/; \
-	    install -m 644 $$lang.mo $(DESTDIR)/usr/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
-	done
-
-all: update-po $(MOFILES)
-
-clean:
-	- rm *.mo *~
-
-.PHONY: update-po