summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-21 13:03:11 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-08-27 19:46:12 +0200
commit106ac645994b0ba6a2bd5fecdde76857e09874c5 (patch)
tree9fb68c00c6fd860ca2834898dc117cea9432c85c /debian
parent7ec21bf02fe81e8844875d5291893149ae87974f (diff)
downloadtde-packaging-106ac645994b0ba6a2bd5fecdde76857e09874c5.tar.gz
tde-packaging-106ac645994b0ba6a2bd5fecdde76857e09874c5.zip
Fix tde-i18n FTBFS on Debian and Ubuntu
(cherry picked from commit a121fe19874eb8380d2e2e2f9ed55c0e1b124ea2)
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/lenny/kde-i18n/debian/rules13
-rwxr-xr-xdebian/squeeze/kde-i18n/debian/rules13
2 files changed, 14 insertions, 12 deletions
diff --git a/debian/lenny/kde-i18n/debian/rules b/debian/lenny/kde-i18n/debian/rules
index 0812f3e17..3edf6c32f 100755
--- a/debian/lenny/kde-i18n/debian/rules
+++ b/debian/lenny/kde-i18n/debian/rules
@@ -3,18 +3,19 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-I18N_DIR_PREFIX := kde-i18n
+I18N_DIR_PREFIX := tde-i18n
+I18N_DEST_PREFIX := kde-i18n
#I18N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/')
I18N_VERSION := 3.5.10
-I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%-$(I18N_VERSION)
-I18N_DIRS := $(subst .tar.bz2,,$(wildcard $(I18N_DIR_PREFIX)-*-$(I18N_VERSION).tar.bz2))
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%
+I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
I18N_PATCHES := $(wildcard debian/patches/*.diff)
# Stamps and support variables
cur_lang = $(word 2,$(subst __, ,$@))
-cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%-$(I18N_VERSION),$(cur_lang))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
cur_lang_patch = $(patsubst %,debian/patches/%.diff,$(cur_lang))
-cur_pkg = $(I18N_DIR_PREFIX)-$(cur_lang)
+cur_pkg = $(I18N_DEST_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))
@@ -49,7 +50,7 @@ build::
build:: $(STAMP_EXTRACT) patch $(STAMP_BUILD)
$(STAMP_EXTRACT):
- tar xfj $(cur_lang_dir).tar.bz2
+# tar xfj $(cur_lang_dir).tar.bz2
@touch $@
$(STAMP_BUILD):
diff --git a/debian/squeeze/kde-i18n/debian/rules b/debian/squeeze/kde-i18n/debian/rules
index 4ba3b4b82..67ed72339 100755
--- a/debian/squeeze/kde-i18n/debian/rules
+++ b/debian/squeeze/kde-i18n/debian/rules
@@ -3,18 +3,19 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-I18N_DIR_PREFIX := kde-i18n
+I18N_DIR_PREFIX := tde-i18n
+I18N_DEST_PREFIX := kde-i18n
#I18N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*/\2/')
I18N_VERSION := 3.5.10
-I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%-$(I18N_VERSION)
-I18N_DIRS := $(subst .tar.bz2,,$(wildcard $(I18N_DIR_PREFIX)-*-$(I18N_VERSION).tar.bz2))
+I18N_DIR_PAT := $(I18N_DIR_PREFIX)-%
+I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*)
#I18N_PATCHES := $(wildcard debian/patches/*.diff)
# Stamps and support variables
cur_lang = $(word 2,$(subst __, ,$@))
-cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%-$(I18N_VERSION),$(cur_lang))
+cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang))
cur_lang_patch = $(patsubst %,debian/patches/%.diff,$(cur_lang))
-cur_pkg = $(I18N_DIR_PREFIX)-$(cur_lang)
+cur_pkg = $(I18N_DEST_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))
@@ -49,7 +50,7 @@ build::
build:: $(STAMP_EXTRACT) patch $(STAMP_BUILD)
$(STAMP_EXTRACT):
- tar xfj $(cur_lang_dir).tar.bz2
+# tar xfj $(cur_lang_dir).tar.bz2
@touch $@
$(STAMP_BUILD):