Your message dated Sun, 12 Apr 2009 12:02:12 +0000
with message-id <e1lsyo4-0004gf...@ries.debian.org>
and subject line Bug#523161: fixed in geneweb 5.01-9
has caused the Debian Bug report #523161,
regarding FTBFS: Remove dependency on iso_639.tab file
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
523161: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523161
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: geneweb
Version: 5.01-8
Severity: serious
Tags: patch
Hi Christian,
I've prepared a patch for you to remove the dependency on the iso_639.tab
file. I've built the package successfully here, the language choices in the
debconf frontend seem to be sane as well. However, I don't use the package
geneweb myself, so it would be great if you could check for yourself if the
patch is really complete.
Regards,
Tobias
--
Tobias Quathamer | Absolutely nothing should be concluded from these
Hamburg, Germany | figures except that no conclusion can be drawn from them.
diff --git a/debian/control b/debian/control
index ba70c50..d69da34 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Christian Perrier <bubu...@debian.org>
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5.0.0), ocaml-best-compilers, ocaml (>= 3.04), camlp5, doc-base, dh-buildinfo, iso-codes, po-debconf, quilt (>= 0.40)
+Build-Depends: debhelper (>= 5.0.0), ocaml-best-compilers, ocaml (>= 3.04), camlp5, doc-base, dh-buildinfo, iso-codes, isoquery, po-debconf, quilt (>= 0.40)
Homepage: http://www.geneweb.org/
@@ -11,7 +11,7 @@ Package: geneweb
Section: misc
Architecture: any
Depends: ${shlibs:Depends},perl5-base, lsb-base (>= 3.0-6)
-Pre-Depends: ${misc:Depends}, iso-codes, adduser
+Pre-Depends: ${misc:Depends}, iso-codes, isoquery, adduser
Suggests: menu (>=2.1.35), gwtp, gwsetup, lynx | www-browser
Priority: optional
Description: genealogy software with web interface
diff --git a/debian/geneweb.config b/debian/geneweb.config
index cb2944e..1605264 100644
--- a/debian/geneweb.config
+++ b/debian/geneweb.config
@@ -8,9 +8,8 @@ db_version 2.0 || [ $? -lt 30 ]
db_title "Geneweb genealogy software"
-# ISO 639 (language nales and codes) reference file
-# Needs Depends: iso-codes
-ISO639=/usr/share/iso-codes/iso_639.tab
+# Needs Depends: iso-codes, isoquery
+ISOQUERY=/usr/bin/isoquery
# These will be used here and there below
SERVICES=/etc/services
@@ -44,10 +43,9 @@ read_rcfile() {
}
translate_LNG() {
- # Waiting for a more general script in the iso-codes package
- # see debian-devel-french archives from April 2003
+ # Get the full language name from the two letter code
if [ -n "$LNG" ] ; then
- FULLLNG=`grep -E "^[a-z][a-z][a-z] [a-z][a-z][a-z] $LNG " $ISO639 | awk '{print $4};'`
+ FULLLNG=`$ISOQUERY --iso=639 "$LNG" | cut -f4`
fi
}
@@ -76,8 +74,7 @@ get_debconf() {
FULLLNG=$RET
# Find the two letter code for language
- # waiting for a more general script in the iso-codes package
- LNG=`grep " ${FULLLNG}\$" $ISO639 | grep -v XX | awk '{print $3};'`
+ LNG=`$ISOQUERY --iso=639 | grep "${FULLLNG}\$" | cut -f3`
db_get geneweb/run_mode
diff --git a/debian/geneweb.postinst b/debian/geneweb.postinst
index 17c6878..3169ac6 100644
--- a/debian/geneweb.postinst
+++ b/debian/geneweb.postinst
@@ -5,9 +5,8 @@
set +e
-# ISO 639 (language nales and codes) reference file
-# Needs Depends: iso-codes
-ISO639=/usr/share/iso-codes/iso_639.tab
+# Needs Depends: iso-codes, isoquery
+ISOQUERY=/usr/bin/isoquery
# These will be used here and there below
SERVICES=/etc/services
@@ -84,9 +83,8 @@ get_debconf() {
FULLLNG=$DEFAULTFULLLNG
fi
# Find the two letter code for language
- # waiting for a more general script in the iso-codes package
# LNG=`echo $FULLLNG | cut -f 2 -d "(" | cut -f 1 -d ")"`
- LNG=`grep " ${FULLLNG}\$" $ISO639 | grep -v XX | awk '{print $3};'`
+ LNG=`$ISOQUERY --iso=639 | grep "${FULLLNG}\$" | cut -f3`
db_get geneweb/run_mode
diff --git a/debian/mktemplates b/debian/mktemplates
index 1942392..9e21a97 100644
--- a/debian/mktemplates
+++ b/debian/mktemplates
@@ -8,23 +8,16 @@ set -e
# iso-codes package
#
# Some variables
-# This one will be useless when iso-codes-utils will be available
-ISO639TAB=/usr/share/iso-codes/iso_639.tab
+ISOQUERY=/usr/bin/isoquery
# Translations location (relative to the build root directory)
ISO639TRANSLATIONS=debian/iso-codes
#
# This file will have all wanted languages, one ISO-639 code per line
LANGUAGELIST=debian/languages
-# Be a bit more safe
-[ -r $ISO639TAB ] || exit 1
-
# For each supported language, get the language name from ISO 639 list
(for lang in `cat debian/languages | grep -v "^#"` ; do
- echo `cat $ISO639TAB | grep -v "^#" | \
- awk '{print $3 " " $4 " " $5}' | \
- grep "^$lang " | \
- awk '{print $2 " " $3}'`
+ $ISOQUERY --iso=639 $lang | cut -f4
done) | \
(read a; echo -n "$a"; while read b; do echo -n ", $b"; done; echo) \
>debian/languagelist
diff --git a/debian/rules b/debian/rules
index cd3e3eb..64338c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ clean-patched:
debconf-updatepo
# Add here commands to clean up after the build process.
- [ ! -f tools/Makefile.inc ] || [ ! -f Makefile] || $(MAKE) clean
+ [ ! -f tools/Makefile.inc ] || [ ! -f Makefile ] || $(MAKE) clean
# Clean out cruft left by former builds
rm -f tools/Makefile.inc
signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
Source: geneweb
Source-Version: 5.01-9
We believe that the bug you reported is fixed in the latest version of
geneweb, which is due to be installed in the Debian FTP archive:
geneweb_5.01-9.diff.gz
to pool/main/g/geneweb/geneweb_5.01-9.diff.gz
geneweb_5.01-9.dsc
to pool/main/g/geneweb/geneweb_5.01-9.dsc
geneweb_5.01-9_i386.deb
to pool/main/g/geneweb/geneweb_5.01-9_i386.deb
gwsetup_5.01-9_i386.deb
to pool/main/g/geneweb/gwsetup_5.01-9_i386.deb
gwtp_5.01-9_i386.deb
to pool/main/g/geneweb/gwtp_5.01-9_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 523...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christian Perrier <bubu...@debian.org> (supplier of updated geneweb package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 12 Apr 2009 11:57:21 +0200
Source: geneweb
Binary: geneweb gwtp gwsetup
Architecture: source i386
Version: 5.01-9
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <bubu...@debian.org>
Changed-By: Christian Perrier <bubu...@debian.org>
Description:
geneweb - genealogy software with web interface
gwsetup - utilities to configure and manipulate Geneweb databases
gwtp - web interface interacting with Geneweb databases
Closes: 521674 523161
Changes:
geneweb (5.01-9) unstable; urgency=low
.
* First upload for squeeze
* Upgrade Standards to 3.8.1: /var/run/gwtp has been dealt with
(see below)
* debian/patches/014_no-warn-error: disable -warn-error to fix
a build failure. Closes: #521674
Thanks to Stéphane Glondu for the patch
* Lintian fixes:
- geneweb.postinst: no longer ignore errors (set -e)
- gwtp.postinst: no longer ignore errors (set -e)
- gwtp.prerm: no longer ignore errors (set -e)
- gwsetup.postinst: no longer ignore errors (set -e)
- control: add ${misc:Depends} to gwtp dependencies
- gwtp.dirs, add-on/gwtp/cgi/gwtp.cgi: /var/run/gwtp is no
longer provided in the package but created dynamically by the CGI
wrapper
* No longer use iso_639.tab for languages' names. Use
isoquery output instead. Thanks to Tobias Quatamer for the patch
Closes: #523161
* Drop upgrade code from a pre-lenny version in gwtp.prerm. That empties
that script which is thus removed.
Checksums-Sha1:
53d863e2a276f8154596e4f0c2714b3643c6ac75 1122 geneweb_5.01-9.dsc
4f4ce4d6b24585d47aaaf1c5851d236683d3536c 108831 geneweb_5.01-9.diff.gz
05d13391bf4dc1475a522274897069f6c25b8614 2881932 geneweb_5.01-9_i386.deb
c66ec890416cf87d30b6f8609be8c639cc18a50f 266396 gwtp_5.01-9_i386.deb
de1d8d00f2f1f5a3d42cfea2dcbc967f5808873d 274164 gwsetup_5.01-9_i386.deb
Checksums-Sha256:
90abcd228e0f8be3765d8215cc71f384d6827f71ee0a97b035ced5105c7f3afa 1122
geneweb_5.01-9.dsc
5c0bb17b2751baa29e9e45a48189fe45d250cb84ae53b915d97282d6c59dcc90 108831
geneweb_5.01-9.diff.gz
c7d79f2cbc23b4540608321b8ac5ea232ade41117942df0dbcda03a8d21ce0e3 2881932
geneweb_5.01-9_i386.deb
c01fc91bbaaf26efdce7cbe5d7bfc2dd894fa0c93e0a8f5e9c546c519281a752 266396
gwtp_5.01-9_i386.deb
7fac35046d9e789dde7b102ad7272079ad2bc631ce66f393fd102c68efe6e604 274164
gwsetup_5.01-9_i386.deb
Files:
afe62d5e547db3bc763fc2808e212c1c 1122 misc optional geneweb_5.01-9.dsc
cb3339c9c4608165d1e29bf7a684acdc 108831 misc optional geneweb_5.01-9.diff.gz
ce216e16e9a4a463b42059ba259eb524 2881932 misc optional geneweb_5.01-9_i386.deb
1360396afb0934334d9264a690a49c35 266396 misc optional gwtp_5.01-9_i386.deb
105a4e176c1716217da42e0c150b9835 274164 misc optional gwsetup_5.01-9_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAknh1SgACgkQ1OXtrMAUPS0BowCfSp7KQLJEkBxnNkZZ+4Ikbh9x
QDoAn1suBiN9v999EHMe+jaHcr8/0s1g
=qdZm
-----END PGP SIGNATURE-----
--- End Message ---
