Package: mozilla-firefox-locale-all Severity: wishlist Tags: patch Hi!
The current construction of debian/control with debian/templates/new-language-* is very inflexible. E. g. in Ubuntu we need to alter the dependencies to support "language packs", which isn't easily possible with the current structure. So I rewrote debian/rules to use just one template file (debian/templates/package.template) and perform macro substitution in it. This is much easier to maintain (also for you) and much more flexible in the future. Would you consider adopting it? Thanks! Martin -- System Information: Debian Release: 3.1 APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.10 Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) -- Martin Pitt http://www.piware.de Ubuntu Developer http://www.ubuntulinux.org Debian GNU/Linux Developer http://www.debian.org
--- mozilla-firefox-locale-all-1.0lang20041216/debian/rules +++ mozilla-firefox-locale-all-1.0lang20041216/debian/rules @@ -211,14 +211,9 @@ if [ -d $(CURDIR)/debian/templates/$$CURLANGSMALL ] ; \ then cat $(CURDIR)/debian/templates/$$CURLANGSMALL/control >> $(CURDIR)/debian/control ; \ else \ - echo -e '\n' >> $(CURDIR)/debian/control ; \ - cat $(CURDIR)/debian/templates/new-language-1.template >> $(CURDIR)/debian/control ; \ - echo $$CURLANGSMALL >> $(CURDIR)/debian/control ; \ - cat $(CURDIR)/debian/templates/new-language-2.template >> $(CURDIR)/debian/control ; \ - echo "$$CURLANGNAME language/region package " >> $(CURDIR)/debian/control ; \ - cat $(CURDIR)/debian/templates/new-language-3.template >> $(CURDIR)/debian/control ; \ - echo \($$CURLANGNAME language, $$CURLOCALE\). >> $(CURDIR)/debian/control ; \ - echo -n -e ' .\n Homepage: http://www.mozilla.org' >> $(CURDIR)/debian/control ; \ + sed "s/CURLOCALE/$$CURLOCALE/g; s/CURLANGSMALL/$$CURLANGSMALL/g; \ + s/CURLANGNAME/$$CURLANGNAME/g; s/CURLANG/$$CURLANG/g" \ + $(CURDIR)/debian/templates/package.template >> $(CURDIR)/debian/control; \ fi; \ echo $$CURLOCALE >> $(CURDIR)/debian/locales.list ; \ echo mozilla-firefox-locale-$$CURLANGSMALL >> $(CURDIR)/debian/packages.list ; \ reverted: --- mozilla-firefox-locale-all-1.0lang20041216/debian/templates/new-language-1.template +++ mozilla-firefox-locale-all-1.0lang20041216.orig/debian/templates/new-language-1.template @@ -1 +0,0 @@ -Package: mozilla-firefox-locale- \ No newline at end of file reverted: --- mozilla-firefox-locale-all-1.0lang20041216/debian/templates/new-language-2.template +++ mozilla-firefox-locale-all-1.0lang20041216.orig/debian/templates/new-language-2.template @@ -1,3 +0,0 @@ -Architecture: all -Depends: mozilla-firefox (>=1.0), mozilla-firefox (<< 1.0.999) -Description: Mozilla Firefox \ No newline at end of file reverted: --- mozilla-firefox-locale-all-1.0lang20041216/debian/templates/new-language-3.template +++ mozilla-firefox-locale-all-1.0lang20041216.orig/debian/templates/new-language-3.template @@ -1,2 +0,0 @@ - Menu and message resource and region property package - for Mozilla Firefox \ No newline at end of file only in patch2: --- mozilla-firefox-locale-all-1.0lang20041216.orig/debian/templates/package.template +++ mozilla-firefox-locale-all-1.0lang20041216/debian/templates/package.template @@ -0,0 +1,9 @@ + +Package: mozilla-firefox-locale-CURLANGSMALL +Architecture: all +Depends: mozilla-firefox (>= 1.0), mozilla-firefox (<< 1.0.999) +Description: Mozilla Firefox CURLANGNAME language/region package + Menu and message resource and region property package + for Mozilla Firefox (CURLANGNAME language, CURLOCALE). + . + Homepage: http://www.mozilla.org
signature.asc
Description: Digital signature