rev 9754 - in trunk/packages/kde-i18n/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Fri Mar 14 20:07:23 UTC 2008 

Author: modax-guest
Date: 2008-03-14 20:07:22 +0000 (Fri, 14 Mar 2008)
New Revision: 9754

Added:
   trunk/packages/kde-i18n/debian/patches/
   trunk/packages/kde-i18n/debian/patches/ru.diff
Modified:
   trunk/packages/kde-i18n/debian/changelog
   trunk/packages/kde-i18n/debian/compat
   trunk/packages/kde-i18n/debian/control
   trunk/packages/kde-i18n/debian/rules
Log:
* Rewrite of debian/rules
* Fix for #469683 and co.
Ready for upload.

Modified: trunk/packages/kde-i18n/debian/changelog
===================================================================
--- trunk/packages/kde-i18n/debian/changelog	2008-03-14 17:38:32 UTC (rev 9753)
+++ trunk/packages/kde-i18n/debian/changelog	2008-03-14 20:07:22 UTC (rev 9754)
@@ -1,3 +1,25 @@
+kde-i18n (4:3.5.9-2) UNRELEASED; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Completely rewrite debian/rules. The main rationale for the rewrite was
+    that previous implementation had not been able to detect language build
+    errors at all which could have led to broken uploads (like #469683).
+    - New implementation uses stamps and make targets instead of shell 'for'
+      loops. Therefore, resuming interrupted build is possible.
+    - A very basic patching mechanism is provided. There can be a single patch
+      per language which must be named as debian/patches/${language_code}.diff
+      The patch must apply with -p1 parameter from the respective language
+      directory.
+  * Drop Build-Depend on automake. It's useless as it does not fix build
+    failures if there are problems with autotools (e.g. #469683).
+  * There seems to be a problem with the ru tarball. It does not build due to
+    wrong time-stamp of a Makefile.am. Rebuild affected Makefile.in
+    (debian/patches/ru.diff) (Closes: #469683)
+  * Use debhelper 5.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 14 Mar 2008 21:28:00 +0200
+
 kde-i18n (4:3.5.9-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/kde-i18n/debian/compat
===================================================================
--- trunk/packages/kde-i18n/debian/compat	2008-03-14 17:38:32 UTC (rev 9753)
+++ trunk/packages/kde-i18n/debian/compat	2008-03-14 20:07:22 UTC (rev 9754)
@@ -1 +1 @@
-6
+5

Modified: trunk/packages/kde-i18n/debian/control
===================================================================
--- trunk/packages/kde-i18n/debian/control	2008-03-14 17:38:32 UTC (rev 9753)
+++ trunk/packages/kde-i18n/debian/control	2008-03-14 20:07:22 UTC (rev 9754)
@@ -1,5 +1,5 @@
 Source: kde-i18n
-Build-Depends: autoconf, automake1.10, debhelper (>= 6), kdelibs4-dev (>= 4:3.5.9), gawk, gettext, bzip2
+Build-Depends: autoconf, debhelper (>= 5), kdelibs4-dev (>= 4:3.5.9), gawk, gettext, bzip2
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>

Added: trunk/packages/kde-i18n/debian/patches/ru.diff
===================================================================
--- trunk/packages/kde-i18n/debian/patches/ru.diff	                        (rev 0)
+++ trunk/packages/kde-i18n/debian/patches/ru.diff	2008-03-14 20:07:22 UTC (rev 9754)
@@ -0,0 +1,23 @@
+diff -uNr kde-i18n-ru-3.5.9.o/data/kdeedu/kturtle/Makefile.in kde-i18n-ru-3.5.9/data/kdeedu/kturtle/Makefile.in
+--- kde-i18n-ru-3.5.9.o/data/kdeedu/kturtle/Makefile.in	2008-02-13 16:26:23.000000000 +0200
++++ kde-i18n-ru-3.5.9/data/kdeedu/kturtle/Makefile.in	2008-03-14 21:06:37.000000000 +0200
+@@ -177,9 +177,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-txt_DATA = curly.logo square.logo triangle.logo \
+-flower.logo arrow.logo example2.logo example3.logo
+-
++txt_DATA = ad.logo arrow.logo canvascolors.logo curly.logo flower.logo kde.logo randomname.logo square.logo squaresss.logo timestables.logo triangle.logo trianglesss.logo
+ txtdir = $(kde_datadir)/kturtle/examples/ru
+ xml_DATA = logohighlightstyle.ru.xml
+ xmldir = $(kde_datadir)/katepart/syntax
+@@ -426,7 +424,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=squaresss.logo logokeywords.ru.xml square.logo triangle.logo curly.logo trianglesss.logo arrow.logo randomname.logo Makefile.in canvascolors.logo kde.logo ad.logo timestables.logo flower.logo logohighlightstyle.ru.xml Makefile.am 
++KDE_DIST=logokeywords.ru.xml curly.logo square.logo triangle.logo trianglesss.logo arrow.logo Makefile.in randomname.logo kde.logo ad.logo timestables.logo squaresss.logo canvascolors.logo logohighlightstyle.ru.xml flower.logo Makefile.am 
+ 
+ #>+ 2
+ docs-am:

Modified: trunk/packages/kde-i18n/debian/rules
===================================================================
--- trunk/packages/kde-i18n/debian/rules	2008-03-14 17:38:32 UTC (rev 9753)
+++ trunk/packages/kde-i18n/debian/rules	2008-03-14 20:07:22 UTC (rev 9754)
@@ -3,52 +3,58 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_UPSTREAM_VERSION=3.5.9
+I18N_DIR_PREFIX := kde-i18n
+I18N_VERSION=$(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/')
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%-$(I18N_VERSION)
+I18N_DIRS := $(subst .tar.bz2,,$(wildcard $(I18N_DIR_PREFIX)-*-$(I18N_VERSION).tar.bz2))
+I18N_PATCHES= $(wildcard debian/patches/*.diff)
 
-build: build-stamp
+# Stamps and support variables
+cur_lang = $(word 2,$(subst __, ,$@))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%-$(I18N_VERSION),$(cur_lang))
+cur_lang_patch = $(patsubst %,debian/patches/%.diff,$(cur_lang))
+cur_pkg = $(I18N_DIR_PREFIX)-$(cur_lang)
 
+STAMP_EXTRACT := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__extract,$(I18N_DIRS))
+STAMP_PATCH := $(patsubst debian/patches/%.diff,debian/stamp__%__patch,$(I18N_PATCHES))
+STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS))
+I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
+
+
 -include debian/debiandirs
 
 debian/debiandirs: scripts/admin/debianrules
 	perl -w scripts/admin/debianrules echodirs > debian/debiandirs
 
-build-stamp:
-	dh_testdir
-	# extract the bzip2 languages
-	-for i in `ls -1 kde-i18n*.bz2`;do \
-	  tar xfj $$i;\
-	done
-	# configure every language
-	-for j in `ls -1d kde-i18n-*-$(DEB_UPSTREAM_VERSION)/`; do \
-	  pwd;cd $$j;\
-	  ./configure $(configkde); \
-	  $(MAKE); \
-	  cd ..; \
-	done
-	touch build-stamp
 
-clean: debian-clean
-debian-clean:
-	dh_testdir
-	# delete unpacked bzip2 languages
-	- rm -rf kde-i18n-*-$(DEB_UPSTREAM_VERSION)/ debian/kde-i18n-*
-	- rm build-stamp
-	dh_clean
+patch: $(STAMP_PATCH)
 
-binary-arch: build
-	dh_testroot
+$(STAMP_PATCH):
+	# Applying patch for the '$(cur_lang)' language ...
+	cd $(cur_lang_dir) && patch --set-utc -p1 < "$(CURDIR)/$(cur_lang_patch)" > $(CURDIR)/$@
+
+
+build::
 	dh_testdir
 
-binary-indep: build
+build:: $(STAMP_EXTRACT) patch $(STAMP_BUILD)
+
+$(STAMP_EXTRACT):
+	tar xfj $(cur_lang_dir).tar.bz2
+	@touch $@
+
+$(STAMP_BUILD):
+	# Building the '$(cur_lang)' language ...
+	cd $(cur_lang_dir) && ./configure $(configkde) && $(MAKE)
+	touch $@
+
+
+install::
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	-for i in `ls -1d kde-i18n-*-$(DEB_UPSTREAM_VERSION)/`; do \
-	  cd $$i; \
-	  $(MAKE) install DESTDIR=`pwd`/../debian/`echo $$i|sed -e "s/-$(DEB_UPSTREAM_VERSION)//"`; \
-	  cd ..; \
-	done
 
+install:: $(I18N_INSTALL)
 	# copying the non 2 letter languages into the correct directory
 	mkdir debian/kde-i18n-engb
 	cp -aR debian/kde-i18n-en_GB/* debian/kde-i18n-engb/
@@ -61,6 +67,27 @@
 	mkdir debian/kde-i18n-zhtw
 	cp -aR debian/kde-i18n-zh_TW/* debian/kde-i18n-zhtw/
 
+$(I18N_INSTALL):
+	cd $(cur_lang_dir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)
+
+
+clean: debian-clean
+debian-clean:
+	dh_testdir
+	# delete unpacked bzip2 languages
+	rm -rf $(I18N_DIR_PREFIX)-*-$(I18N_VERSION)/ debian/kde-i18n-*
+	rm -f debian/stamp__*
+	dh_clean
+
+
+binary-arch: build
+	dh_testroot
+	dh_testdir
+
+
+binary-indep: build install
+	dh_testroot
+	dh_testdir
 	dh_installdocs
 	dh_installmenu
 	dh_installchangelogs
@@ -71,10 +98,10 @@
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb       	
+	dh_builddeb
 
+
 # Below here is fairly generic really
+binary: binary-indep binary-arch
 
-binary:		binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: binary binary-arch binary-indep clean patch build install $(I18N_INSTALL)

More information about the pkg-kde-commits mailing list