Package: xuxen-eu-spell
Severity: important
Tags: patch l10n

Dear Maintainer,

Basque-speaking users living in France usually set their locale to eu_FR
and they expect to get a working spell-checker in LibreOffice Writer.

Currently Debian Jessie does not provide that.

Packages hunspell-eu-es and aspell-eu-es do not register eu_FR
dictionaries.

Providing eu_FR seems enough for hunspell but the LibreOffice
spell-checker wants "eu" (without the country part).

I attach a patch against current git.

It provides dictionaries for "eu" and "eu_FR" in addition to "eu_ES"

It renames packages *spell-eu-es to *spell-eu since they also apply to
locale eu_FR
diff --git a/debian/aspell-eu-es.dirs b/debian/aspell-eu.dirs
similarity index 100%
rename from debian/aspell-eu-es.dirs
rename to debian/aspell-eu.dirs
diff --git a/debian/aspell-eu-es.docs b/debian/aspell-eu.docs
similarity index 100%
rename from debian/aspell-eu-es.docs
rename to debian/aspell-eu.docs
diff --git a/debian/aspell-eu-es.info-aspell b/debian/aspell-eu.info-aspell
similarity index 93%
rename from debian/aspell-eu-es.info-aspell
rename to debian/aspell-eu.info-aspell
index e6d2c75..d3e60eb 100644
--- a/debian/aspell-eu-es.info-aspell
+++ b/debian/aspell-eu.info-aspell
@@ -8,6 +8,6 @@ Many-Otherchars:
 Additionalchars: ñáàéèíìóòúùüÑÁÀÉÈÍÌÓÒÚÙÜ
 Ispell-Args: -B
 Extended-Character-Mode: ~latin1
-Aspell-Locales: eu, eu_ES
+Aspell-Locales: eu, eu_ES, eu_FR
 Coding-System: iso-8859-1
 Auto-Compat: eu
diff --git a/debian/changelog b/debian/changelog
index 628d20b..169f5cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xuxen-eu-spell (0.4.20081029-11.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Provides dictionaries for "eu" and "eu_FR" in addition to "eu_ES"
+    ("eu" is required by LibreOffice)
+  * Renamed *spell-eu-es to *spell-eu since they also apply to locale eu_FR
+
+ -- Sebastien Ducoulombier <[email protected]>  Tue, 13 Oct 2015 15:50:15 +0200
+
 xuxen-eu-spell (0.4.20081029-11) unstable; urgency=medium
 
   * debian/rules: Build in a reproducible and known to work LC_ALL=C
diff --git a/debian/control b/debian/control
index 9cabd04..b333087 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,10 @@ Build-Depends: debhelper (>= 7),
 	       aspell
 Standards-Version: 3.9.6
 
-Package: hunspell-eu-es
+Package: hunspell-eu
 Architecture: all
 Replaces: openoffice.org-spellcheck-eu,
+	  hunspell-eu-es,
 	  myspell-eu-es
 Provides: hunspell-dictionary,
 	  hunspell-dictionary-eu,
@@ -38,9 +39,10 @@ Description: Basque (Euskera) dictionary for hunspell
  This is the Basque (Euskera) dictionary for use with
  the hunspell spellchecker.
 
-Package: aspell-eu-es
+Package: aspell-eu
 Architecture: all
 Multi-Arch: foreign
+Replaces: aspell-eu-es
 Provides: aspell-dictionary
 Depends: ${misc:Depends},
 	 ${aspell:Depends}
diff --git a/debian/hunspell-eu-es.info-myspell b/debian/hunspell-eu-es.info-myspell
deleted file mode 100644
index 485c211..0000000
--- a/debian/hunspell-eu-es.info-myspell
+++ /dev/null
@@ -1,2 +0,0 @@
-# Euskera
-DICT eu ES eu-ES
diff --git a/debian/hunspell-eu-es.info-hunspell b/debian/hunspell-eu.info-hunspell
similarity index 89%
rename from debian/hunspell-eu-es.info-hunspell
rename to debian/hunspell-eu.info-hunspell
index fb0aed4..9641b4f 100644
--- a/debian/hunspell-eu-es.info-hunspell
+++ b/debian/hunspell-eu.info-hunspell
@@ -1,5 +1,5 @@
 Language: euskera (Basque)
-Hash-Name: eu_ES
+Hash-Name: eu
 Emacsen-Name: euskera
 Casechars: [a-z\340\341\350\351\354\355\362\363\371\372\374\347\361A-Z\300\301\310\311\314\315\322\323\331\332\334\307\321]
 Not-Casechars: [^a-z\340\341\350\351\354\355\362\363\371\372\374\347\361A-Z\300\301\310\311\314\315\322\323\331\332\334\307\321]
@@ -7,5 +7,5 @@ Otherchars: [-]
 Many-Otherchars:
 Additionalchars: ñáàéèíìóòúùüÑÁÀÉÈÍÌÓÒÚÙÜ
 Ispell-Args: -B
-Hunspell-Locales: eu, eu_ES
+Hunspell-Locales: eu, eu_ES, eu_FR
 Coding-System: iso-8859-1
diff --git a/debian/hunspell-eu.info-myspell b/debian/hunspell-eu.info-myspell
new file mode 100644
index 0000000..6769370
--- /dev/null
+++ b/debian/hunspell-eu.info-myspell
@@ -0,0 +1,3 @@
+# Euskera
+DICT eu ES eu
+DICT eu FR eu
diff --git a/debian/rules b/debian/rules
index d42d7e9..e2f2e25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,12 +21,12 @@ export DH_OPTIONS
 LC_ALL = C
 export LC_ALL
 
-APKG            = aspell-eu-es
+APKG            = aspell-eu
 AVAR            = /var/lib/aspell
 ALIB            = /usr/lib/aspell
 ASHARE          = /usr/share/aspell
 # -- hunspell stuff ----
-HPKG            = hunspell-eu-es
+HPKG            = hunspell-eu
 HDICTSDIR       = /usr/share/myspell/dicts
 # -- aspell official dict builddir
 ASPELL6BASENAME = aspell6-eu
@@ -68,8 +68,8 @@ build-indep-stamp: configure-stamp
 #	sed '1d' eu-ES.dic | LANG=C sort -u | prezip | gzip -c > eu.cwl.gz
 #	sed '1d' eu-ES.dic | grep -v '[\._][^\/$]' | LANG=C sort -u | prezip | gzip -c > eu.cwl.gz
 	sed '1d' myspell/eu-ES.dic | grep -v -e '[\._]' -e '^katen\-' | prezip -s | gzip -9n -c > eu.cwl.gz
-	installdeb-hunspell -phunspell-eu-es
-	installdeb-aspell   -paspell-eu-es
+	installdeb-hunspell -phunspell-eu
+	installdeb-aspell   -paspell-eu
 	touch $@
 
 aspelltgz: clean build
@@ -97,6 +97,9 @@ clean:
 
 	rm -rf $(ASPELL6DIR)
 
+	rm -f hunspell/eu.aff
+	rm -f hunspell/eu.dic
+
 	dh_clean
 
 #install: install-indep install-arch
@@ -114,7 +117,9 @@ install-indep: build-indep
 	install -m 644 eu.cwl.gz debian/$(APKG)/$(ASHARE)
 	install -m 644 debian/aspell/eu* debian/$(APKG)/$(ALIB)
 # -------------
-	installdeb-myspell  -phunspell-eu-es --srcdir=hunspell
+	ln -s eu-ES.aff hunspell/eu.aff
+	ln -s eu-ES.dic hunspell/eu.dic
+	installdeb-myspell -phunspell-eu --srcdir=hunspell
 
 install-arch: build-arch
 

Reply via email to