On Mon, Mar 31, 2008 at 10:04:40AM +0200, Petter Reinholdtsen wrote:
> tags 456346 + patch
> thanks
>
> I believe this patch solve the issue. Can you test and see if a
> package built with this patch work out of the box?
I have been in parallel playing with norwegian dict, and attach patch with
the last result.
Since seems that a new version is available, some of the changes here may
need a rework. Also, the use of ispell-autobuildhash is currently noisy for
norwegian, since up-to-date ispell allows some non alphabetic flags, while
current Debian ispell is too outdated and does not allow them. For that
reason I would not use it now. Also, patch contains fixes for the .aff file
that might have been applied by upstream. Some other things, like using
octal codes for casechars and not casechars are IMHO desirable, is not
trivial to keep ut8 and latin1 strings mixed in a file. Also some trailing
whitespace is removed (sorry, I have my edior configured this way, and
forgot to disable this before)
So, while is not a patch intended to be blindly applied, may help you in the
future. Attaching it in case is useful. This is the changelog I wrote for it
---------
* debian/myspell-{nb,nn}.info-myspell:
- Use plain {nb,nn} as base name. That is what mozilla expects, and
this will make ooo to find them too. unspell will only find them
if called this way. (Closes: #456346).
- Add hyphenation info, it is actually installed together with dicts
* debian/inorwegian.info-ispell:
- Since there is utf-8 in language name, better put {not,}casechars,
additionalchars using single byte octal codes. The dict is declared as
iso-8859-1 amd emacs will then expect unibyte here.
* debian/{i,w}norwegian.templates.in:
- Renamed to {i,w}norwegian.po-master.templates, already using
podebconf.
* Makefile:
- Allow dots and double quotes in the middle of a word for aspell.
* debian/{rules,control,aspell-no.links}, Makefile:
- Make aspell-no arch all, using aspell-autobuildhash and affix
compression. Tons of changes needed.
* debian/{rules,control,inorwegian.links}, Makefile:
- Make inorwegian arch all, using ispell-autobuildhash.
* debian/control:
- Bumped Standards-Version to 3.7.3. No changes needed
* debian/aspell-no.info-aspell:
- New file, created after the ispell one, with locale entry added
- Modified debian/rules to call installdeb-aspell
* nn.aff.in:
- Fixed buggy entries that were breaking aspell hash creation.
* debian/aspell-no.postinst:
- Fixed 'if' condition
* debian/aspell-no.prerm:
- Disabled -x
---------
Enjoy,
--
Agustin
diff -u norwegian-2.0.9/debian/po/POTFILES.in
norwegian-2.0.9/debian/po/POTFILES.in
--- norwegian-2.0.9/debian/po/POTFILES.in
+++ norwegian-2.0.9/debian/po/POTFILES.in
@@ -1,3 +1,3 @@
-[type: gettext/rfc822deb] wnorwegian.templates.in
-[type: gettext/rfc822deb] inorwegian.templates.in
+[type: gettext/rfc822deb] wnorwegian.po-master.templates
+[type: gettext/rfc822deb] inorwegian.po-master.templates
[type: gettext/rfc822deb] aspell-no.templates
diff -u norwegian-2.0.9/debian/aspell-no.dirs
norwegian-2.0.9/debian/aspell-no.dirs
--- norwegian-2.0.9/debian/aspell-no.dirs
+++ norwegian-2.0.9/debian/aspell-no.dirs
@@ -2,0 +3,2 @@
+usr/share/aspell
+var/lib/aspell
diff -u norwegian-2.0.9/debian/myspell-nn.info-myspell
norwegian-2.0.9/debian/myspell-nn.info-myspell
--- norwegian-2.0.9/debian/myspell-nn.info-myspell
+++ norwegian-2.0.9/debian/myspell-nn.info-myspell
@@ -1 +1,2 @@
-DICT nn NO nn_NO
+DICT nn NO nn
+HYPH nn NO nn_NO
diff -u norwegian-2.0.9/debian/aspell-no.postinst
norwegian-2.0.9/debian/aspell-no.postinst
--- norwegian-2.0.9/debian/aspell-no.postinst
+++ norwegian-2.0.9/debian/aspell-no.postinst
@@ -21,7 +21,7 @@
fi
D=/usr/lib/aspell-0.60
-if [ -d "$D"]; then
+if [ -d "$D" ]; then
rm -f $D/no.dat $D/no.multi $D/no_phonet.dat
rmdir --ignore-fail-on-non-empty $D
fi
diff -u norwegian-2.0.9/debian/inorwegian.links
norwegian-2.0.9/debian/inorwegian.links
--- norwegian-2.0.9/debian/inorwegian.links
+++ norwegian-2.0.9/debian/inorwegian.links
@@ -1,7 +1,11 @@
-/usr/lib/ispell/nb.hash /usr/lib/ispell/bokmål.hash
-/usr/lib/ispell/nb.aff /usr/lib/ispell/bokmål.aff
-/usr/lib/ispell/nb.hash /usr/lib/ispell/bokmaal.hash
-/usr/lib/ispell/nb.aff /usr/lib/ispell/bokmaal.aff
-/usr/lib/ispell/nb.hash /usr/lib/ispell/bokmål.hash
-/usr/lib/ispell/nb.aff /usr/lib/ispell/bokmål.aff
+/var/lib/ispell/nb.hash /usr/lib/ispell/nb.hash
+/usr/lib/ispell/nb.hash /usr/lib/ispell/bokmål.hash
+/usr/lib/ispell/nb.aff /usr/lib/ispell/bokmål.aff
+/usr/lib/ispell/nb.hash /usr/lib/ispell/bokmaal.hash
+/usr/lib/ispell/nb.aff /usr/lib/ispell/bokmaal.aff
+/usr/lib/ispell/nb.hash /usr/lib/ispell/bokmål.hash
+/usr/lib/ispell/nb.aff /usr/lib/ispell/bokmål.aff
+/var/lib/ispell/nn.hash /usr/lib/ispell/nn.hash
+/usr/lib/ispell/nn.hash /usr/lib/ispell/nynorsk.hash
+/usr/lib/ispell/nn.aff /usr/lib/ispell/nynorsk.aff
diff -u norwegian-2.0.9/debian/aspell-no.prerm
norwegian-2.0.9/debian/aspell-no.prerm
--- norwegian-2.0.9/debian/aspell-no.prerm
+++ norwegian-2.0.9/debian/aspell-no.prerm
@@ -1,7 +1,6 @@
#! /bin/sh
set -e
-set -x
case "$1" in remove|deconfigure)
rm -f /usr/lib/aspell/no.dat /usr/lib/aspell/no.multi
/usr/lib/aspell/no_phonet.dat
diff -u norwegian-2.0.9/debian/myspell-nb.info-myspell
norwegian-2.0.9/debian/myspell-nb.info-myspell
--- norwegian-2.0.9/debian/myspell-nb.info-myspell
+++ norwegian-2.0.9/debian/myspell-nb.info-myspell
@@ -1 +1,2 @@
-DICT nb NO nb_NO
+DICT nb NO nb
+HYPH nb NO hyph_nb_NO
diff -u norwegian-2.0.9/debian/inorwegian.info-ispell
norwegian-2.0.9/debian/inorwegian.info-ispell
--- norwegian-2.0.9/debian/inorwegian.info-ispell
+++ norwegian-2.0.9/debian/inorwegian.info-ispell
@@ -5,7 +5,7 @@
Not-Casechars:
[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
Otherchars: [\"]
Many-Otherchars: none
-Additionalchars: çéêèóôòæøåÃÃÃÃÃÃÃÃÃÃ
+Additionalchars:
\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370
Ispell-Args: -d bokmål
Extended-Character-Mode: ~list
Coding-System: iso-8859-1
@@ -14,11 +14,11 @@
Language: nynorsk (New Norwegian)
Hash-Name: nynorsk
Emacsen-Name: nynorsk
-Casechars: [A-Za-zçéêèóôòæøåÃÃÃÃÃÃÃÃÃÃ
]
-Not-Casechars: [^A-Za-zçéêèóôòæøåÃÃÃÃÃÃÃÃÃÃ
]
+Casechars:
[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
+Not-Casechars:
[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
Otherchars: [\"]
Many-Otherchars: none
-Additionalchars: çéêèóôòæøåÃÃÃÃÃÃÃÃÃÃ
+Additionalchars:
\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370
Ispell-Args: -d nynorsk
Extended-Character-Mode: ~list
Coding-System: iso-8859-1
diff -u norwegian-2.0.9/debian/inorwegian.dirs
norwegian-2.0.9/debian/inorwegian.dirs
--- norwegian-2.0.9/debian/inorwegian.dirs
+++ norwegian-2.0.9/debian/inorwegian.dirs
@@ -1,0 +2,2 @@
+usr/share/ispell
+var/lib/ispell
reverted:
--- norwegian-2.0.9/debian/wnorwegian.templates.in
+++ norwegian-2.0.9.orig/debian/wnorwegian.templates.in
@@ -1,20 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# [EMAIL PROTECTED] for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: wnorwegian/whichvariant
-Type: select
-# bokmaal is an ASCII transliteration. aa is in fact the <U00C5>
-# Unicode glyph, rendered as a lower a with a ring above. Please
-# use this glyph when available. The HTML entity is å
-__Choices: nynorsk, bokmaal
-Default: bokmaal
-_Description: Norwegian language variant:
- Norwegian has two different written forms: bokmaal and nynorsk.
- .
- Please choose the one you wish to use.
reverted:
--- norwegian-2.0.9/debian/inorwegian.templates.in
+++ norwegian-2.0.9.orig/debian/inorwegian.templates.in
@@ -1,20 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# [EMAIL PROTECTED] for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: inorwegian/whichvariant
-Type: select
-# bokmaal is an ASCII transliteration. aa is in fact the <U00C5>
-# Unicode glyph, rendered as a lower a with a ring above. Please
-# use this glyph when available. The HTML entity is å
-__Choices: nynorsk, bokmaal
-Default: bokmaal
-_Description: Norwegian language variant:
- Norwegian has two different written forms: bokmaal and nynorsk.
- .
- Please choose the one you wish to use.
diff -u norwegian-2.0.9/debian/control norwegian-2.0.9/debian/control
--- norwegian-2.0.9/debian/control
+++ norwegian-2.0.9/debian/control
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Tollef Fog Heen <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4), ispell, gawk, perl, aspell (>= 0.60.3-2),
dictionaries-common-dev (>=0.20), ssed, po-debconf, gettext (>= 0.11),
hunspell-tools | myspell-tools
-Standards-Version: 3.5.6
+Standards-Version: 3.7.3
Package: inorwegian
-Architecture: any
+Architecture: all
Depends: ispell, debconf | debconf-2.0, dictionaries-common
Provides: ispell-dictionary
Description: Norwegian dictionary for ispell
@@ -21,8 +21,8 @@
This package provides a list of Norwegian names and words, for general use.
Package: aspell-no
-Architecture: any
-Depends: aspell (>= 0.60.3-2), debconf | debconf-2.0
+Architecture: all
+Depends: aspell (>= 0.60.3-2), dictionaries-common (>= 0.50), debconf |
debconf-2.0
Provides: aspell6a-dictionary
Description: Norwegian dictionary for aspell
This package provides the Norwegian dictionaries to be used with
diff -u norwegian-2.0.9/debian/rules norwegian-2.0.9/debian/rules
--- norwegian-2.0.9/debian/rules
+++ norwegian-2.0.9/debian/rules
@@ -1,12 +1,12 @@
#! /usr/bin/make -f
-# Sample debian/rules that uses debhelper.
+# Sample debian/rules that uses debhelper.
# GNU copyright 1997 by Joey Hess.
#
# This version is for a hypothetical package that builds an
# architecture-dependant package, as well as an architecture-independent
# package.
-# Uncomment this to turn on verbose mode.
+# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
# This is the debhelper compatability version to use.
@@ -15,10 +15,10 @@
export DH_OPTIONS
build: build-stamp debian/po/en.po
-build-stamp:
+build-stamp:
dh_testdir
- $(MAKE)
+ $(MAKE) words nb.mch nn.mch myspell nb.dat nb.multi nn.dat nn.multi
# Build aspell-no files as well -- this trick is stolen from the
# aspell-da package.
@@ -45,7 +45,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp install-stamp nb.rws nn.rws
+ rm -f build-stamp install-stamp nb.rws nn.rws
rm -f nb_NO.myaff nb_NO.mydict
rm -f nn_NO.myaff nn_NO.mydict
@@ -61,12 +61,33 @@
dh_installdirs --all
# Add here commands to install the package into debian/tmp.
- $(MAKE) install-ispell DESTDIR=debian/inorwegian
$(MAKE) install-words DESTDIR=debian/wnorwegian
- $(MAKE) install-aspell DESTDIR=debian/aspell-no
$(MAKE) install-myspell-nb install-myspell-hyph-nb
DESTDIR=debian/myspell-nb
-
$(MAKE) install-myspell-nn install-myspell-hyph-nn
DESTDIR=debian/myspell-nn
+ # Installing ispell autobuild stuff. Needs to be done after myspell
stuff is created
+ touch debian/inorwegian/var/lib/ispell/nb.compat
+ touch debian/inorwegian/var/lib/ispell/nb.hash
+ install -m 0644 nb.aff debian/inorwegian/usr/lib/ispell/nb.aff
+ cat nb.mch | gzip -c > debian/inorwegian/usr/share/ispell/nb.mwl.gz
+ #
+ touch debian/inorwegian/var/lib/ispell/nn.compat
+ touch debian/inorwegian/var/lib/ispell/nn.hash
+ install -m 0644 nb.aff debian/inorwegian/usr/lib/ispell/nn.aff
+ cat nn.mch | gzip -c > debian/inorwegian/usr/share/ispell/nn.mwl.gz
+ # Installing aspell autobuild stuff. Needs to be done after myspell
stuff is created
+ touch debian/aspell-no/var/lib/aspell/nb.compat
+ touch debian/aspell-no/var/lib/aspell/nb.rws
+ prezip -c nb.mch | gzip -c > debian/aspell-no/usr/share/aspell/nb.cwl.gz
+ install -m 0644 nb_NO.myaff debian/aspell-no/usr/lib/aspell/nb_affix.dat
+ install -m 0644 nb.dat debian/aspell-no/usr/lib/aspell
+ install -m 0644 nb.multi debian/aspell-no/usr/lib/aspell
+ #
+ touch debian/aspell-no/var/lib/aspell/nn.compat
+ touch debian/aspell-no/var/lib/aspell/nn.rws
+ prezip -c nn.mch | gzip -c > debian/aspell-no/usr/share/aspell/nn.cwl.gz
+ install -m 0644 nn_NO.myaff debian/aspell-no/usr/lib/aspell/nn_affix.dat
+ install -m 0644 nn.dat debian/aspell-no/usr/lib/aspell
+ install -m 0644 nn.multi debian/aspell-no/usr/lib/aspell
touch install-stamp
@@ -108,6 +129,8 @@
aspell-no: build install
dh_testdir
dh_testroot
+ dh_link
+ installdeb-aspell
dh_installdebconf
dh_installdocs
dh_installchangelogs
diff -u norwegian-2.0.9/debian/changelog norwegian-2.0.9/debian/changelog
--- norwegian-2.0.9/debian/changelog
+++ norwegian-2.0.9/debian/changelog
@@ -1,3 +1,37 @@
+norwegian (2.0.9-2.1amd2.3) unstable; urgency=low
+
+ * debian/myspell-{nb,nn}.info-myspell:
+ - Use plain {nb,nn} as base name. That is what mozilla expects, and
+ this will make ooo to find them too. unspell will only find them
+ if called this way. (Closes: #456346).
+ - Add hyphenation info, it is actually installed together with dicts
+ * debian/inorwegian.info-ispell:
+ - Since there is utf-8 in language name, better put {not,}casechars,
+ additionalchars using single byte octal codes. The dict is declared as
+ iso-8859-1 amd emacs will then expect unibyte here.
+ * debian/{i,w}norwegian.templates.in:
+ - Renamed to {i,w}norwegian.po-master.templates, already using podebconf.
+ * Makefile:
+ - Allow dots and double quotes in the middle of a word for aspell.
+ * debian/{rules,control,aspell-no.links}, Makefile:
+ - Make aspell-no arch all, using aspell-autobuildhash and affix
+ compression. Tons of changes needed.
+ * debian/{rules,control,inorwegian.links}, Makefile:
+ - Make inorwegian arch all, using ispell-autobuildhash.
+ * debian/control:
+ - Bumped Standards-Version to 3.7.3. No changes needed
+ * debian/aspell-no.info-aspell:
+ - New file, created after the ispell one, with locale entry added
+ - Modified debian/rules to call installdeb-aspell
+ * nn.aff.in:
+ - Fixed buggy entries that were breaking aspell hash creation.
+ * debian/aspell-no.postinst:
+ - Fixed 'if' condition
+ * debian/aspell-no.prerm:
+ - Disabled -x
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Thu, 06 Mar 2008 17:02:17 +0100
+
norwegian (2.0.9-2.1) unstable; urgency=low
* Non-maintainer upload to fix pending l10n issues.
@@ -35,7 +69,7 @@
myspell-tools. Closes: #426536
* Get rid of /usr/lib/aspell-0.60/no.dat and friends if they exist.
Closes: 382366.
- * Tweak the templates a bit to make translations easier to do.
+ * Tweak the templates a bit to make translations easier to do.
Closes: #414137
* Add Dutch translation. Closes: #415498
* Add Portuguese translation. Closes: #416817
@@ -69,7 +103,7 @@
norwegian (2.0-23) unstable; urgency=low
- * Make aspell-no provide aspell6a-dictionary and be arch: any
+ * Make aspell-no provide aspell6a-dictionary and be arch: any
(closes: #340756)
* Include Swedish debconf translation. (closes: #333318)
@@ -119,7 +153,7 @@
- debian/aspell-no.postinst: only muck around in /usr/lib/aspell-0.60
-- Brian Nelson <[EMAIL PROTECTED]> Fri, 18 Feb 2005 23:36:08 -0800
-
+
norwegian (2.0-18) unstable; urgency=low
* Clarify copyright file. (closes: #290216)
@@ -127,14 +161,14 @@
unreliable. (closes: #286542)
* Provide bokmaal links as well (closes: #266030)
* Add Czech debconf translations.
-
+
-- Tollef Fog Heen <[EMAIL PROTECTED]> Sat, 5 Feb 2005 15:58:18 +0100
norwegian (2.0-17) unstable; urgency=low
* Fix upstream author email address. (closes: #254145)
- * Update German debconf translation, thanks to Helge Kreutzmann.
- (closes: #251734)
+ * Update German debconf translation, thanks to Helge Kreutzmann.
+ (closes: #251734)
-- Tollef Fog Heen <[EMAIL PROTECTED]> Sat, 17 Jul 2004 13:20:38 +0200
@@ -189,7 +223,7 @@
* Rebuild with new aspell and bump build-deps (closes: #177924, #183215,
#185119)
* Actually add compat symlinks. (closes: #177908, #182468)
- * Fix name of Nynorsk to New Norwegian, not Standard Norwegian.
+ * Fix name of Nynorsk to New Norwegian, not Standard Norwegian.
* Use ssed instead of sed, since sed has turned into the slowest piece
of software on earth.
@@ -336,7 +370,7 @@
norwegian (1.1a-3) unstable; urgency=low
* Changed the filename of the dictionary from "norwegian" to "norsk"
- * Moved dictionary to /usr/share/dict instead of /usr/dict
+ * Moved dictionary to /usr/share/dict instead of /usr/dict
-- Stig Sandbeck Mathisen <[EMAIL PROTECTED]> Fri, 9 Oct 1998 22:21:18 +0200
diff -u norwegian-2.0.9/Makefile norwegian-2.0.9/Makefile
--- norwegian-2.0.9/Makefile
+++ norwegian-2.0.9/Makefile
@@ -136,7 +136,7 @@
# The awk scripts below tells which words from in each category that
# should be in the dictionary. The line
-# /^[-${LCH}]{4}\[${SUFF}]/ {if ($$2>4) {print $$1,$$2}}
+# /^[-${LCH}]{4}\[${SUFF}]/ {if ($$2>4) {print $$1,$$2}}
# says that words with length 4 containing only lowercase letters with
# frequency greater then 5 should be included. Edit the scripts as
@@ -560,7 +560,7 @@
| cat forkort-nn.txt - \
| $(SED) -e N -e
's/^\(\([-${CH}]\)*\)er\/\(.*F.*\)\n\1rar\/M$$/\1er\/\3D/' \
-e '$$ p' -e '$$ d' -e P -e D \
- | LC_COLLATE=C sort > $@
+ | LC_COLLATE=C sort > $@
words.nb: ${LANGUAGE}.words
# Here is a rule to make a list of the most common Norwegian words.
@@ -585,7 +585,7 @@
| tr -d '\"-' \
| grep -v '\(xxxx\|yyyy\|zyzyzy\)' \
| sort -f \
- > $@
+ > $@
# Here is a target that picks words with given frequency.
words.${LANGUAGE}.%: ${LANGUAGE}.words
@@ -609,15 +609,19 @@
echo "name nb" > $@
echo "charset iso8859-1" >> $@
echo "run-together true" >> $@
- echo "special ' -*- - -*-" >> $@
+ echo "special ' -*- - -*- . -*- \" -*-" >> $@
echo "soundslike none" >> $@
+ echo "affix nb" >> $@
+ echo "affix-compress true" >> $@
nn.dat: Makefile
rm -f $@
echo "name nn" > $@
echo "charset iso8859-1" >> $@
echo "run-together true" >> $@
- echo "special ' -*- - -*-" >> $@
+ echo "special ' -*- - -*- . -*- \" -*-" >> $@
echo "soundslike none" >> $@
+ echo "affix nn" >> $@
+ echo "affix-compress true" >> $@
nb.rws: nb.mch nb.dat
$(ISPELL) -d ./nb -e < nb.mch \
@@ -668,16 +672,16 @@
myspell: nb_NO.mydict nb_NO.myaff nn_NO.mydict nn_NO.myaff # th_nb_NO.idx #
th_nn_NO.idx
nb_NO.myaff.munch: nb_NO.myheader nb.aff.munch
- $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 \
+ $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 --extraflags\
--myheader=nb_NO.myheader nb.aff.munch > nb_NO.myaff.munch
nn_NO.myaff.munch: nn_NO.myheader nn.aff.munch
- $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 \
+ $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 --extraflags \
--myheader=nn_NO.myheader nn.aff.munch > nn_NO.myaff.munch
nb_NO.myaff: nb_NO.myheader nb.aff
- $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 \
+ $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 --extraflags\
--myheader=nb_NO.myheader nb.aff > nb_NO.myaff
nn_NO.myaff: nn_NO.myheader nn.aff
- $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 \
+ $(ISPELLAFF2MYSPELL) --charset=latin1 --split=200 --extraflags\
--myheader=nn_NO.myheader nn.aff > nn_NO.myaff
nb.munched: nb.munch nb_NO.myaff.munch
munch nb.munch nb_NO.myaff.munch > $@
@@ -753,7 +757,7 @@
| egrep -v '^%|^\\|\}' \
) > $@
-install-myspell-hyph-nb: hyph_no_NO.dic
+install-myspell-hyph-nb: hyph_no_NO.dic
$(INSTALL) -d $(DESTDIR)$(myspelldir)/
$(INSTALL_DATA) hyph_no_NO.dic $(DESTDIR)$(myspelldir)/hyph_nb_NO.dic
@echo "remember to add 'HYPH nb NO hyph_nb_NO' to
$(DESTDIR)$(myspelldir)/dictionary.lst"
only in patch2:
unchanged:
--- norwegian-2.0.9.orig/debian/wnorwegian.po-master.templates
+++ norwegian-2.0.9/debian/wnorwegian.po-master.templates
@@ -0,0 +1,20 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# [EMAIL PROTECTED] for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: wnorwegian/whichvariant
+Type: select
+# bokmaal is an ASCII transliteration. aa is in fact the <U00C5>
+# Unicode glyph, rendered as a lower a with a ring above. Please
+# use this glyph when available. The HTML entity is å
+__Choices: nynorsk, bokmaal
+Default: bokmaal
+_Description: Norwegian language variant:
+ Norwegian has two different written forms: bokmaal and nynorsk.
+ .
+ Please choose the one you wish to use.
only in patch2:
unchanged:
--- norwegian-2.0.9.orig/debian/aspell-no.links
+++ norwegian-2.0.9/debian/aspell-no.links
@@ -0,0 +1,2 @@
+/var/lib/aspell/nb.rws /usr/lib/aspell/nb.rws
+/var/lib/aspell/nn.rws /usr/lib/aspell/nn.rws
only in patch2:
unchanged:
--- norwegian-2.0.9.orig/debian/inorwegian.po-master.templates
+++ norwegian-2.0.9/debian/inorwegian.po-master.templates
@@ -0,0 +1,20 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# [EMAIL PROTECTED] for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: inorwegian/whichvariant
+Type: select
+# bokmaal is an ASCII transliteration. aa is in fact the <U00C5>
+# Unicode glyph, rendered as a lower a with a ring above. Please
+# use this glyph when available. The HTML entity is å
+__Choices: nynorsk, bokmaal
+Default: bokmaal
+_Description: Norwegian language variant:
+ Norwegian has two different written forms: bokmaal and nynorsk.
+ .
+ Please choose the one you wish to use.
only in patch2:
unchanged:
--- norwegian-2.0.9.orig/debian/aspell-no.info-aspell
+++ norwegian-2.0.9/debian/aspell-no.info-aspell
@@ -0,0 +1,21 @@
+Language: bokmål (Bokmal Norwegian)
+Hash-Name: nb
+Emacsen-Name: bokmal
+Casechars:
[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
+Not-Casechars:
[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
+Otherchars: [\"]
+Many-Otherchars: none
+Additionalchars:
\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370
+Coding-System: iso-8859-1
+Locale: nb nb_NO
+
+Language: nynorsk (New Norwegian)
+Hash-Name: nn
+Emacsen-Name: nynorsk
+Casechars:
[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
+Not-Casechars:
[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]
+Otherchars: [\"]
+Many-Otherchars: none
+Additionalchars:
\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370
+Coding-System: iso-8859-1
+Locale: nn nn_NO
only in patch2:
unchanged:
--- norwegian-2.0.9.orig/nn.aff.in
+++ norwegian-2.0.9/nn.aff.in
@@ -38,7 +38,7 @@
altstringtype "tex" "TeX" ".tex" ".bib"
-altstringchar ç ç
+altstringchar ç ç
altstringchar Ç Ç
altstringchar é é
altstringchar É É
@@ -59,7 +59,7 @@
altstringchar å å
altstringchar Å Å
-#
+#
# Html
#
# Dette virker kun fra og med ispell-3.2.
@@ -393,7 +393,7 @@
[^S] S E L > -EL,LAR # barsel > barslAR
T T E L > -TEL,LAR # tittel > titlAR
[^T] T E L > -EL,LAR # apostel> apostlAR
- [^FMK] E R > -AR,RAR # alder > aldrar
+ [^FMK] E R > -ER,RAR # alder > aldrar
# F E R > -FER,RE # offer > ofre
# M E R > -MER,RE # nummer > numre
K E R > -ER,RAR # åker > åkrar
@@ -641,8 +641,8 @@
M E T > -MET,NE # kommet > komne
E L E > -ELE,AL # stjele > stjal
E L E > -ELE,ÅLET # stjele > stjålet
- E R E > -ØRE,ORDE # gjøre > gjorde
- E R E > -ØRE,ORT # gjøre > gjort
+ Ø R E > -ØRE,ORDE # gjøre > gjorde
+ Ø R E > -ØRE,ORT # gjøre > gjort
E G G E > -EGGE,AGT # legge > lagt
E G G E > -EGGE,AGTE # legge > lagte
U M > -UM,A # sentrum > sentra
@@ -668,7 +668,7 @@
# Genitiv av substantiverte adjektiv er utelatt, men jevnfør flaggene J og K.
flag *W: # intetkjønn i adjektiv: -t og -tt
- # Flertall ing-endelse i verb
+ # Flertall ing-endelse i verb
[^FKLNTIAØÅ] > T # stor > stort
[^F] F > T # apokryf> apokryft
F F > -F,T # tøff > tøft
