rev 17239 - in trunk/packages/kde-l10n/debian: . source
Modestas Vainius
modax at alioth.debian.org
Mon Mar 1 01:11:14 UTC 2010
Author: modax
Date: 2010-03-01 01:11:12 +0000 (Mon, 01 Mar 2010)
New Revision: 17239
Added:
trunk/packages/kde-l10n/debian/README.source
trunk/packages/kde-l10n/debian/source/
trunk/packages/kde-l10n/debian/source/format
trunk/packages/kde-l10n/debian/source/options
trunk/packages/kde-l10n/debian/upstream2orig
Modified:
trunk/packages/kde-l10n/debian/changelog
trunk/packages/kde-l10n/debian/control
trunk/packages/kde-l10n/debian/rules
Log:
* New upstream release:
- add languagues: ca at valencia, eo, id, si;
- remove languages: bnin, hne, ku, mr, th.
* Switch to 3.0 (quilt) source format.
* Use multiple tarball feature of the 3.0 (quilt) format:
- Add debian/upstream2orig script which hardlinks upstream tarballs as debian
original tarballs and extracts them into proper subdirectories. It also
creates an empty main original tarball as it is required by
3.0 (quilt) format.
- Tweak debian/rules for new format.
* Make debian/rules parallel safe.
* Add README.source.
Added: trunk/packages/kde-l10n/debian/README.source
===================================================================
--- trunk/packages/kde-l10n/debian/README.source (rev 0)
+++ trunk/packages/kde-l10n/debian/README.source 2010-03-01 01:11:12 UTC (rev 17239)
@@ -0,0 +1,30 @@
+Generating orig tarballs from the upstream tarballs
+---------------------------------------------------
+
+You may use the debian/upstream2orig script to get debian orig tarballs from
+the ones supplied by upstream. The script will take care of:
+
+* determining language and version from the tarball filenames;
+* stripping incompatible characters from the language IDs;
+* hard linking the upstream tarballs to appropriate debian original tarballs;
+* extracting the tarballs to appropriate subdirectories in the debian source
+ tree;
+* creating an empty main original tarball (3.0 (quilt) format needs it).
+
+In order to use debian/upstream2orig script, just pass paths to the upstream
+tarballs as arguments and the script will do the rest. For example:
+
+ $ debian/upstream2orig ../tarballs/kde-l10n/kde-l10n-{ar,bg,ca}-4.4.1.tar.bz2
+
+produces:
+
+ $ ls -1 ../kde-l10n*
+ ../kde-l10n_4.4.1.orig-ar.tar.bz2
+ ../kde-l10n_4.4.1.orig-bg.tar.bz2
+ ../kde-l10n_4.4.1.orig-ca.tar.bz2
+ ../kde-l10n_4.4.1.orig.tar.bz2
+ $ ls -1 -d *
+ ar
+ bg
+ ca
+
Modified: trunk/packages/kde-l10n/debian/changelog
===================================================================
--- trunk/packages/kde-l10n/debian/changelog 2010-02-28 23:29:12 UTC (rev 17238)
+++ trunk/packages/kde-l10n/debian/changelog 2010-03-01 01:11:12 UTC (rev 17239)
@@ -1,8 +1,21 @@
kde-l10n (4:4.4.1-0r1) UNRELEASED; urgency=low
+ * New upstream release:
+ - add languagues: ca at valencia, eo, id, si;
+ - remove languages: bnin, hne, ku, mr, th.
+
* Add myself to Uploaders.
* Bump kdelibs5-dev build depend to 4:4.4.
* Change L10N_DEPENDS to libkdecore5 (>= 4:4.4).
+ * Switch to 3.0 (quilt) source format.
+ * Use multiple tarball feature of the 3.0 (quilt) format:
+ - Add debian/upstream2orig script which hardlinks upstream tarballs as debian
+ original tarballs and extracts them into proper subdirectories. It also
+ creates an empty main original tarball as it is required by
+ 3.0 (quilt) format.
+ - Tweak debian/rules for new format.
+ * Make debian/rules parallel safe.
+ * Add README.source.
-- Modestas Vainius <modax at debian.org> Sun, 28 Feb 2010 23:00:19 +0200
Modified: trunk/packages/kde-l10n/debian/control
===================================================================
--- trunk/packages/kde-l10n/debian/control 2010-02-28 23:29:12 UTC (rev 17238)
+++ trunk/packages/kde-l10n/debian/control 2010-03-01 01:11:12 UTC (rev 17239)
@@ -41,16 +41,16 @@
This package contains the Bulgarian translations for applications from the
official KDE 4 release.
-Package: kde-l10n-bnin
-Architecture: all
-Depends: ${misc:Depends}, ${kde-l10n:Depends}
-Replaces: kde-i18n-bnin (<< 4:3.95.0-1), okular-l10n
-Suggests: kde-minimal
-Conflicts: kde-i18n-bnin (<< 4:3.95.0-1), gwenview-i18n
-Provides: kde-l10n
-Description: Indian Bengali (bn_IN) localization files for KDE
- This package contains the Indian Bengali translations for applications from the
- official KDE 4 release.
+#Package: kde-l10n-bnin
+#Architecture: all
+#Depends: ${misc:Depends}, ${kde-l10n:Depends}
+#Replaces: kde-i18n-bnin (<< 4:3.95.0-1), okular-l10n
+#Suggests: kde-minimal
+#Conflicts: kde-i18n-bnin (<< 4:3.95.0-1), gwenview-i18n
+#Provides: kde-l10n
+#Description: Indian Bengali (bn_IN) localization files for KDE
+# This package contains the Indian Bengali translations for applications from the
+# official KDE 4 release.
Package: kde-l10n-ca
Architecture: all
@@ -63,6 +63,17 @@
This package contains the Catalan translations for applications from the
official KDE 4 release.
+Package: kde-l10n-cavalencia
+Architecture: all
+Depends: ${misc:Depends}, ${kde-l10n:Depends}
+Replaces: kde-i18n-cavalencia (<< 4:3.95.0-1), okular-l10n
+Suggests: kde-minimal
+Conflicts: kde-i18n-cavalencia (<< 4:3.95.0-1), gwenview-i18n
+Provides: kde-l10n
+Description: Catalan (Valencian) (ca at valencia) files for KDE
+ This package contains the Catalan (Valencian)translations for applications
+ from the official KDE 4 release.
+
Package: kde-l10n-cs
Architecture: all
Depends: ${misc:Depends}, ${kde-l10n:Depends}
@@ -129,17 +140,17 @@
This package contains the British English translations for applications from the
official KDE 4 release.
-#Package: kde-l10n-eo
-#Architecture: all
-#Section: kde
-#Depends: ${kde-l10n:Depends}
-#Replaces: kde-i18n-eo (<< 4:3.95.0-1), okular-l10n
-#Suggests: kde-minimal
-#Conflicts: kde-i18n-eo (<< 4:3.95.0-1), gwenview-i18n
-#Provides: kde-l10n
-#Description: Esperanto (eo) localization files for KDE
-# This package contains the Esperanto translations for applications from the
-# official KDE 4 release.
+Package: kde-l10n-eo
+Architecture: all
+Section: kde
+Depends: ${kde-l10n:Depends}
+Replaces: kde-i18n-eo (<< 4:3.95.0-1), okular-l10n
+Suggests: kde-minimal
+Conflicts: kde-i18n-eo (<< 4:3.95.0-1), gwenview-i18n
+Provides: kde-l10n
+Description: Esperanto (eo) localization files for KDE
+ This package contains the Esperanto translations for applications from the
+ official KDE 4 release.
Package: kde-l10n-es
Architecture: all
@@ -274,16 +285,16 @@
This package contains the Hindi translations for applications from the
official KDE 4 release.
-Package: kde-l10n-hne
-Architecture: all
-Depends: ${misc:Depends}, ${kde-l10n:Depends}
-Replaces: kde-i18n-hne (<< 4:3.95.0-1), okular-l10n
-Suggests: kde-minimal
-Conflicts: kde-i18n-hne (<< 4:3.95.0-1), gwenview-i18n
-Provides: kde-l10n
-Description: Chhattisgarhi (hne) localization files for KDE
- This package contains the Chhattisgarhi translations for applications from the
- official KDE 4 release.
+#Package: kde-l10n-hne
+#Architecture: all
+#Depends: ${misc:Depends}, ${kde-l10n:Depends}
+#Replaces: kde-i18n-hne (<< 4:3.95.0-1), okular-l10n
+#Suggests: kde-minimal
+#Conflicts: kde-i18n-hne (<< 4:3.95.0-1), gwenview-i18n
+#Provides: kde-l10n
+#Description: Chhattisgarhi (hne) localization files for KDE
+# This package contains the Chhattisgarhi translations for applications from the
+# official KDE 4 release.
Package: kde-l10n-hr
Architecture: all
@@ -307,6 +318,17 @@
This package contains the Hungarian translations for applications from the
official KDE 4 release.
+Package: kde-l10n-id
+Architecture: all
+Depends: ${misc:Depends}, ${kde-l10n:Depends}
+Replaces: kde-i18n-id (<< 4:3.95.0-1), okular-l10n
+Suggests: kde-minimal
+Conflicts: kde-i18n-id (<< 4:3.95.0-1), gwenview-i18n
+Provides: kde-l10n
+Description: Indonesian (id) localization files for KDE
+ This package contains the Indonesian translations for applications from the
+ official KDE 4 release.
+
Package: kde-l10n-is
Architecture: all
Depends: ${misc:Depends}, ${kde-l10n:Depends}
@@ -384,16 +406,16 @@
This package contains the Korean translations for applications from the
official KDE 4 release.
-Package: kde-l10n-ku
-Architecture: all
-Depends: ${misc:Depends}, ${kde-l10n:Depends}
-Replaces: kde-i18n-ku (<< 4:3.95.0-1), okular-l10n
-Suggests: kde-minimal
-Conflicts: kde-i18n-ku (<< 4:3.95.0-1), gwenview-i18n
-Provides: kde-l10n
-Description: Kurdish (ku) localization files for KDE
- This package contains the Kurdish translations for applications from the
- official KDE 4 release.
+#Package: kde-l10n-ku
+#Architecture: all
+#Depends: ${misc:Depends}, ${kde-l10n:Depends}
+#Replaces: kde-i18n-ku (<< 4:3.95.0-1), okular-l10n
+#Suggests: kde-minimal
+#Conflicts: kde-i18n-ku (<< 4:3.95.0-1), gwenview-i18n
+#Provides: kde-l10n
+#Description: Kurdish (ku) localization files for KDE
+# This package contains the Kurdish translations for applications from the
+# official KDE 4 release.
Package: kde-l10n-lv
Architecture: all
@@ -450,16 +472,16 @@
This package contains the Malayalam translations for applications from the
official KDE 4 release.
-Package: kde-l10n-mr
-Architecture: all
-Depends: ${misc:Depends}, ${kde-l10n:Depends}
-Replaces: kde-i18n-mr (<< 4:3.95.0-1), okular-l10n
-Suggests: kde-minimal
-Conflicts: kde-i18n-mr (<< 4:3.95.0-1), gwenview-i18n
-Provides: kde-l10n
-Description: Marathi (mr) localization files for KDE
- This package contains the Marathi translations for applications from the
- official KDE 4 release.
+#Package: kde-l10n-mr
+#Architecture: all
+#Depends: ${misc:Depends}, ${kde-l10n:Depends}
+#Replaces: kde-i18n-mr (<< 4:3.95.0-1), okular-l10n
+#Suggests: kde-minimal
+#Conflicts: kde-i18n-mr (<< 4:3.95.0-1), gwenview-i18n
+#Provides: kde-l10n
+#Description: Marathi (mr) localization files for KDE
+# This package contains the Marathi translations for applications from the
+# official KDE 4 release.
Package: kde-l10n-nb
Architecture: all
@@ -595,6 +617,18 @@
# This package contains the Northern Sami translations for applications from the
# official KDE 4 release.
+Package: kde-l10n-si
+Architecture: all
+Section: kde
+Depends: ${kde-l10n:Depends}
+Replaces: kde-i18n-si (<< 4:3.95.0-1), okular-l10n
+Suggests: kde-minimal
+Conflicts: kde-i18n-si (<< 4:3.95.0-1), gwenview-i18n
+Provides: kde-l10n
+Description: Sinhala (si) localization files for KDE
+ This package contains the Sinhala translations for applications from the
+ official KDE 4 release.
+
Package: kde-l10n-sk
Architecture: all
Depends: ${misc:Depends}, ${kde-l10n:Depends}
@@ -662,16 +696,16 @@
This package contains the Tajik translations for applications from the
official KDE 4 release.
-Package: kde-l10n-th
-Architecture: all
-Depends: ${misc:Depends}, ${kde-l10n:Depends}
-Replaces: kde-i18n-th (<< 4:3.95.0-1), okular-l10n
-Suggests: kde-minimal
-Conflicts: kde-i18n-th (<< 4:3.95.0-1), gwenview-i18n
-Provides: kde-l10n
-Description: Thai (th) localization files for KDE
- This package contains the Thai translations for applications from the
- official KDE 4 release.
+#Package: kde-l10n-th
+#Architecture: all
+#Depends: ${misc:Depends}, ${kde-l10n:Depends}
+#Replaces: kde-i18n-th (<< 4:3.95.0-1), okular-l10n
+#Suggests: kde-minimal
+#Conflicts: kde-i18n-th (<< 4:3.95.0-1), gwenview-i18n
+#Provides: kde-l10n
+#Description: Thai (th) localization files for KDE
+# This package contains the Thai translations for applications from the
+# official KDE 4 release.
Package: kde-l10n-tr
Architecture: all
@@ -1164,12 +1198,12 @@
This is a "dummy" package that depends on KDE 3 version of
Tajik translations to ease upgrades. It may be safely removed.
-Package: kde-i18n-th
-Architecture: all
-Depends: ${misc:Depends}, kde-l10n-th
-Description: Thai (th) internationalized files for KDE (transitional dummy package)
- This is a "dummy" package that depends on KDE 3 version of
- Thai translations to ease upgrades. It may be safely removed.
+#Package: kde-i18n-th
+#Architecture: all
+#Depends: ${misc:Depends}, kde-l10n-th
+#Description: Thai (th) internationalized files for KDE (transitional dummy package)
+# This is a "dummy" package that depends on KDE 3 version of
+# Thai translations to ease upgrades. It may be safely removed.
Package: kde-i18n-tr
Architecture: all
Modified: trunk/packages/kde-l10n/debian/rules
===================================================================
--- trunk/packages/kde-l10n/debian/rules 2010-02-28 23:29:12 UTC (rev 17238)
+++ trunk/packages/kde-l10n/debian/rules 2010-03-01 01:11:12 UTC (rev 17239)
@@ -2,91 +2,87 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
# Value of the kde-l10n:Depends substvar. Common dependencies for each l10n
# package.
L10N_DEPENDS := libkdecore5 (>= 4:4.4)
-L10N_DIR_PREFIX := kde-l10n
-L10N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/')
-L10N_DIRS := $(subst .tar.bz2,,$(wildcard $(L10N_DIR_PREFIX)-*-$(L10N_VERSION).tar.bz2))
-L10N_LANGS := $(patsubst $(L10N_DIR_PREFIX)-%-$(L10N_VERSION),%,$(L10N_DIRS))
-L10N_PACKAGES :=$(patsubst %,$(L10N_DIR_PREFIX)-%,$(shell echo $(subst _,,$(subst @,,$(L10N_LANGS))) | tr A-Z a-z))
-L10N_PATCHES := $(wildcard debian/patches/*.diff)
+L10N_PREFIX := kde-l10n
+I18N_PREFIX := kde-i18n
+#L10N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/')
+L10N_LANGS := $(filter-out debian,$(subst ./,,$(shell find . -mindepth 1 -maxdepth 1 -type d ! -name .pc)))
+L10N_DIRS = $(L10N_LANGS)
+L10N_PACKAGES := $(patsubst %,$(L10N_PREFIX)-%,$(L10N_LANGS))
# Support variables to be used in targets
cur_lang = $(word 2,$(subst __, ,$@))
-cur_lang_dir = $(patsubst %,$(L10N_DIR_PREFIX)-%-$(L10N_VERSION),$(cur_lang))
-cur_lang_patch = $(patsubst %,debian/patches/%.diff,$(cur_lang))
-cur_pkg = $(L10N_DIR_PREFIX)-$(shell echo $(subst _,,$(subst @,,$(cur_lang))) | tr A-Z a-z)
+cur_lang_dir = $(cur_lang)
+cur_lang_builddir = $(cur_lang_dir)/build
+cur_pkg = $(L10N_PREFIX)-$(cur_lang)
# Stamps
-STAMP_EXTRACT := $(patsubst %,debian/stamp__%__extract,$(L10N_LANGS))
-STAMP_PATCH := $(patsubst debian/patches/%.diff,debian/stamp__%__patch,$(L10N_PATCHES))
STAMP_BUILD := $(patsubst %,debian/stamp__%__build,$(L10N_LANGS))
L10N_INSTALL := $(patsubst %,install__%,$(L10N_LANGS))
+L10N_CLEAN := $(patsubst %,clean__%,$(L10N_LANGS))
# debian/control checks
-L10N_PACKAGES_IN_CONTROL := $(shell grep '^Package: ' debian/control | sed 's/^Package: //')
+L10N_PACKAGES_IN_CONTROL := $(shell dh_listpackages | grep '$(L10N_PREFIX)')
L10N_NOTEXIST_IN_CONTROL := $(filter-out $(L10N_PACKAGES_IN_CONTROL),$(L10N_PACKAGES))
L10N_EXCESS_IN_CONTROL := $(filter-out $(L10N_PACKAGES), $(L10N_PACKAGES_IN_CONTROL))
+I18N_PACKAGES_IN_CONTROL := $(shell dh_listpackages | grep '$(I18N_PREFIX)')
+I18N_EXCESS_IN_CONTROL := $(filter-out $(patsubst %,$(I18N_PREFIX)-%,$(L10N_LANGS)),$(I18N_PACKAGES_IN_CONTROL))
+
check_control:
@test -z "$(L10N_NOTEXIST_IN_CONTROL)" || \
(echo "-- ERROR: debian/control is missing language packages: $(L10N_NOTEXIST_IN_CONTROL)" && false)
@test -z "$(L10N_EXCESS_IN_CONTROL)" || \
(echo "-- ERROR: debian/control has excess language packages: $(L10N_EXCESS_IN_CONTROL)" && false)
+# @test -z "$(I18N_EXCESS_IN_CONTROL)" || \
+# (echo "-- ERROR: debian/control has excess $(I18N_PREFIX) language packages: $(I18N_EXCESS_IN_CONTROL)" && false)
-
-patch: $(STAMP_PATCH)
-
-$(STAMP_PATCH):
- # Applying patch for the '$(cur_lang)' language ...
- cd $(cur_lang_dir) && patch --set-utc -p1 < "$(CURDIR)/$(cur_lang_patch)" > $(CURDIR)/$@_log
- mv $@_log $@
-
-build::
+prepare_build: check_control
dh_testdir
-build:: check_control $(STAMP_EXTRACT) patch $(STAMP_BUILD)
+build: $(STAMP_BUILD)
-$(STAMP_EXTRACT):
- tar xfj $(cur_lang_dir).tar.bz2
- @touch $@
-
-$(STAMP_BUILD):
+$(STAMP_BUILD): %: prepare_build
# Building the '$(cur_lang)' language ...
- cd $(cur_lang_dir) && cmake . -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_VERBOSE_MAKEFILE=ON && $(MAKE)
+ mkdir $(cur_lang_builddir); cd $(cur_lang_builddir) && \
+ cmake .. -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_VERBOSE_MAKEFILE=ON && \
+ $(MAKE)
touch $@
-
-install::
+prepare_install:
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
-install:: $(L10N_INSTALL)
+install: $(L10N_INSTALL)
# Installed successfully
-$(L10N_INSTALL):
+$(L10N_INSTALL): %: prepare_install
# Installing '$(cur_lang)' to the '$(cur_pkg)' package
- cd $(cur_lang_dir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)
+ cd $(cur_lang_builddir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)
-
-clean: debian-clean
-debian-clean:
+prepare_clean:
dh_testdir
- # delete unpacked bzip2 languages
- rm -rf $(L10N_DIR_PREFIX)-*-$(L10N_VERSION)/ debian/$(L10N_DIR_PREFIX)-*
+
+clean: $(L10N_CLEAN)
rm -f debian/stamp__*
- rm -f debian/*.debhelper.log
dh_clean
+# Delete build directories
+$(L10N_CLEAN): %: prepare_clean
+ rm -rf $(cur_lang_builddir)
binary-arch:
- # Do architecture dependent files available
+ # No architecture dependent files available
-
binary-indep: build install
dh_testroot
dh_testdir
@@ -103,8 +99,8 @@
dh_md5sums
dh_builddeb
-
# Below here is fairly generic really
binary: binary-indep binary-arch
-.PHONY: binary binary-arch binary-indep clean patch build install check_control $(L10N_INSTALL)
+.PHONY: binary binary-arch binary-indep clean patch build install
+.PHONY: check_control prepare_build prepare_install $(L10N_INSTALL) $(L10N_CLEAN)
Added: trunk/packages/kde-l10n/debian/source/format
===================================================================
--- trunk/packages/kde-l10n/debian/source/format (rev 0)
+++ trunk/packages/kde-l10n/debian/source/format 2010-03-01 01:11:12 UTC (rev 17239)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/packages/kde-l10n/debian/source/options
===================================================================
--- trunk/packages/kde-l10n/debian/source/options (rev 0)
+++ trunk/packages/kde-l10n/debian/source/options 2010-03-01 01:11:12 UTC (rev 17239)
@@ -0,0 +1 @@
+compression=bzip2
Added: trunk/packages/kde-l10n/debian/upstream2orig
===================================================================
--- trunk/packages/kde-l10n/debian/upstream2orig (rev 0)
+++ trunk/packages/kde-l10n/debian/upstream2orig 2010-03-01 01:11:12 UTC (rev 17239)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Arguments - upstream kde-l10n tarballs
+
+PREFIX="kde-l10n"
+
+get_orig_name() {
+ local tarball upstream
+ local lang version
+
+ tarball="$1"
+ upstream=`basename "$tarball"`
+ lang=${upstream#${PREFIX}-}
+ lang="${lang%.tar.bz2}"
+
+ version=${lang#*-}
+ lang="${lang%%-*}"
+ lang="`echo $lang | tr -d _@ | tr A-Z a-z`"
+ echo "kde-l10n_${version}.orig-${lang}.tar.bz2 $lang"
+}
+
+create_empty_tarball() {
+ local dummy tarball
+ tarball="${1%.bz2}"
+ dummy=`mktemp dummy.XXXXXX`
+ tar cf "${tarball}" $dummy
+ tar --delete --file "${tarball}" $dummy
+ bzip2 "$tarball"
+ rm -f $dummy
+}
+
+orig=""
+while [ -n "$1" ]; do
+ echo "Renaming and extracting tarball $1 ..." >&1
+ orig="../`get_orig_name "$1"`"
+ lang=${orig#* }
+ orig=${orig% *}
+ rm -f "$orig"
+ ln -f "$1" "$orig"
+ rm -rf "$lang"
+ mkdir "$lang"
+ tar xjf "$orig" --strip=1 -C "$lang"
+ shift
+done
+
+orig="${orig%.orig-*.tar.bz2}.orig.tar.bz2"
+echo "Creating empty $orig ..." >&1
+rm -f "$orig"
+create_empty_tarball "$orig"
Property changes on: trunk/packages/kde-l10n/debian/upstream2orig
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-kde-commits
mailing list