Bug#772499: unblock: cyphesis-cpp/0.6.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package cyphesis-cpp
This version is the culmination of an extensive effort to fix this package
enough to allow its inclusion in Jessie. Cyphesis-cpp is the core of the
WorldForge system for creating online games and online worlds. It has no
reverse dependencies.
Please consider allowing this package to enter testing. All other WorldForge
packages are currently in testing. This is the last step towards a functioning
WorldForge system in Jessie. And its inclusion would make this rookie
maintainer happy. :)
The following 5 serious bugs and 1 translation have been fixed since my
initial (0.6.0-1) upload: (this is the complete changelog since that version)
* Fix d/postinst error (Closes: #767057)
* Fix libreadline dependency (Closes: #767009)
* Prevent d/postinst from violating policy (Closes: #767818)
* Fix broken build tests (Closes: #772098)
* Update Dutch debconf translation:
- Thanks to Frans Spiesschaert (Closes: #771370)
Please let me know if you have any questions about my request or if I can do
anything to simplify the process from your end. Thank you!
-Olek
PS Output from debdiff and git diff attached below
unblock cyphesis-cpp/0.6.0-3
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF8, LC_CTYPE=en_US.UTF8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----start debdiff-----
File lists identical (after any substitutions)
Control files of package cyphesis-cpp: lines which differ (wdiff format)
------------------------------------------------------------------------
Installed-Size: [-2410-] {+2413+}
Version: [-0.6.0-1-] {+0.6.0-3+}
Control files of package cyphesis-cpp-clients: lines which differ (wdiff format)
--------------------------------------------------------------------------------
Version: [-0.6.0-1-] {+0.6.0-3+}
Control files of package cyphesis-cpp-mason: lines which differ (wdiff format)
------------------------------------------------------------------------------
Version: [-0.6.0-1-] {+0.6.0-3+}
-----end debdiff-----
-----start git diff-----
diff --git a/debian/changelog b/debian/changelog
index 2a12c0e..41ade21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+cyphesis-cpp (0.6.0-3) unstable; urgency=medium
+
+ * Prevent d/postinst from violating policy (Closes: #767818)
+ * Fix broken build tests (Closes: #772098)
+ * Update Dutch debconf translation:
+ - Thanks to Frans Spiesschaert (Closes: #771370)
+
+ -- Olek Wojnar <olek-dev@wojnar.org> Thu, 04 Dec 2014 22:32:18 -0500
+
+cyphesis-cpp (0.6.0-2) unstable; urgency=medium
+
+ * Fix d/postinst error (Closes: #767057)
+ * Fix libreadline dependency (Closes: #767009)
+
+ -- Olek Wojnar <olek-dev@wojnar.org> Tue, 28 Oct 2014 01:11:17 -0500
+
cyphesis-cpp (0.6.0-1) unstable; urgency=low
* Incorporate and acknowledge NMU, thanks Christian Perrier
diff --git a/debian/control b/debian/control
index a159dc7..df2ce17 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
libgcrypt11-dev,
libmercator-0.3-dev (>= 0.3.0),
libpq-dev,
- libreadline5-dev | libreadline-dev,
+ libreadline-dev,
libsigc++-2.0-dev,
libskstream-0.3-dev,
libvarconf-dev,
diff --git a/debian/cyphesis-cpp.config b/debian/cyphesis-cpp.config
index 4b17424..630f133 100644
--- a/debian/cyphesis-cpp.config
+++ b/debian/cyphesis-cpp.config
@@ -15,16 +15,6 @@ DB_PWD=""
USE_META="false"
AUTOSTART="false"
-# retrieve values from configfile (if present)
-if test -f $CONFFILE ; then
- DB_HOST=`grep "^dbserver" $CONFFILE | sed -e 's/^dbserver.*\"\(.*\)\"/\1/'`
- DB_NAME=`grep "^dbname" $CONFFILE | sed -e 's/^dbname.*\"\(.*\)\"/\1/'`
- DB_USER=`grep "^dbuser" $CONFFILE | sed -e 's/^dbuser.*\"\(.*\)\"/\1/'`
- DB_PWD=`grep "^dbpasswd" $CONFFILE | sed -e 's/^dbpasswd.*\"\(.*\)\"/\1/'`
- USE_META=`grep "^usemetaserver" $CONFFILE | sed -e 's/^usemetaserver.*\"\(.*\)\"/\1/'`
- AUTOSTART=`grep "^daemon" $CONFFILE | sed -e 's/^daemon.*\"\(.*\)\"/\1/'`
-fi
-
# set actual values
db_set cyphesis-cpp/postgresql/server $DB_HOST
db_set cyphesis-cpp/postgresql/database $DB_NAME
diff --git a/debian/cyphesis-cpp.postinst b/debian/cyphesis-cpp.postinst
index 38d171b..c42e168 100644
--- a/debian/cyphesis-cpp.postinst
+++ b/debian/cyphesis-cpp.postinst
@@ -4,61 +4,16 @@ set -e
. /usr/share/debconf/confmodule
-CONFFILE=/etc/cyphesis/cyphesis.vconf
-
if [ "$1" = configure ] ;
then
# Add user cyphesis as system user
- adduser --system --quiet --no-create-home --home /usr/share/games/cyphesis --gecos "Cyphesis C++ Administrator" Cyphesis
-
- if [ ! -f $CONFFILE ] ;
- then
- cp /usr/share/games/cyphesis/cyphesis.vconf $CONFFILE
- fi
+ adduser --system --quiet --no-create-home --home /usr/share/games/cyphesis --gecos "Cyphesis C++ Administrator" --force-badname Cyphesis
# Get the return values
- db_get cyphesis-cpp/postgresql/local_server
- LOCAL=$RET
-
- db_get cyphesis-cpp/postgresql/server
- DB_HOST=$RET
-
- db_get cyphesis-cpp/postgresql/database
- DB_NAME=$RET
-
- db_get cyphesis-cpp/postgresql/username
- DB_USER=$RET
-
- db_get cyphesis-cpp/postgresql/password
- DB_PWD=$RET
-
- db_get cyphesis-cpp/usemetaserver
- USE_META=$RET
-
db_get cyphesis-cpp/autostart
AUTOSTART=$RET
- # Set values in conffile
- sed -e "s/^.*dbserver *=.*/dbserver=\"$DB_HOST\"/" \
- -e "s/^.*dbname *=.*/dbname=\"$DB_NAME\"/" \
- -e "s/^.*dbuser *=.*/dbuser=\"$DB_USER\"/" \
- -e "s/^.*dbpasswd *=.*/dbpasswd=\"$DB_PWD\"/" \
- -e "s/^.*usemetaserver *=.*/usemetaserver=\"$USE_META\"/" \
- -e "s/^.*daemon *=.*/daemon=\"$AUTOSTART\"/" \
- < $CONFFILE \
- > $CONFFILE.tmp
- mv $CONFFILE.tmp $CONFFILE
-
- # Comment out dbserver if unix sockets should be used
- if [ "x$LOCAL" = xtrue ] ;
- then
- sed -e "s/^dbserver/#dbserver/" \
- < $CONFFILE \
- > $CONFFILE.tmp
- mv $CONFFILE.tmp $CONFFILE
- fi
-
# This is a little ugly but otherwise lintian complains
update-rc.d cyphesis-cpp defaults >/dev/null
if [ "x$AUTOSTART" != xtrue ] ; then
@@ -70,7 +25,7 @@ then
fi
# Clear password from debconf database
- db_reset
+ db_reset cyphesis-cpp/postgresql/password
update-rc.d cyphesis-cpp $update_rc >/dev/null
invoke-rc.d cyphesis-cpp $invoke_rc || exit $?
diff --git a/debian/patches/disable-comm-peer-test.patch b/debian/patches/disable-comm-peer-test.patch
new file mode 100644
index 0000000..216ea31
--- /dev/null
+++ b/debian/patches/disable-comm-peer-test.patch
@@ -0,0 +1,16 @@
+Description: Disable CommPeertest
+ Due to buildd network limitations
+Forwarded: not-needed
+Author: Olek Wojnar <olek-dev@wojnar.org>
+Last-Update: 2014-11-30
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -79,7 +79,7 @@
+ Linktest
+
+ SERVER_COMM_TESTS = CommSockettest CommStreamClienttest CommClienttest \
+- CommHttpClienttest CommStreamListenertest CommPeertest \
++ CommHttpClienttest CommStreamListenertest \
+ CommMDNSPublishertest CommClientKittest \
+ CommHttpClientFactorytest
+
diff --git a/debian/patches/series b/debian/patches/series
index 65c785f..e80842d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+disable-comm-peer-test.patch
fix-broken-PythonArithmeticScripttest.patch
man_pages_to_section_6.patch
add-missing-man-pages.patch
diff --git a/debian/po/nl.po b/debian/po/nl.po
index bee4eab..186dd3c 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -17,19 +17,21 @@
# Luk Claes <luk.claes(AT)ugent(DOT)be>, 2004
# Kurt De Bree <kdebree(AT)telenet(DOT)be>, 2006
# This is an unofficial translation
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: cyphesis-cpp 0.5.6-1\n"
"Report-Msgid-Bugs-To: cyphesis-cpp@packages.debian.org\n"
"POT-Creation-Date: 2014-04-30 01:26-0500\n"
-"PO-Revision-Date: 2006-06-19 19:35+0100\n"
-"Last-Translator: Kurt De Bree <kdebree(AT)telenet(DOT)be>\n"
-"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"PO-Revision-Date: 2014-11-04 14:18+0100\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: note
#. Description
@@ -46,9 +48,9 @@ msgid ""
"but it has to be reachable over a network and you have to have access to it."
msgstr ""
"Om cyphesis-cpp te gebruiken, moet u toegang hebben tot een postgresql-"
-"server. Deze server hoeft niet geïnstalleerd te zijn op dezelfde host als "
-"cyphesis-cpp, maar ze moet bereikbaar zijn over het netwerk en u moet er "
-"toegang toe hebben."
+"server. Deze server hoeft niet geïnstalleerd te zijn op dezelfde computer "
+"als cyphesis-cpp, maar hij moet bereikbaar zijn over het netwerk en u moet "
+"er toegang toe hebben."
#. Type: note
#. Description
@@ -75,7 +77,7 @@ msgid ""
"then. This is recommended for local usage as it's thought to be more secure."
msgstr ""
"Cyphesis-cpp kan een lokale postgresql-server gebruiken over unix-sockets in "
-"plaats van over het netwerk. De databankserver moet dan niet naar het "
+"plaats van over het netwerk. De databaseserver moet dan niet naar het "
"netwerk luisteren. Dit wordt aanbevolen voor lokaal gebruik omdat algemeen "
"aangenomen wordt dat dit veiliger is."
@@ -83,12 +85,11 @@ msgstr ""
#. Description
#: ../cyphesis-cpp.templates:3001
msgid "Database server:"
-msgstr "Databankserver"
+msgstr "Databaseserver:"
#. Type: string
#. Description
#: ../cyphesis-cpp.templates:3001
-#, fuzzy
#| msgid ""
#| "On which host is the postgresql database server located, which will be "
#| "used by cyphesis-cpp to store its internal data?"
@@ -96,8 +97,8 @@ msgid ""
"The host on which the postgresql database server is located. This will be "
"used by cyphesis-cpp to store its internal data."
msgstr ""
-"Op welke host bevindt zich de postgresql-databankserver die gebruikt zal "
-"worden door cyphesis-cpp om interne gegevens op te slaan?"
+"De computer waarop zich de postgresql-databaseserver bevindt en die door "
+"cyphesis-cpp gebruikt zal worden om interne gegevens op te slaan."
#. Type: string
#. Description
@@ -108,13 +109,11 @@ msgstr "Naam van de databank:"
#. Type: string
#. Description
#: ../cyphesis-cpp.templates:4001
-#, fuzzy
#| msgid ""
#| "What is the database name cyphesis-cpp should use on the database server?"
msgid "The database name cyphesis-cpp should use on the database server."
msgstr ""
-"Wat is de naam van de databank die cyphesis-cpp moet gebruiken op de "
-"databankserver?"
+"De naam van de databank die cyphesis-cpp moet gebruiken op de databaseserver."
#. Type: string
#. Description
@@ -126,7 +125,7 @@ msgstr "Databankgebruiker:"
#. Description
#: ../cyphesis-cpp.templates:5001
msgid "Please type in the username for the database server"
-msgstr "Geef de gebruikersnaam voor de databankserver"
+msgstr "Geef de gebruikersnaam voor de databaseserver"
#. Type: password
#. Description
@@ -138,13 +137,13 @@ msgstr "Wachtwoord:"
#. Description
#: ../cyphesis-cpp.templates:6001
msgid "Please type in the password to use to access the database server"
-msgstr "Geef het wachtwoord om toegang te krijgen tot de databankserver."
+msgstr "Geef het wachtwoord om toegang te krijgen tot de databaseserver"
#. Type: boolean
#. Description
#: ../cyphesis-cpp.templates:7001
msgid "Register with the WorldForge metaserver?"
-msgstr ""
+msgstr "U melden bij de metaserver van WorldForge?"
#. Type: boolean
#. Description
@@ -163,6 +162,7 @@ msgstr ""
#: ../cyphesis-cpp.templates:8001
msgid "Automatically start the Cyphesis server on boot?"
msgstr ""
+"Bij het opstarten van de computer de Cyphesis-server automatisch starten?"
#. Type: boolean
#. Description
@@ -173,6 +173,10 @@ msgid ""
"you are looking for. By default, you will need to manually start Cyphesis-"
"cpp from the command line so that it does not run when it is not needed."
msgstr ""
+"Cyphesis-cpp kan automatisch gestart worden bij het opstarten van de "
+"computer. Maar tenzij het een gereserveerde server betreft, is dit wellicht "
+"niet het gewenste gedrag. Standaard moet u Cyphesis-cpp handmatig opstarten "
+"vanaf de commandolijn, zodat het niet onnodig actief is."
#~ msgid "Use a metaserver?"
#~ msgstr "Een metaserver gebruiken?"
-----end git diff-----
Reply to: