# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1316552148 -7200 # Node ID d699288adb5a66887f3188f58202943320bc2c40 # Parent c44df3bd3c993a1f0c8d8ca074008cbb517f32a0 * new upstream * fixed more lintian warnungs (using overrides -> little-bird should fix) diff -r c44df3bd3c99 -r d699288adb5a debian/changelog --- a/debian/changelog Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/changelog Tue Sep 20 22:55:48 2011 +0200 @@ -1,3 +1,10 @@ +littlebird (2011092000-1) stable; urgency=low + + * new upstream + * fixed more lintian warnungs (using overrides -> little-bird should fix) + + -- Heiko Schlittermann Tue, 20 Sep 2011 22:53:49 +0200 + littlebird (2011091900-3) stable; urgency=low * new upstream... diff -r c44df3bd3c99 -r d699288adb5a debian/copyright --- a/debian/copyright Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/copyright Tue Sep 20 22:55:48 2011 +0200 @@ -14,6 +14,8 @@ License: Closed License. + Several parts may have other licenses. Please check the individual + *LICENSE* files. The Debian packaging is: diff -r c44df3bd3c99 -r d699288adb5a debian/littlebird-tc-core.install --- a/debian/littlebird-tc-core.install Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/littlebird-tc-core.install Tue Sep 20 22:55:48 2011 +0200 @@ -1,2 +1,2 @@ -LittleBird-Test/{CA,library,TrustCenter,RestInterface,3rdparty} /usr/share/littlebird-tc +{CA,library,TrustCenter,RestInterface,3rdparty} /usr/share/littlebird-tc debian/examples/apache /usr/share/doc/littlebird-tc/examples diff -r c44df3bd3c99 -r d699288adb5a debian/littlebird-tc-core.lintian-overrides --- a/debian/littlebird-tc-core.lintian-overrides Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/littlebird-tc-core.lintian-overrides Tue Sep 20 22:55:48 2011 +0200 @@ -1,2 +1,4 @@ littlebird-tc-core binary: executable-not-elf-or-script littlebird-tc-core binary: script-not-executable +littlebird-tc-core binary: embedded-javascript-library +littlebird-tc-core binary: extra-license-file diff -r c44df3bd3c99 -r d699288adb5a debian/littlebird-tc-sql.install --- a/debian/littlebird-tc-sql.install Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/littlebird-tc-sql.install Tue Sep 20 22:55:48 2011 +0200 @@ -1,1 +1,1 @@ -LittleBird-Test/Database /usr/share/littlebird-tc/ +Database /usr/share/littlebird-tc/ diff -r c44df3bd3c99 -r d699288adb5a debian/littlebird-tc-sql.lintian-overrides --- a/debian/littlebird-tc-sql.lintian-overrides Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/littlebird-tc-sql.lintian-overrides Tue Sep 20 22:55:48 2011 +0200 @@ -1,1 +1,2 @@ littlebird-tc-sql binary: executable-not-elf-or-script +littlebird-tc-sql binary: script-not-executable diff -r c44df3bd3c99 -r d699288adb5a debian/littlebird-tc-sql.templates --- a/debian/littlebird-tc-sql.templates Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/littlebird-tc-sql.templates Tue Sep 20 22:55:48 2011 +0200 @@ -8,23 +8,20 @@ _Description: Do you know how to access your database server as *admin*? During the package configuration (postinst) the database server needs to be contacted to setup the littlebird schema, install - a littlebird user etcpp. If you can provide the data to access - this server, please answer "yes", if not, - please answer "no" and return later and run - . - dpkg-reconfigure littlebird-tc-sql + a littlebird user, etc. Without the admin rights you have to return + later and reconfigure this package. Template: littlebird-tc/db/adminuser Type: string Default: root -_Description: The user to be used for the *administrative* database connection. +_Description: The user to be used for the *administrative* database connection: Some operations during install need administrative privileges, enter the name of the user who is empowered enough. Template: littlebird-tc/db/adminpass Type: password Default: -_Description: The password to be used for the *administrative* database connection. +_Description: The password to be used for the *administrative* database connection: Some operations during install need *administrative* privileges, enter the the password for the user who is empowered enough. (The password will be securly kept in the debconf database.) @@ -40,7 +37,7 @@ Template: littlebird-tc/db/failure Type: error _Description: Admin access to database failed. - We cannot access the database "${name}" on host "${host}". + The database "${name}" on host "${host}" cannot accessed. The excuse reads: . ${message} diff -r c44df3bd3c99 -r d699288adb5a debian/patches/db-update --- a/debian/patches/db-update Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/patches/db-update Tue Sep 20 22:55:48 2011 +0200 @@ -23,8 +23,8 @@ Reviewed-By: Last-Update: ---- a/LittleBird-Test/TrustCenter/scripts/install_update_db -+++ b/LittleBird-Test/TrustCenter/scripts/install_update_db +--- a/TrustCenter/scripts/install_update_db ++++ b/TrustCenter/scripts/install_update_db @@ -1,6 +1,5 @@ #!/bin/sh -# cron script actual statistic diff -r c44df3bd3c99 -r d699288adb5a debian/po/de.po --- a/debian/po/de.po Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/po/de.po Tue Sep 20 22:55:48 2011 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: littlebird 2011072500\n" "Report-Msgid-Bugs-To: littlebird@packages.debian.org\n" -"POT-Creation-Date: 2011-09-19 16:29+0200\n" -"PO-Revision-Date: 2011-09-19 16:30+0100\n" +"POT-Creation-Date: 2011-09-20 22:25+0200\n" +"PO-Revision-Date: 2011-09-20 22:26+0100\n" "Last-Translator: Heiko Schlittermann \n" "Language-Team: German\n" "Language: de\n" @@ -27,7 +27,7 @@ #. Description #: ../littlebird-tc-common.templates:2001 msgid "MySQL Server (name or address) to use (hostname[:port]):" -msgstr "MySQL-Server hostname[:port]):" +msgstr "MySQL-Server (hostname[:port]):" #. Type: string #. Description @@ -188,20 +188,20 @@ #. Type: boolean #. Description #: ../littlebird-tc-sql.templates:2001 -msgid "During the package configuration (postinst) the database server needs to be contacted to setup the littlebird schema, install a littlebird user etcpp. If you can provide the data to access this server, please answer \"yes\", if not, please answer \"no\" and return later and run" -msgstr "Während der Konfiguration des Trustcenters muss eine Verbindung mit Ihrem Datenbankserver hergestellt werden und dort einige Dinge als ADMIN erledigt werden (Schema-Installation, Nutzer Anlegen, …). Wenn Sie wissen, mit welchen Daten der Server erreichbar ist, antworten Sie jetzt mit \"ja\", andernfalls müssten Sie später nochmal wieder kommen und folgendes Kommando ausführen: " - -#. Type: boolean -#. Description -#: ../littlebird-tc-sql.templates:2001 -msgid " dpkg-reconfigure littlebird-tc-sql" -msgstr " dpkg-reconfigure littlebird-tc-sql" +#| msgid "" +#| "During the package configuration (postinst) the database server needs to " +#| "be contacted to setup the littlebird schema, install a littlebird user, " +#| "etc. If you can provide the data to access this server, please answer " +#| "\"yes\", if not, please answer \"no\" and return later and reconfigure " +#| "the package." +msgid "During the package configuration (postinst) the database server needs to be contacted to setup the littlebird schema, install a littlebird user, etc. Without the admin rights you have to return later and reconfigure this package." +msgstr "Während der Konfiguration des Trustcenters muss eine Verbindung mit Ihrem Datenbankserver hergestellt werden und dort einige Dinge als ADMIN erledigt werden (Schema-Installation, Nutzer Anlegen, …). Ohne die Admin-Rechte müssen Sie später wiederkommen und das Paket re-konfigurieren." #. Type: string #. Description #: ../littlebird-tc-sql.templates:3001 -msgid "The user to be used for the *administrative* database connection." -msgstr "ADMIN-User für den Datenbank-Server" +msgid "The user to be used for the *administrative* database connection:" +msgstr "ADMIN-User für den Datenbank-Server:" #. Type: string #. Description @@ -212,8 +212,8 @@ #. Type: password #. Description #: ../littlebird-tc-sql.templates:4001 -msgid "The password to be used for the *administrative* database connection." -msgstr "ADMIN-Passwort für den Datenbank-Server" +msgid "The password to be used for the *administrative* database connection:" +msgstr "ADMIN-Passwort für den Datenbank-Server:" #. Type: password #. Description @@ -251,7 +251,7 @@ #. Type: error #. Description #: ../littlebird-tc-sql.templates:6001 -msgid "We cannot access the database \"${name}\" on host \"${host}\". The excuse reads:" +msgid "The database \"${name}\" on host \"${host}\" cannot accessed. The excuse reads:" msgstr "Leider kann die Datenbank \"${name}\" auf dem Host \"${host}\" nicht erreicht werden. Die Ausrede ist: " #. Type: error @@ -260,6 +260,8 @@ msgid "${message}" msgstr "${message}" +#~ msgid " dpkg-reconfigure littlebird-tc-sql" +#~ msgstr " dpkg-reconfigure littlebird-tc-sql" #~ msgid "NOTE: currently this name is ignored!" #~ msgstr "ACHTUNG: Gegenwärtig wird der Datenbank-Name ignoriert!" #~ msgid "The SSL certificate does not seem to exist." diff -r c44df3bd3c99 -r d699288adb5a debian/po/templates.pot --- a/debian/po/templates.pot Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/po/templates.pot Tue Sep 20 22:55:48 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: littlebird@packages.debian.org\n" -"POT-Creation-Date: 2011-09-19 16:29+0200\n" +"POT-Creation-Date: 2011-09-20 22:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -215,21 +215,15 @@ #: ../littlebird-tc-sql.templates:2001 msgid "" "During the package configuration (postinst) the database server needs to be " -"contacted to setup the littlebird schema, install a littlebird user etcpp. " -"If you can provide the data to access this server, please answer \"yes\", if " -"not, please answer \"no\" and return later and run" -msgstr "" - -#. Type: boolean -#. Description -#: ../littlebird-tc-sql.templates:2001 -msgid " dpkg-reconfigure littlebird-tc-sql" +"contacted to setup the littlebird schema, install a littlebird user, etc. " +"Without the admin rights you have to return later and reconfigure this " +"package." msgstr "" #. Type: string #. Description #: ../littlebird-tc-sql.templates:3001 -msgid "The user to be used for the *administrative* database connection." +msgid "The user to be used for the *administrative* database connection:" msgstr "" #. Type: string @@ -243,7 +237,7 @@ #. Type: password #. Description #: ../littlebird-tc-sql.templates:4001 -msgid "The password to be used for the *administrative* database connection." +msgid "The password to be used for the *administrative* database connection:" msgstr "" #. Type: password @@ -286,7 +280,7 @@ #. Description #: ../littlebird-tc-sql.templates:6001 msgid "" -"We cannot access the database \"${name}\" on host \"${host}\". The excuse " +"The database \"${name}\" on host \"${host}\" cannot accessed. The excuse " "reads:" msgstr "" diff -r c44df3bd3c99 -r d699288adb5a debian/rules --- a/debian/rules Tue Sep 20 21:54:05 2011 +0200 +++ b/debian/rules Tue Sep 20 22:55:48 2011 +0200 @@ -16,25 +16,24 @@ dh $@ override_dh_install: -# @dh_install --exclude=.gitignore - dh_install +# BUG: find TrustCenter/ -not \( -regex '\.gitignore' \) \( -type d -and -empty \) + @dh_install --fail-missing @cd ${core}/usr/share/littlebird-tc/CA/certs \ && { \ test -f Trustcenter_CA_LB.pem || cp -av Test_Trustcenter_CA_LB.pem Trustcenter_CA_LB.pem; \ test -f Trustcenter_CA.pem || cp -av Test_Trustcenter_CA.pem Trustcenter_CA.pem; \ } - # moving logs and data to var/ - mv ${core}/usr/share/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc - mv ${core}/usr/share/littlebird-tc/TrustCenter/data/* ${core}/var/lib/littlebird-tc/ + + # move logs and data to var/ + @mv ${core}/usr/share/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc + @mv ${core}/usr/share/littlebird-tc/TrustCenter/data/* ${core}/var/lib/littlebird-tc/ + + # purge .gitignore + @find ${core} ${common} ${sql} -type f -name .gitignore -delete # fix permissions chmod +x ${core}/usr/share/littlebird-tc/TrustCenter/scripts/install_update_db -# find ${core} ${common} ${sql} -type f -exec chmod a-x {} + -# find ${core} ${common} ${sql} -type f \ -# \( -name '*.sh' -o -path '*/scripts/*' \) \ -# -exec ${SHELL} -c 'file {} | grep -q executable' \; -exec chmod +x {} \; - override_dh_link: @dh_link for dir in ${core}/var/lib/littlebird-tc/*; do \