lintian suggested fixes
authorHeiko Schlittermann (JUMPER) <hs@schlittermann.de>
Fri, 16 Sep 2011 23:04:34 +0200
changeset 79 bf9f2062d8f5
parent 78 306d98640cda
child 80 94ec1603ce3c
lintian suggested fixes * updated templates according to lintian suggestions * fixed executable permissins
debian/littlebird-tc-core.postinst
debian/littlebird-tc-core.templates
debian/po/de.po
debian/po/templates.pot
debian/rules
--- a/debian/littlebird-tc-core.postinst	Fri Sep 16 22:42:25 2011 +0200
+++ b/debian/littlebird-tc-core.postinst	Fri Sep 16 23:04:34 2011 +0200
@@ -84,8 +84,9 @@
 
 	db_subst littlebird-tc/web/create-cert cn "$servername" || true
 	db_subst littlebird-tc/web/create-cert days $days || true
-	db_input medium littlebird-tc/web/create-cert || true
+	db_input high littlebird-tc/web/create-cert || true
 	db_go || true
+	#echo "# creating certificate CN=$servername" >&2
 
 	if ! wait $pid
 	then
--- a/debian/littlebird-tc-core.templates	Fri Sep 16 22:42:25 2011 +0200
+++ b/debian/littlebird-tc-core.templates	Fri Sep 16 23:04:34 2011 +0200
@@ -35,20 +35,20 @@
 Template: littlebird-tc/web/crt
 Type: string
 _Description: Pathname of the SSL certificate file:
- The HTTPS server uses an SSL certificate. Where is or where 
- will be the certificate file located?
+ The HTTPS server uses an SSL certificate. Please specify the
+ full pathname of the certificate file.
 
 Template: littlebird-tc/web/key
 Type: string
 _Description: Pathname of the SSL certificate key file:
- The HTTPS server uses an SSL certificate. Where is or where 
- will be the certificate *KEY* file located?
+ The HTTPS server uses an SSL certificate. Please specify the
+ full pathnameof the *KEY* file.
 
 Template: littlebird-tc/web/create-cert
 Type: note
-_Description: The SSL certificate does not seem to exist.
- Because I am missing the certificate I'm generating
- a DEMO certificate (CN=${cn}) for you. Please do not
+_Description: missing ssl certificate
+ The certificate file seems to be missing. A DEMO certificate (CN=${cn})
+ gets created automatically.  Please do not
  forget to replace it as soon as possible. The DEMO 
  certificate will expire in ${days} days.
 
--- a/debian/po/de.po	Fri Sep 16 22:42:25 2011 +0200
+++ b/debian/po/de.po	Fri Sep 16 23:04:34 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-16 09:59+0200\n"
-"PO-Revision-Date: 2011-09-16 10:05+0100\n"
+"POT-Creation-Date: 2011-09-16 23:01+0200\n"
+"PO-Revision-Date: 2011-09-16 23:03+0100\n"
 "Last-Translator: Heiko Schlittermann <hs@schlittermann.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -110,7 +110,6 @@
 #. Type: note
 #. Description
 #: ../littlebird-tc-core.templates:5001
-#| msgid "The database needs to be cleaned!"
 msgid "The database and /var-files need to be cleaned!"
 msgstr "Die Datenbank und einige Files unterhalb von /var müssen manuell gelöscht werden."
 
@@ -123,10 +122,6 @@
 #. Type: note
 #. Description
 #: ../littlebird-tc-core.templates:5001
-#| msgid ""
-#| "Please think about it, if you need to remove ANY traces, you should "
-#| "consider dropping the database. Contact your friendly database admin for "
-#| "doing it :-)"
 msgid "Please think about it, if you need to remove ANY traces, you should consider dropping the database and purging the above mentioned directories."
 msgstr "Bitte denken Sie daran, wenn Sie alle Spuren des Trustcenters verwischen möchten, müssten Sie auch die Datenbank und die /var/-Files enfernen. "
 
@@ -139,8 +134,11 @@
 #. Type: string
 #. Description
 #: ../littlebird-tc-core.templates:6001
-msgid "The HTTPS server uses an SSL certificate. Where is or where  will be the certificate file located?"
-msgstr "Der HTTPS-Server verwendet ein SSL-Zertifikat. Wo wird diese Datei liegen?"
+#| msgid ""
+#| "The HTTPS server uses an SSL certificate. Where is or where  will be the "
+#| "certificate file located?"
+msgid "The HTTPS server uses an SSL certificate. Please specify the full pathname of the certificate file."
+msgstr "Der HTTPS-Server verwendet ein SSL-Zertifikat. Bitte geben Sie den vollständigen Pfadnamen an."
 
 #. Type: string
 #. Description
@@ -151,20 +149,27 @@
 #. Type: string
 #. Description
 #: ../littlebird-tc-core.templates:7001
-msgid "The HTTPS server uses an SSL certificate. Where is or where  will be the certificate *KEY* file located?"
-msgstr "Wo liegt die Schlüsseldatei, die für die Nutzung des SSL-Zertifikats benötigt wird?"
+#| msgid ""
+#| "The HTTPS server uses an SSL certificate. Where is or where  will be the "
+#| "certificate *KEY* file located?"
+msgid "The HTTPS server uses an SSL certificate. Please specify the full pathnameof the *KEY* file."
+msgstr "Bitte geben Sie den vollständigen Pfadnamen für die Schlüsseldatei des SSL-Zertifikats an."
 
 #. Type: note
 #. Description
 #: ../littlebird-tc-core.templates:8001
-msgid "The SSL certificate does not seem to exist."
-msgstr "Das SSL-Zeritifkat konnte nicht gefunden werden."
+msgid "missing ssl certificate"
+msgstr "Kein SSL-Zertifikat gefunden."
 
 #. Type: note
 #. Description
 #: ../littlebird-tc-core.templates:8001
-msgid "Because I am missing the certificate I'm generating a DEMO certificate (CN=${cn}) for you. Please do not forget to replace it as soon as possible. The DEMO  certificate will expire in ${days} days."
-msgstr "Da wir kein SSL-Zertifikat finden konnten, generieren wir eins. Es wird auf CN=${cn} ausgestellt und ist für ${days} gültig. Bitte ersetzen Sie es so bald wie möglich durch ein echtes Zertifikat."
+#| msgid ""
+#| "Because I am missing the certificate I'm generating a DEMO certificate "
+#| "(CN=${cn}) for you. Please do not forget to replace it as soon as "
+#| "possible. The DEMO  certificate will expire in ${days} days."
+msgid "The certificate file seems to be missing. A DEMO certificate (CN=${cn}) gets created automatically.  Please do not forget to replace it as soon as possible. The DEMO  certificate will expire in ${days} days."
+msgstr "Da wir kein SSL-Zertifikat gefunden werden konnte, wid eins erzeugt. Es wird auf CN=${cn} ausgestellt und ist für ${days} gültig. Bitte ersetzen Sie es so bald wie möglich durch ein echtes Zertifikat."
 
 #. Type: error
 #. Description
@@ -265,6 +270,8 @@
 msgid "${message}"
 msgstr "${message}"
 
+#~ msgid "The SSL certificate does not seem to exist."
+#~ msgstr "Das SSL-Zeritifkat konnte nicht gefunden werden."
 #~ msgid ""
 #~ "You are ${action} the littlebird trustcenter, however the database does "
 #~ "not get purged or cleaned."
--- a/debian/po/templates.pot	Fri Sep 16 22:42:25 2011 +0200
+++ b/debian/po/templates.pot	Fri Sep 16 23:04:34 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-16 09:59+0200\n"
+"POT-Creation-Date: 2011-09-16 23:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,8 +152,8 @@
 #. Description
 #: ../littlebird-tc-core.templates:6001
 msgid ""
-"The HTTPS server uses an SSL certificate. Where is or where  will be the "
-"certificate file located?"
+"The HTTPS server uses an SSL certificate. Please specify the full pathname "
+"of the certificate file."
 msgstr ""
 
 #. Type: string
@@ -166,23 +166,23 @@
 #. Description
 #: ../littlebird-tc-core.templates:7001
 msgid ""
-"The HTTPS server uses an SSL certificate. Where is or where  will be the "
-"certificate *KEY* file located?"
+"The HTTPS server uses an SSL certificate. Please specify the full pathnameof "
+"the *KEY* file."
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../littlebird-tc-core.templates:8001
-msgid "The SSL certificate does not seem to exist."
+msgid "missing ssl certificate"
 msgstr ""
 
 #. Type: note
 #. Description
 #: ../littlebird-tc-core.templates:8001
 msgid ""
-"Because I am missing the certificate I'm generating a DEMO certificate (CN="
-"${cn}) for you. Please do not forget to replace it as soon as possible. The "
-"DEMO  certificate will expire in ${days} days."
+"The certificate file seems to be missing. A DEMO certificate (CN=${cn}) gets "
+"created automatically.  Please do not forget to replace it as soon as "
+"possible. The DEMO  certificate will expire in ${days} days."
 msgstr ""
 
 #. Type: error
--- a/debian/rules	Fri Sep 16 22:42:25 2011 +0200
+++ b/debian/rules	Fri Sep 16 23:04:34 2011 +0200
@@ -8,24 +8,27 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-root=debian/littlebird-tc-core
+core=debian/littlebird-tc-core
 
 %:
 	dh $@ 
 
 override_dh_install:
 	@dh_install
-	@cd ${root}/usr/lib/littlebird-tc/CA/certs \
+	@cd ${core}/usr/lib/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; \
 	   }
-	mv ${root}/usr/lib/littlebird-tc/TrustCenter/data/logs ${root}/var/log/littlebird-tc 
-	mv ${root}/usr/lib/littlebird-tc/TrustCenter/data/* ${root}/var/lib/littlebird-tc/
+	mv ${core}/usr/lib/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc 
+	mv ${core}/usr/lib/littlebird-tc/TrustCenter/data/* ${core}/var/lib/littlebird-tc/
+	find ${core} -type f -name \*.sh | while read p; do \
+		file "$$p" | grep -q executable && chmod +x "$$p" ;\
+	done
 
 override_dh_link:
 	@dh_link
-	for dir in ${root}/var/lib/littlebird-tc/*; do \
+	for dir in ${core}/var/lib/littlebird-tc/*; do \
 	    dir=`basename $$dir`; \
 	    dh_link --package littlebird-tc-core /var/lib/littlebird-tc/$$dir /usr/lib/littlebird-tc/TrustCenter/data/$$dir ;\
 	done