[phpBB] svn: r79 - in trunk/phpbb2: . patches po

jeroen at wolffelaar.nl jeroen at wolffelaar.nl
Mon Mar 15 21:11:01 CET 2004


Author: jeroen
Date: 2004-03-15 21:10:20 +0100 (Mon, 15 Mar 2004)
New Revision: 79

Modified:
   trunk/phpbb2/control
   trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff
   trunk/phpbb2/po/templates.pot
   trunk/phpbb2/rules
Log:
- Update templates.pot in clean target
- Fix duplicate dependency by dropping ${misc:Depends}
- Update sane_defaults patch with current updated table definition (only
  version number changed)


Modified: trunk/phpbb2/control
===================================================================
--- trunk/phpbb2/control	2004-03-15 19:29:54 UTC (rev 78)
+++ trunk/phpbb2/control	2004-03-15 20:10:20 UTC (rev 79)
@@ -7,7 +7,7 @@
 
 Package: phpbb2
 Architecture: all
-Depends: ${misc:Depends}, php4 (>= 4.1.0) | php4-cgi (>= 4.0.6), php4-mysql | php4-pgsql | php4-odbc, apache | httpd, debconf (>= 1.2.0)
+Depends: php4 (>= 4.1.0) | php4-cgi (>= 4.0.6), php4-mysql | php4-pgsql | php4-odbc, apache | httpd, debconf (>= 1.2.0)
 Recommends: phpbb2-conf-mysql
 Suggests: phpbb2-languages
 Provides: phpbb
@@ -22,7 +22,7 @@
 
 Package: phpbb2-conf-mysql
 Architecture: all
-Depends: phpbb2, ${misc:Depends}, wwwconfig-common (>= 0.0.34), php4-mysql, mysql-client, makepasswd, ucf (>= 0.8), debconf (>= 1.2.0)
+Depends: phpbb2, wwwconfig-common (>= 0.0.34), php4-mysql, mysql-client, makepasswd, ucf (>= 0.8), debconf (>= 1.2.0)
 Recommends: mysql-server
 Description: Automatic configurator for phpbb2 on MySQL database
  Install this package if you don't want to configure phpBB (package: phpbb2)

Modified: trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff
===================================================================
--- trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff	2004-03-15 19:29:54 UTC (rev 78)
+++ trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff	2004-03-15 20:10:20 UTC (rev 79)
@@ -89,7 +89,7 @@
 +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', '');
 +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
 +INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '');
- INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.6');
+ INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.7');
  
  
 @@ -77,7 +79,7 @@

Modified: trunk/phpbb2/po/templates.pot
===================================================================
--- trunk/phpbb2/po/templates.pot	2004-03-15 19:29:54 UTC (rev 78)
+++ trunk/phpbb2/po/templates.pot	2004-03-15 20:10:20 UTC (rev 79)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-08 09:54-0800\n"
+"POT-Creation-Date: 2004-03-15 21:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,49 +24,43 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: select
-#. Choices
-#: ../phpbb2-conf-mysql.templates:3
-msgid "Yes, No"
-msgstr ""
-
-#. Type: select
+#. Type: boolean
 #. Description
-#: ../phpbb2-conf-mysql.templates:5
-msgid "Do you want to overwrite your current configuration?"
+#: ../phpbb2-conf-mysql.templates:4
+msgid "Overwrite your current configuration?"
 msgstr ""
 
-#. Type: select
+#. Type: boolean
 #. Description
-#: ../phpbb2-conf-mysql.templates:5
+#: ../phpbb2-conf-mysql.templates:4
 msgid ""
 "An existing configuration file for the database has been found as /etc/"
 "phpbb2/config.php"
 msgstr ""
 
-#. Type: select
+#. Type: boolean
 #. Description
-#: ../phpbb2-conf-mysql.templates:5
+#: ../phpbb2-conf-mysql.templates:4
 msgid ""
-"Select `Yes' if you want to redo this setup. No database will be destroyed, "
+"Select this if you want to redo this setup. No database will be destroyed, "
 "but any customization of /etc/phpbb2/config.php will be lost."
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../phpbb2-conf-mysql.templates:14
+#: ../phpbb2-conf-mysql.templates:13
 msgid "Create, Populate, None"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../phpbb2-conf-mysql.templates:16
+#: ../phpbb2-conf-mysql.templates:15
 msgid "Want configure to create the database?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../phpbb2-conf-mysql.templates:16
+#: ../phpbb2-conf-mysql.templates:15
 msgid ""
 "If you haven't created a database with user yet, and want configure to do "
 "so, choose `Create'."
@@ -74,7 +68,7 @@
 
 #. Type: select
 #. Description
-#: ../phpbb2-conf-mysql.templates:16
+#: ../phpbb2-conf-mysql.templates:15
 msgid ""
 "If you have a database, but it has no tables yet, and want configure to "
 "populate that database with tables, choose `Populate'."
@@ -82,25 +76,19 @@
 
 #. Type: select
 #. Description
-#: ../phpbb2-conf-mysql.templates:16
+#: ../phpbb2-conf-mysql.templates:15
 msgid "In all other cases, choose `None'."
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../phpbb2-conf-mysql.templates:27
-msgid "localhost"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../phpbb2-conf-mysql.templates:28
+#: ../phpbb2-conf-mysql.templates:27
 msgid "What is the hostname where your database is running?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../phpbb2-conf-mysql.templates:28
+#: ../phpbb2-conf-mysql.templates:27
 msgid ""
 "If your database is on another machine then you need to change this value to "
 "the fully qualified domain name for that system."
@@ -108,83 +96,57 @@
 
 #. Type: string
 #. Description
-#: ../phpbb2-conf-mysql.templates:35
+#: ../phpbb2-conf-mysql.templates:34
 msgid "What name do you want for database?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../phpbb2-conf-mysql.templates:35
+#: ../phpbb2-conf-mysql.templates:34
 msgid ""
 "All users, posts, etc. are stored in one single database. How do you want to "
 "call it?"
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../phpbb2-conf-mysql.templates:41
-msgid "phpbb2"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../phpbb2-conf-mysql.templates:42
+#: ../phpbb2-conf-mysql.templates:41
 msgid "What database username do you want to use?"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../phpbb2-conf-mysql.templates:42
+#: ../phpbb2-conf-mysql.templates:41
 msgid "For maximum security, a user dedicated for phpBB will be created."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../phpbb2-conf-mysql.templates:47
+#: ../phpbb2-conf-mysql.templates:46
 msgid "What database password do you want to use?"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../phpbb2-conf-mysql.templates:47
+#: ../phpbb2-conf-mysql.templates:46
 msgid "Choose a password for the databaseuser."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../phpbb2-conf-mysql.templates:47
+#: ../phpbb2-conf-mysql.templates:46
 msgid "Leave this empty if you want to have a random password generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../phpbb2-conf-mysql.templates:54
-msgid "[Internal] makepasswd generated password"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../phpbb2-conf-mysql.templates:54
-msgid "No need to translate this."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../phpbb2-conf-mysql.templates:54
-msgid ""
-"Here the password generated by makepasswd is stored for later reference (for "
-"example, on upgrade). Only used if dbpass is empty."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../phpbb2-conf-mysql.templates:62
+#: ../phpbb2-conf-mysql.templates:61
 msgid "What is the MySQL root password?"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../phpbb2-conf-mysql.templates:62
+#: ../phpbb2-conf-mysql.templates:61
 msgid ""
 "In order to create a user, the database and the tables, the MySQL root "
 "password is needed."
@@ -192,7 +154,7 @@
 
 #. Type: password
 #. Description
-#: ../phpbb2-conf-mysql.templates:62
+#: ../phpbb2-conf-mysql.templates:61
 msgid ""
 "This password will be temporarily stored by debconf until the configuring "
 "phase of this install.  If you do not trust debconf to securily manage this "
@@ -203,13 +165,13 @@
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:74
+#: ../phpbb2-conf-mysql.templates:73
 msgid "FAILURE: Database not created"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:74
+#: ../phpbb2-conf-mysql.templates:73
 msgid ""
 "The configuration script failed to create the phpbb database. Please run "
 "dpkg-reconfigure phpbb2, to try with different options, possibly choose "
@@ -218,13 +180,13 @@
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:83
+#: ../phpbb2-conf-mysql.templates:82
 msgid "FAILURE: Database user not created"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:83
+#: ../phpbb2-conf-mysql.templates:82
 msgid ""
 "The configuration script failed to create the phpbb database user. Please "
 "run dpkg-reconfigure phpbb2, to try with different options, possibly choose "
@@ -233,13 +195,13 @@
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:92
+#: ../phpbb2-conf-mysql.templates:91
 msgid "FAILURE: Tables not created"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:92
+#: ../phpbb2-conf-mysql.templates:91
 msgid ""
 "The configuration script failed to create the phpbb tables. Please run dpkg-"
 "reconfigure phpbb2, to try with different options, possibly choose \"Manual"
@@ -248,69 +210,29 @@
 
 #. Type: note
 #. Description
-#: ../phpbb2-conf-mysql.templates:92
+#: ../phpbb2-conf-mysql.templates:91
 msgid "Error: ${error}"
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../phpbb2-conf-mysql.templates:101
-msgid "true, false"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../phpbb2-conf-mysql.templates:103
-msgid "[internal] Whether the DB plus user is created"
+#: ../phpbb2-conf-mysql.templates:114
+msgid "Database not purged"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../phpbb2-conf-mysql.templates:103
+#: ../phpbb2-conf-mysql.templates:114
 msgid ""
-"phpbb maintainer scripts will not ask for the DB admin password once the db "
-"and an accessing user is created"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../phpbb2-conf-mysql.templates:109
-msgid "[internal] what db_version is currently setup"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../phpbb2-conf-mysql.templates:109
-msgid ""
-"phpbb scripts will set this value to the current version, so to detect "
-"whether it is needed to change database layout, and based on what."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../phpbb2-conf-mysql.templates:115
-msgid "Database not purged"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../phpbb2-conf-mysql.templates:115
-msgid ""
 "The purge script did not drop the database for phpbb, nor the user created "
 "for it. You will need to do so yourself (but only if you do not want to "
 "loose all data and board configuration)."
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#: ../phpbb2.templates:3
-msgid "apache, apache-ssl, apache-perl, apache2"
-msgstr ""
-
-#. Type: multiselect
 #. Description
 #: ../phpbb2.templates:5
-msgid "What webserver(s) do you want to be configured?"
+msgid "Webserver(s) to configure:"
 msgstr ""
 
 #. Type: multiselect
@@ -325,6 +247,6 @@
 #. Description
 #: ../phpbb2.templates:5
 msgid ""
-"Note: You will need to reload (/etc/init.d/apache-??? reload) the webserver"
-"(s) by yourself"
+"Note: You will need to reload (running /etc/init.d/apache-??? reload) the "
+"webserver(s) by yourself."
 msgstr ""

Modified: trunk/phpbb2/rules
===================================================================
--- trunk/phpbb2/rules	2004-03-15 19:29:54 UTC (rev 78)
+++ trunk/phpbb2/rules	2004-03-15 20:10:20 UTC (rev 79)
@@ -11,7 +11,7 @@
 #
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 UPSTREAM_VERSION=2.0.7
 
@@ -52,6 +52,8 @@
 	@# No need to unpatch, as patched dir is cleaned anyway
 	dh_testdir
 
+	debconf-updatepo
+
 	rm -f *-stamp *-stamp.log
 	rm -rf debian/build
 





More information about the phpBB-l mailing list