DEB tde-i18n: Clean up build rules

+ drop automake support
+ common rule for non-two-letter languages
+ add dh_strip_nondeterminism to support a reproducible build
+ add package for es_AR language

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ad2a19875cce36c79a0ba0a79d10d2c635c116ec)

2 files changed, 27 insertions, 44 deletions

diff --git a/ubuntu/_base/core/tde-i18n/debian/control b/ubuntu/_base/core/tde-i18n/debian/control
index 17925ade8..201f298d1 100644
--- a/ubuntu/_base/core/tde-i18n/debian/control
+++ b/ubuntu/_base/core/tde-i18n/debian/control
@@ -1,5 +1,5 @@
 Source: tde-i18n-trinity
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev, gawk, bzip2, perl, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs14-trinity-dev
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -222,6 +222,16 @@ Description: Spanish (es) internationalized (i18n) files for TDE
  This package contains the Spanish internationalized (i18n) files for
  all TDE core applications.
  
+Package: tde-i18n-esar-trinity
+Architecture: all
+Section: tde
+Depends: tdelibs14-trinity
+Suggests: tde-trinity
+Provides: tde-i18n-trinity
+Description: Spanish (Argentina) (es_AR) internationalized (i18n) files for TDE
+ This package contains the Spanish (Argentina) internationalized (i18n) files for
+ all TDE core applications.
+ 
 Package: tde-i18n-et-trinity
 Architecture: all
 Section: tde
diff --git a/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules
index 0a35582c1..ec0e5be5f 100755
--- a/ubuntu/_base/core/tde-i18n/debian/rules
+++ b/ubuntu/_base/core/tde-i18n/debian/rules
@@ -11,17 +11,13 @@ I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
 # Stamps and support variables
 cur_lang = $(word 2,$(subst __, ,$@))
 cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
-cur_pkg = $(I18N_DEST_PREFIX)-$(cur_lang)
+cur_pkg_lang = $(subst _,,$(subst @,,$(subst @latn,latin,$(shell echo $(cur_lang) | tr '[:upper:]' '[:lower:]'))))
+cur_pkg = $(I18N_DEST_PREFIX)-$(cur_pkg_lang)-trinity
 
 STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS))
 I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
 I18N_CLEAN := $(patsubst $(I18N_DIR_PAT),clean__%,$(I18N_DIRS))
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
 DEB_BUILD_PARALLEL ?= true
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -29,14 +25,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS))
 
-configkde=\
- --disable-rpath \
- --prefix=$(DEB_CONFIGURE_PREFIX) \
- --sysconfdir=/etc \
- --includedir=$(DEB_CONFIGURE_INCLUDEDIR) \
- --infodir=$(DEB_CONFIGURE_INFODIR) \
- --mandir=$(DEB_CONFIGURE_MANDIR)
-
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
  -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
@@ -52,50 +40,33 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
 
 build::
 	dh_testdir
+	dh_prep
 
 build:: $(STAMP_BUILD)
 
 $(STAMP_BUILD):
 	# Building the '$(cur_lang)' language ...
-	[ -d $(cur_lang_dir)/build ] || mkdir $(cur_lang_dir)/build
-	if [ ! -e $(cur_lang_dir)/CMakeLists.txt ]; then \
-	    ([ -e $(cur_lang_dir)/admin ] || ln -s ../admin $(cur_lang_dir)) && \
-	    cd $(cur_lang_dir) && \
-	    autoreconf && automake -f && \
-	    $(MAKE) -f ../admin/Makefile.common && \
-	    cd build && \
-	    ../configure --build=build $(configkde) && \
-	    $(MAKE) $(DEB_MAKE_PARALLEL); \
-	fi
-	if [ -e $(cur_lang_dir)/CMakeLists.txt ]; then \
-	    ([ -e $(cur_lang_dir)/cmake ] || ln -s ../cmake $(cur_lang_dir)) && \
-	    cd $(cur_lang_dir)/build && \
-	    cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \
-	    $(MAKE) $(DEB_MAKE_PARALLEL); \
-	fi
+	[ -d $(cur_lang_dir)/build ] || \
+	mkdir $(cur_lang_dir)/build
+	[ -e $(cur_lang_dir)/cmake ] || \
+	ln -s ../cmake $(cur_lang_dir)
+	[ -e $(cur_lang_dir)/CMakeLists.txt ] || \
+	ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt
+	cd $(cur_lang_dir)/build && \
+	cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \
+	$(MAKE) $(DEB_MAKE_PARALLEL)
 	touch $@
 
 
 install::
 	dh_testdir
 	dh_testroot
-	dh_clean -k
 
 install:: $(I18N_INSTALL)
-	# copying the non 2 letter languages into the correct directory
-	mkdir debian/$(I18N_DEST_PREFIX)-engb-trinity
-	cp -aR debian/$(I18N_DEST_PREFIX)-en_GB-trinity/* debian/$(I18N_DEST_PREFIX)-engb-trinity/
-	mkdir debian/$(I18N_DEST_PREFIX)-ptbr-trinity
-	cp -aR debian/$(I18N_DEST_PREFIX)-pt_BR-trinity/* debian/$(I18N_DEST_PREFIX)-ptbr-trinity/
-	mkdir debian/$(I18N_DEST_PREFIX)-srlatin-trinity
-	cp -aR debian/$(I18N_DEST_PREFIX)-sr@Latn-trinity/* debian/$(I18N_DEST_PREFIX)-srlatin-trinity/
-	mkdir debian/$(I18N_DEST_PREFIX)-zhcn-trinity
-	cp -aR debian/$(I18N_DEST_PREFIX)-zh_CN-trinity/* debian/$(I18N_DEST_PREFIX)-zhcn-trinity/
-	mkdir debian/$(I18N_DEST_PREFIX)-zhtw-trinity
-	cp -aR debian/$(I18N_DEST_PREFIX)-zh_TW-trinity/* debian/$(I18N_DEST_PREFIX)-zhtw-trinity/
 
 $(I18N_INSTALL): build
-	cd $(cur_lang_dir)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity $(DEB_MAKE_PARALLEL)
+	cd $(cur_lang_dir)/build && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(DEB_MAKE_PARALLEL)
 
 
 clean: $(I18N_CLEAN) debian-clean
@@ -123,6 +94,8 @@ binary-indep: build install
 	dh_installmenu
 	dh_installchangelogs
 	dh_strip
+	$(if $(wildcard /usr/bin/dh_strip_nondeterminism),\
+	dh_strip_nondeterminism)
 	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
 	dh_fixperms
 	dh_installdeb