diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/rules.real | 10 | ||||
| -rw-r--r-- | debian/templates/headers.postinst.in (renamed from debian/templates/temp.headers.plain/postinst) | 0 | ||||
| -rwxr-xr-x | debian/templates/image.postinst.in (renamed from debian/templates/temp.image.plain/postinst) | 0 | ||||
| -rwxr-xr-x | debian/templates/image.postrm.in (renamed from debian/templates/temp.image.plain/postrm) | 0 | ||||
| -rwxr-xr-x | debian/templates/image.preinst.in (renamed from debian/templates/temp.image.plain/preinst) | 0 | ||||
| -rwxr-xr-x | debian/templates/image.prerm.in (renamed from debian/templates/temp.image.plain/prerm) | 0 | ||||
| -rw-r--r-- | debian/templates/image.templates.in (renamed from debian/templates/temp.image.plain/templates) | 0 | ||||
| -rw-r--r-- | debian/templates/po/POTFILES.in (renamed from debian/po/POTFILES.in) | 0 | ||||
| -rw-r--r-- | debian/templates/po/ca.po (renamed from debian/po/ca.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/cs.po (renamed from debian/po/cs.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/da.po (renamed from debian/po/da.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/de.po (renamed from debian/po/de.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/es.po (renamed from debian/po/es.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/et.po (renamed from debian/po/et.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/fr.po (renamed from debian/po/fr.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/it.po (renamed from debian/po/it.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/ja.po (renamed from debian/po/ja.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/nl.po (renamed from debian/po/nl.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/pl.po (renamed from debian/po/pl.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/pt.po (renamed from debian/po/pt.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/pt_BR.po (renamed from debian/po/pt_BR.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/ru.po (renamed from debian/po/ru.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/sk.po (renamed from debian/po/sk.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/sv.po (renamed from debian/po/sv.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/templates.pot (renamed from debian/po/templates.pot) | 0 | ||||
| -rw-r--r-- | debian/templates/po/tr.po (renamed from debian/po/tr.po) | 0 | ||||
| -rw-r--r-- | debian/templates/po/vi.po (renamed from debian/po/vi.po) | 0 |
28 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 7755a9bf579c..2c513fa0e534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low * irq: Always define devm_{request_threaded,free}_irq() (fixes FTBFS on s390,s390x) * [armel] Disable iop32x and ixp4xx flavours (fixes FTBFS) + * Clean up maintainer scripts and templating system + - Move all templates under debian/templates -- Ben Hutchings <ben@decadent.org.uk> Sun, 11 Aug 2013 19:34:47 +0200 diff --git a/debian/rules.real b/debian/rules.real index 0822ca89da61..c4c8eaa0ece0 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -289,7 +289,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$( install -d $(PACKAGE_DIR)/DEBIAN sed -e 's/=V/$(REAL_VERSION)/g' \ - debian/templates/temp.headers.plain/postinst \ + debian/templates/headers.plain.postinst.in \ > $(PACKAGE_DIR)/DEBIAN/postinst chmod 755 $(PACKAGE_DIR)/DEBIAN/postinst @@ -430,16 +430,18 @@ install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_templates \ install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: - for i in $(wildcard debian/templates/temp.image.plain/*); do \ + for i in $(wildcard debian/templates/image.plain.*.in); do \ + target=$$(basename $$i .in); \ + target=$${target#image.plain.}; \ sed \ -e 's@=B@$(KERNEL_ARCH)@g' \ -e 's/=I/$(ARG_INITRD)/g' \ -e 's/=K/$(ARG_KIMAGE)/g' \ -e 's/=V/$(REAL_VERSION)/g' \ - $$i > debian/$(PACKAGE_NAME).$$(basename $$i) || exit; \ + $$i > debian/$(PACKAGE_NAME).$$target || exit; \ done mkdir -p debian/$(PACKAGE_NAME).po - for i in $(wildcard debian/po/*.po); do \ + for i in $(wildcard debian/templates/po/*.po); do \ sed \ -e 's/=V/$(REAL_VERSION)/g' \ $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i) || exit; \ diff --git a/debian/templates/temp.headers.plain/postinst b/debian/templates/headers.postinst.in index 8c214bcd1e79..8c214bcd1e79 100644 --- a/debian/templates/temp.headers.plain/postinst +++ b/debian/templates/headers.postinst.in diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/image.postinst.in index 55cd64a096b7..55cd64a096b7 100755 --- a/debian/templates/temp.image.plain/postinst +++ b/debian/templates/image.postinst.in diff --git a/debian/templates/temp.image.plain/postrm b/debian/templates/image.postrm.in index 4ef4651c329f..4ef4651c329f 100755 --- a/debian/templates/temp.image.plain/postrm +++ b/debian/templates/image.postrm.in diff --git a/debian/templates/temp.image.plain/preinst b/debian/templates/image.preinst.in index 8bf10e7b603a..8bf10e7b603a 100755 --- a/debian/templates/temp.image.plain/preinst +++ b/debian/templates/image.preinst.in diff --git a/debian/templates/temp.image.plain/prerm b/debian/templates/image.prerm.in index 3c43b9ff5153..3c43b9ff5153 100755 --- a/debian/templates/temp.image.plain/prerm +++ b/debian/templates/image.prerm.in diff --git a/debian/templates/temp.image.plain/templates b/debian/templates/image.templates.in index a9005bfaed9c..a9005bfaed9c 100644 --- a/debian/templates/temp.image.plain/templates +++ b/debian/templates/image.templates.in diff --git a/debian/po/POTFILES.in b/debian/templates/po/POTFILES.in index cff14fdf9d4d..cff14fdf9d4d 100644 --- a/debian/po/POTFILES.in +++ b/debian/templates/po/POTFILES.in diff --git a/debian/po/ca.po b/debian/templates/po/ca.po index dd82e273b123..dd82e273b123 100644 --- a/debian/po/ca.po +++ b/debian/templates/po/ca.po diff --git a/debian/po/cs.po b/debian/templates/po/cs.po index e83ca25ab2bb..e83ca25ab2bb 100644 --- a/debian/po/cs.po +++ b/debian/templates/po/cs.po diff --git a/debian/po/da.po b/debian/templates/po/da.po index c1a08309bb84..c1a08309bb84 100644 --- a/debian/po/da.po +++ b/debian/templates/po/da.po diff --git a/debian/po/de.po b/debian/templates/po/de.po index de89b5483a3e..de89b5483a3e 100644 --- a/debian/po/de.po +++ b/debian/templates/po/de.po diff --git a/debian/po/es.po b/debian/templates/po/es.po index c16a7268b299..c16a7268b299 100644 --- a/debian/po/es.po +++ b/debian/templates/po/es.po diff --git a/debian/po/et.po b/debian/templates/po/et.po index 4aa29f513848..4aa29f513848 100644 --- a/debian/po/et.po +++ b/debian/templates/po/et.po diff --git a/debian/po/fr.po b/debian/templates/po/fr.po index f85d72667356..f85d72667356 100644 --- a/debian/po/fr.po +++ b/debian/templates/po/fr.po diff --git a/debian/po/it.po b/debian/templates/po/it.po index 0d0668c36581..0d0668c36581 100644 --- a/debian/po/it.po +++ b/debian/templates/po/it.po diff --git a/debian/po/ja.po b/debian/templates/po/ja.po index 683eed3abcdd..683eed3abcdd 100644 --- a/debian/po/ja.po +++ b/debian/templates/po/ja.po diff --git a/debian/po/nl.po b/debian/templates/po/nl.po index 439ccb294a8a..439ccb294a8a 100644 --- a/debian/po/nl.po +++ b/debian/templates/po/nl.po diff --git a/debian/po/pl.po b/debian/templates/po/pl.po index 7f909ef667da..7f909ef667da 100644 --- a/debian/po/pl.po +++ b/debian/templates/po/pl.po diff --git a/debian/po/pt.po b/debian/templates/po/pt.po index a0df5f345c9c..a0df5f345c9c 100644 --- a/debian/po/pt.po +++ b/debian/templates/po/pt.po diff --git a/debian/po/pt_BR.po b/debian/templates/po/pt_BR.po index 207999b3af1c..207999b3af1c 100644 --- a/debian/po/pt_BR.po +++ b/debian/templates/po/pt_BR.po diff --git a/debian/po/ru.po b/debian/templates/po/ru.po index 892d0b17123c..892d0b17123c 100644 --- a/debian/po/ru.po +++ b/debian/templates/po/ru.po diff --git a/debian/po/sk.po b/debian/templates/po/sk.po index 70f87989a26b..70f87989a26b 100644 --- a/debian/po/sk.po +++ b/debian/templates/po/sk.po diff --git a/debian/po/sv.po b/debian/templates/po/sv.po index 663c8e27ba8c..663c8e27ba8c 100644 --- a/debian/po/sv.po +++ b/debian/templates/po/sv.po diff --git a/debian/po/templates.pot b/debian/templates/po/templates.pot index f30984077fc9..f30984077fc9 100644 --- a/debian/po/templates.pot +++ b/debian/templates/po/templates.pot diff --git a/debian/po/tr.po b/debian/templates/po/tr.po index a049c68e199b..a049c68e199b 100644 --- a/debian/po/tr.po +++ b/debian/templates/po/tr.po diff --git a/debian/po/vi.po b/debian/templates/po/vi.po index a1b920db8605..a1b920db8605 100644 --- a/debian/po/vi.po +++ b/debian/templates/po/vi.po |