[phpBB] svn: r297 - in trunk/phpbb3: . examples

kink at wolffelaar.nl kink at wolffelaar.nl
Mon Jul 3 15:42:27 CEST 2006


Author: kink
Date: 2006-07-03 15:42:24 +0200 (Mon, 03 Jul 2006)
New Revision: 297

Added:
   trunk/phpbb3/phpbb3-languages.install
   trunk/phpbb3/phpbb3.config
   trunk/phpbb3/phpbb3.lintian
   trunk/phpbb3/phpbb3.postinst
   trunk/phpbb3/phpbb3.postrm
   trunk/phpbb3/phpbb3.preinst
   trunk/phpbb3/phpbb3.prerm
   trunk/phpbb3/phpbb3.templates
Removed:
   trunk/phpbb3/NEWS
   trunk/phpbb3/phpbb2-conf-mysql.config
   trunk/phpbb3/phpbb2-conf-mysql.lintian
   trunk/phpbb3/phpbb2-conf-mysql.postinst
   trunk/phpbb3/phpbb2-conf-mysql.postrm
   trunk/phpbb3/phpbb2-conf-mysql.templates
   trunk/phpbb3/phpbb2-languages.install
   trunk/phpbb3/phpbb2.config
   trunk/phpbb3/phpbb2.lintian
   trunk/phpbb3/phpbb2.postinst
   trunk/phpbb3/phpbb2.postrm
   trunk/phpbb3/phpbb2.preinst
   trunk/phpbb3/phpbb2.prerm
   trunk/phpbb3/phpbb2.templates
Modified:
   trunk/phpbb3/README.Debian
   trunk/phpbb3/UPGRADING.Debian
   trunk/phpbb3/apache.conf
   trunk/phpbb3/changelog
   trunk/phpbb3/config.php
   trunk/phpbb3/control
   trunk/phpbb3/docs
   trunk/phpbb3/examples/config.php
   trunk/phpbb3/export-sources
   trunk/phpbb3/get-orig-source
   trunk/phpbb3/install
   trunk/phpbb3/rules
   trunk/phpbb3/watch
Log:
een rudimentaire start voor phpbb3


Deleted: trunk/phpbb3/NEWS
===================================================================
--- trunk/phpbb3/NEWS	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/NEWS	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,41 +0,0 @@
-phpbb2 (2.0.18-1) unstable; urgency=high
-
-  * A table needs to be added to the phpBB database(s) for this version to
-    work. The name is <something>_sessions_keys, and can initially be
-    empty. See /usr/share/doc/phpbb2/schemas/<your dbms>_schema.sql for the
-    definition.
-
-    If you're using phpbb2-conf-mysql, this should be done automatically.
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Wed, 30 Nov 2005 03:07:21 +0100
-
-phpbb2 (2.0.8a-3) unstable; urgency=low
-
-  * Custom templates should now be in /etc/phpbb2/templates
-
-    As of now, you can install any custom templates into
-    /etc/phpbb2/templates. If you previously have installed custom templates
-    to /usr/share/phpbb2, you need to move them manually (upgrade will fail
-    until you do so).
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Sun, 25 Apr 2004 00:41:07 +0200
-
-phpbb2 (2.0.8a-1) unstable; urgency=low
-
-  * phpbb DocumentRoot location changed:
-
-       /usr/share/phpbb2 -> /usr/share/phpbb2/site
-
-    Initially, I put the PHP files staight in /usr/share/phpbb2. This is
-    unfortunately not such a good idea, as this way, I don't have any space
-    left for putting other /usr/share files for phpbb2 there.
-
-    I prefer to correct this oversight now, while phpbb2 isn't yet in stable.
-    Please change your Documentroot setting in /etc/phpbb2/apache.conf
-
-    Sorry for the inconvenience.
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon,  5 Apr 2004 01:43:13 +0200
-
-
-vim: et

Modified: trunk/phpbb3/README.Debian
===================================================================
--- trunk/phpbb3/README.Debian	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/README.Debian	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,13 +1,11 @@
-phpbb2 for Debian
+phpbb3 for Debian
 -----------------
 
 ****** First use
 
-1) If you have not installed phpbb2-conf-mysql, please see the 'setup
-   database' section first.
-2) Make sure you include /etc/phpbb2/apache.conf in the apache config of your
+2) Make sure you include /etc/phpbb3/apache.conf in the apache config of your
    choice, for example by creating a symlink from /etc/apache(2)/conf.d to it.
-   Usually, phpbb2 should have asked you to do this for you during
+   Usually, phpbb3 should have asked you to do this for you during
    configuring.
 3) Reload apache to have the changes in (2) take effect
 4) Go to the URL of your board, usually http://yourserver.example.com/phpbb.
@@ -25,7 +23,7 @@
 
 ****** Custom templates
 
-Please install your custom templates in /etc/phpbb2/templates, on the
+Please install your custom templates in /etc/phpbb3/templates, on the
 administration panel you can then add those to your installation.
 
 ****** Upgrading, converting old posts
@@ -37,27 +35,27 @@
 
 ****** Setup database
 
-If you don't want to use phpbb2-conf-mysql, for example if you want to have
+If you don't want to use phpbb3-conf-mysql, for example if you want to have
 full control yourself or want to use a different database system, you need to
 setup the database yourself.
 
 - login to your database server (running MySQL or PostgreSQL) as the database
   administrator (normally root)
-- create a database 'phpbb2'
-- create a user 'phpbb2' with random password, and give it
+- create a database 'phpbb3'
+- create a user 'phpbb3' with random password, and give it
   SELECT/INSERT/UPDATE/DELETE rights for the phpbb database (rights to
   alter the tables is not needed)
 - execute the create table commands and the starting table content from
-  /usr/share/doc/phpbb2/schemas/$dbms_{schema,basic}.sql
+  /usr/share/doc/phpbb3/schemas/$dbms_{schema,basic}.sql
 - Add the correct server-details and user-credentials in
-  /etc/phpbb2/config.php (see /usr/share/doc/phpbb2/examples/config.php for an
+  /etc/phpbb3/config.php (see /usr/share/doc/phpbb3/examples/config.php for an
   example)
 
-For the web server, the php files are in /usr/share/phpbb2/site, use the apache
-config snippet in /etc/phpbb2/apache.conf if you have an apache flavour
-web server. Upon installation of phpbb2, it is offered to add a symlink in
-/etc/apache*/conf.d to /etc/phpbb2/apache.conf
+For the web server, the php files are in /usr/share/phpbb3/www, use the apache
+config snippet in /etc/phpbb3/apache.conf if you have an apache flavour
+web server. Upon installation of phpbb3, it is offered to add a symlink in
+/etc/apache*/conf.d to /etc/phpbb3/apache.conf
 
-Don't forget to reload the web server config after installation of phpbb2!
+Don't forget to reload the web server config after installation of phpbb3!
 
  -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Thu,  8 Jan 2004 00:02:43 +0100

Modified: trunk/phpbb3/UPGRADING.Debian
===================================================================
--- trunk/phpbb3/UPGRADING.Debian	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/UPGRADING.Debian	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,5 +1,5 @@
 Upgrading from non-Debian installed versions of phpbb is currently not
-supported.
+supported. Also, upgrades from phpbb2 are not supported yet.
 
-If you have experience with this, please report to the phpbb2 maintainer, so
+If you have experience with this, please report to the phpbb maintainer, so
 he can add useful tips to this file.

Modified: trunk/phpbb3/apache.conf
===================================================================
--- trunk/phpbb3/apache.conf	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/apache.conf	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,8 +1,8 @@
 # Note: order matters
-Alias /phpbb/images/avatars /var/lib/phpbb2/avatars
-Alias /phpbb /usr/share/phpbb2/site
+Alias /phpbb/images/avatars /var/lib/phpbb3/avatars
+Alias /phpbb /usr/share/phpbb3/www
 
-<DirectoryMatch /usr/share/phpbb2/site/>
+<DirectoryMatch /usr/share/phpbb3/www/>
 	<IfModule mod_php4.c>
 		php_flag register_globals off
 	</IfModule>
@@ -17,21 +17,21 @@
 </DirectoryMatch>
 
 # For a second board on the same server:
-#Alias /second_board /usr/share/phpbb2/site
-#Alias /second_board/images/avatars /var/lib/phpbb2/board2_avatars <<< create!
+#Alias /second_board /usr/share/phpbb3/www
+#Alias /second_board/images/avatars /var/lib/phpbb3/board2_avatars <<< create!
 #<Location /second_board>
-#	php_value auto_prepend_file /etc/phpbb2/alternative_config.php
+#	php_value auto_prepend_file /etc/phpbb3/alternative_config.php
 #</Location>
 
 # For virtual host:
 #<VirtualHost *>
 #	# For using an alternative database (for multiple boards for example)
-#	php_value auto_prepend_file /etc/phpbb2/virtualhost_config.php
+#	php_value auto_prepend_file /etc/phpbb3/virtualhost_config.php
 #
 #	ServerName forum.example.com
-#	DocumentRoot /usr/share/phpbb2/site
+#	DocumentRoot /usr/share/phpbb3/www
 #  	# You may need to workaround the global /images/ alias in your apache
 #  	# configuration, your mileage may vary
-#  	Alias /images/avatars /var/lib/phpbb2/avatars
-#  	Alias /images /usr/share/phpbb2/site/images
+#  	Alias /images/avatars /var/lib/phpbb3/avatars
+#  	Alias /images /usr/share/phpbb3/www/images
 #</VirtualHost>

Modified: trunk/phpbb3/changelog
===================================================================
--- trunk/phpbb3/changelog	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/changelog	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,341 +1,7 @@
-phpbb2 (2.0.21-1) unstable; urgency=low
+phpbb3 (2.99+3.0.B1) experimental; urgency=low
 
-  * New upstream release (Closes: #345359, #375865).
-    + Addresses obscure security bug: XSS with onmouseover, only exploitable
-      with Internet Explorer and Allow HTML on which is highly unrecommended
-      by this package. (CVE-2005-4357, Closes: #344674, #345359)
-    + Obsoletes 027_CVE-2006-1896_admin_cmd_exec.diff.
+  * New upstream Beta 1 release.
 
-  * Add 019_disable_logintries.diff: skip this new feature since it's
-    incompatible with the database-layout.
 
-  * [JvW] Add to source package disabled patch to enable visual
-    confirmation for guest posts if visual confirmation is enabled for
-    registration
-    http://www.phpbb.com/files/mods/guest_confirmation_1_0_1a.mod
+ -- Thijs Kinkhorst <kink at squirrelmail.org>  Mon,  3 Jul 2006 15:23:13 +0200
 
-  * Add 101_fix_german.diff: fixes for German translation, thanks
-    Mathias Hasselmann (Closes: #363676).
-
-  * Add Dutch translation by myself.
-
-  * Checked for standards version 3.7.2, no changes necessary.
-
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Mon,  3 Jul 2006 15:06:22 +0200
-
-phpbb2 (2.0.18-3) unstable; urgency=high
-
-  * High urgency because of a release critical security bug.
-
-  * Fix missing sanitizing of the Font Colour 3 variable in viewtopic.php,
-    which allowed for PHP code execution by board admins. Found by "noch22".
-    (Closes: #365533, CVE-2006-1896)
-
-  * Add Russian debconf translation, thanks Yuriy Talakan' (Closes: #367155).
-
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Tue, 23 May 2006 12:23:54 +0200
-
-phpbb2 (2.0.18-2) unstable; urgency=medium
-
-  * Fix compression of SQL schema's, which broke phpbb2-conf-mysql too
-    (Closes: #341991)
-  * Fix upgrade of /usr/share/doc/phpbb2/schemas from dir to symlink by removing
-    the dir in preinst (Closes: #342081)
-  * [TK] Russian translation fixes by Alexander Gerasiov (Closes: #336623).
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon,  5 Dec 2005 19:40:11 +0100
-
-phpbb2 (2.0.18-1) unstable; urgency=high
-
-  * New upstream release (Closes: #336587), fixing several security issues
-    (Closes: #336582):
-    - IE-specific cookie disclosure [CVE-2005-3310] (Closes: #335662)
-    - Inadequate preventive register_globals=true cleaning code
-      [CVE-2005-3415, CVE-2005-3416, CVE-2005-3417], because of this, the
-      following three items were actually exploiteable:
-      + Various cross-site scripting issues [CVE-2005-3418]
-      + SQL injection [CVE-2005-3419]
-      + Remote code execution via regular expressions [CVE-2005-3420]
-      (these three issues are also fixed themselves)
-  * Swedish debconf translations by Daniel Nylander (Closes: #334195).
-  * Upgrade debhelper compatibility to the recommended level 5.
-
-  [phpbb2-conf-mysql]
-  * Move database schemas to /usr/share/phpbb2/schemas, because
-    phpbb2-conf-mysql depends on them being present (Closes: #339700).
-  * [JvW] Updated to add new table that was added in 2.0.18, hopefully it
-    works, but no longer going to delay this upload for testing this change
-
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Tue, 29 Nov 2005 22:06:33 +0100
-
-phpbb2 (2.0.17-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-    - But disable admin-reauthentication feature, while we don't use db-config
-      yet
-  * Update standards-version to 3.6.2, no changes.
-  * Add correct debconf dependency (Closes: #332064)
-  * Drop security patches backported from upstream.
-  * Make source and binary package version numbers the same (Closes: #312113).
-  * Fix spelling of Sí in Spanish translation (Closes: #314773).
-  * Swap Alias line in README.multiboard so avatars will work.
-  * Add dependency alternative for php4-sybase (MS SQL, Closes: #324923).
-  * Fix typo in short description.
-  * Add dependencies for php5 (Closes: #320843).
-  * Vietnamese debconf translations by Clytie Siddall (Closes: #316832).
-  * Italian debconf translations by Luca Monducci (Closes: #325781).
-  * Update languages: Korean; dropped Danish, Swedish and Finnish as
-    upstream broke it
-
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Sun, 28 Aug 2005 17:50:43 +0200
-
-phpbb2 (2.0.13+1-7) unstable; urgency=high
-
-  * Security: Update existing bbcode xss patch to incorporate latest
-    XSS vulnerability [CAN-2005-2161]. (Closes: #317739)
-  * Add missing CVE-id to -6 changelog. (Closes: #310827)
-
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Thu, 12 May 2005 21:46:15 +0200
-
-phpbb2 (2.0.13+1-6) unstable; urgency=high
-
-  * Security: Fix cross site scripting in [url] and [img] bbcode
-    [CAN-2005-1193, CAN-2005-1290]. (Closes: #308282)
-  * Jeroen: Change dependencies to work correctly when only having
-    libapache-mod-php installed, while remaining to work correctly when only
-    having 'php4' installed (from woody, then)
-
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Thu, 12 May 2005 21:46:15 +0200
-
-phpbb2 (2.0.13+1-5) unstable; urgency=high
-
-  * Security: Fix arbitrary execution of code in local files by any
-    administrator in template handling
-  * Security: warn about allow_html being a very dangerous setting
-  * Fix misnamed patch for Finnish language pack, now really including it at
-    build time (now really fixing #296756)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Sat, 30 Apr 2005 19:10:36 +0200
-
-phpbb2 (2.0.13+1-4) unstable; urgency=medium
-
-  * Fix wrongly applied postgres character set patch (Closes: #298580)
-  * Urgence medium because of the above, postgres users will get annoying
-    warnings every time with -3
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Fri, 15 Apr 2005 21:34:51 +0200
-
-phpbb2 (2.0.13+1-3) unstable; urgency=low
-
-  * Welcome Thijs Kinkhorst as co-maintainer, who did most of the work for
-    this upload
-  * Add README.multiboard: documentation for setting up multible boards on
-    the same host (Closes: #298918)
-  * Set the correct client encoding for PostgreSQL servers, so it uses the
-    same charset as the webserver does. Patch from Peter Palfrader.
-    (Closes: #298580)
-  * Remove empty index.htm from the schemas directory (Closes: #298768)
-  * Remove unneccessary index.htm from site root (Closes: #298775)
-  * Fix test for local MySQL server in phpbb-conf-mysql so it won't fail
-    with MySQL 4.1 (Closes: #301218)
-  * Change priority of phpbb-conf-mysql to extra
-  * Some small documentation fixes
-  * Languages update: Updated Dutch (partially obsoleting the Debian patch),
-    introduced Sakha
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Wed, 30 Mar 2005 02:28:29 +0200
-
-phpbb2 (2.0.13-2) unstable; urgency=high
-
-  * [CAN-2005-0673] Fix cross-site-scripting in private message signatures
-    and in normal posts when users have enabled HTML despite board prohibition,
-    based on anonymous patch on BugTraq:
-    http://lists.virus.org/bugtraq-0503/msg00087.html (Closes: #298690)
-  * In documentation tell that the initial admin user is 'Admin', not 'admin',
-    as in PostgreSQL this is significant (Closes: #298512)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Sun, 13 Mar 2005 18:57:14 +0100
-
-phpbb2 (2.0.13-1) unstable; urgency=high
-
-  * New upstream release, closing critical security hole allowing anyone to
-    become board admin
-  * Fix a bug in the default apache config listing the Alias directives in the
-    wrong order. Due to the symlink, on default install this was no problem.
-    Thanks Jari Aalto (Closes: #296465)
-  * Add a symlink to a new README about templates in
-    /usr/share/share/phpbb2/templates, to give a hint to people not otherwise
-    reading the documentation like they should
-  * Fix quoting mistake in finnish language pack, thanks Ari Hutka
-    (Closes: #296756)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Wed, 02 Mar 2005 02:05:17 +0100
-
-phpbb2 (2.0.12-1) unstable; urgency=high
-
-  * New upstream release, closing several potential security bugs
-    + Disabled version checking mechanism, because it piggybacks to phpbb.com,
-      and makes no sense in Debian either
-    + Retained display of version number
-  * Languages: Added Vietnamese, dropped Romanian without Diacretics
-  * Added suggests to a DBMS (Closes: #292496)
-  * Override lintian warnings that are not appliceable here (Closes: #294932)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Tue, 22 Feb 2005 01:21:49 +0100
-
-phpbb2 (2.0.11-1) unstable; urgency=low
-
-  * New upstream release (Closes: #282840)
-    + Drop security fix from 2.0.10-3, is now in upstream
-  * Updated a number of languages from upstream
-  * Added Czech debconf translation, thanks Miroslav Kure! (Closes: #282994)
-  * Include Debian-branded logo's, kindly provided by 'Wolven'
-  * Fix location of Esperanto images, that language pack has broken
-    directories upstream
-  * Added patch to error out descriptively if the database module to connect
-    is not available. Previous behaviour was to silently die and give a blank
-    page, confusing quite a number of users
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Wed, 09 Feb 2005 13:57:26 +0100
-
-phpbb2 (2.0.10-3) unstable; urgency=high
-
-  * Fix exploit (in the wild) with highlighting feature in viewtopic.php
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Thu, 18 Nov 2004 20:31:25 +0100
-
-phpbb2 (2.0.10-2) unstable; urgency=high
-
-  * Fix my autodetection patch to not try to overwrite global board config
-    with personal config of the admin changing the global config, also fix
-    detection of hostname when it is run on a non-default port
-  * Make the postgres_basic.sql also have sane defaults just like the mysql
-    one
-  * Patch a shameful amount of spelling errors in the Dutch language pack,
-    thanks Paul Slootman for noticing most of them (Closes: #253900)
-  * Improve the README.Debian to also tell about configuring apache
-  * Drop the <IfModule ...> </IfModule> conditional around the default
-    Aliasses, as it makes not much sense
-  * Change "it's" to "its" in phpbb2-conf-mysql package description (oops...)
-    (Closes: #268537)
-  * Package uploaded by Norbert Tretkowski <nobse at debian.org>.
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Sun, 12 Sep 2004 23:01:22 +0200
-
-phpbb2 (2.0.10-1) unstable; urgency=high
-
-  * New upstream security release (Closes: #259298, #260015)
-  * Fixed debconf typo, and added Japanese debconf translation, thanks to
-    Hideki Yamane (Closes: #258705)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Wed, 28 Jul 2004 23:30:39 +0200
-
-phpbb2 (2.0.8a+1-4) unstable; urgency=low
-
-  * Add the Esperanto language to phpbb2-languages (required .orig.tar.gz
-    rebuild)
-  * Copyright statement updated with the literal general copyright statement
-    found in the docs dir, rather than one of the statements copied from the
-    .php source files.
-  * Allow the php module for apache2 too, and have apache2 as first webserver.
-  * Fix typo in postinst to work for apache-* and apache2 too, and make the
-    symlink end on '.conf' for wildcard includes (Closes: #246229)
-  * Do show full Debian version, it's useful, and hiding it doesn't help you
-    security-wise anyway.
-  * Postprocess all templates and php files to remove windows newlines. Thanks
-    Paul Slootman for noticing (Closes: #247145)
-  * Added French debconf translation, thanks to Eric Madesclair
-    (Closes: #246809)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon, 14 Jun 2004 22:50:00 +0200
-
-phpbb2 (2.0.8a-3) unstable; urgency=low
-
-  * Added /etc/phpbb2/templates, where you can put your own templates. Debian
-    supplied templates are linked from there. Special request from Paul
-    Slootman (yeah, I'm doing favours for those who sponsor me :) ).
-  * Move the ucf --purge of config.php to package phpbb2-conf-mysql, but the
-    actual removal remains in phpbb2, which is the sane behaviour
-    (Closes: #243170)
-  * It is actually mail-transport-agent, not mail-transfer-agent: Oops, fixed
-  * On the forum, show only the upstream version, not the full debian version,
-    as that might give an indication about which security fixes were applied
-    in the even that phpbb gets security fixes backported
-  * phpbb2-conf-mysql: Don't put a timestamp in the generated config.php, so
-    prompting on changes is only performed when there are real changes
-  * phpbb2-conf-mysql: makepasswd code now fully moved to postinst, one
-    invokation was accidentally left over to config, where it could be not
-    working (Closes: #244876)
-  * Minor README.Debian textual fixes, install UPGRADING.Debian now too
-    (failed previously)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Fri, 23 Apr 2004 00:07:25 +0200
-
-phpbb2 (2.0.8a-2) unstable; urgency=low
-
-  * Fix typo in phpbb2-conf-mysql postinst, causing initial testpost to
-    reappear on upgrade
-  * Added Conflicts and Depends so to prevent having phpbb2 and
-    phpbb2-languages concurrently installed with different notion of the
-    Documentroot (Closes: #242862)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Fri,  9 Apr 2004 18:03:22 +0200
-
-phpbb2 (2.0.8a-1) unstable; urgency=low
-
-  * New upstream (Closes: #241818)
-  * Changed phpbb2 DocumentRoot from /usr/share/phpbb2 to
-    /usr/share/phpbb2/site and updated all references. See NEWS.
-  * Now use po-debconf for debconf templates, patch generously provided by
-    Martin Quinson (thanks!), who in progress also fixed my language a bit.
-    In addition, both Era Eriksson and Alexander Winston provided valuable
-    feedback on my language in the templates, of which large parts are
-    implemented (Closes: #236863)
-  * Recommend a mail-transfer-agent now, thanks Gürkan Sengün for the catch
-  * Show the Debian version number, don't get version number from database
-  * Fix stupid xargs invocation to prevent error when not building directly
-    from subversion, i.e. building from Debian-source (Closes: #242139)
-  * Document in the example config.php the $dbhost behaviour of phpBB w.r.t.
-    PostgreSQL, which is a bit non-standard (Closes: #239512)
-  * Bumped standards-version to 3.6.1 (no changes)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon,  5 Apr 2004 01:43:13 +0200
-
-phpbb2 (2.0.6d-3) unstable; urgency=high
-
-  * The ``wow, _what_ happened during my vacation?!'' release
-  * Fix various security issues, all backported for now:
-    - Fixed redirect problems (2.0.7a)
-    - Fixed sql injection vulnerability in search (2.0.7a)
-    - Fixed several vulnerabilities in admin pages (2.0.8)
-    - Fixed sid checking code in admin/pagestart.php (2.0.8)
-    - Fixed injection vulnerabilities possible with the img bbcode tag (2.0.8)
-    - Limited allowed images in img bbcode tag to jpg, jpeg, gif and png (2.0.8)
-    - Fixed sql injection vulnerability in privmsg (2.0.8a)
-  * Made a silly error in debian/rules causing this version to fail to build
-    from source (see Bug#242139)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Sun, 28 Mar 2004 21:51:11 +0200
-
-phpbb2 (2.0.6d-2) unstable; urgency=medium
-
-  * Security ``just before leaving for a week'' release, featuring an
-    cross-site scripting fix from 2.0.7, plus a minor bugfix, but nothing
-    else (Closes: #237869)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Wed, 17 Mar 2004 22:45:10 +0100
-
-phpbb2 (2.0.6d-1) unstable; urgency=low
-
-  * New upstream release to fix cross-site scripting issue, and a few minor
-    one-line other fixes
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon,  1 Mar 2004 22:24:24 +0100
-
-phpbb2 (2.0.6c-1) unstable; urgency=low
-
-  * Initial Release (Closes: #168166)
-
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Tue, 10 Feb 2004 12:00:14 +0100
-
-vim: et

Modified: trunk/phpbb3/config.php
===================================================================
--- trunk/phpbb3/config.php	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/config.php	2006-07-03 13:42:24 UTC (rev 297)
@@ -2,29 +2,29 @@
 
 /* DO NOT CHANGE THIS FILE
 
-This file is part of the Debian package for phpbb. To configure phpbb2,
-edit /etc/phpbb2/config.php.
+This file is part of the Debian package for phpbb. To configure phpbb3,
+edit /etc/phpbb3/config.php.
 
 For using multiple phpbb boards on this computer with different databases,
-include 'php_value auto_prepend_file /etc/phpbb2/alternative_config.php'
+include 'php_value auto_prepend_file /etc/phpbb3/alternative_config.php'
 in the corresponding <Location> or <VirtualHost> section of your apache's config.
 
-That file will then override the /etc/phpbb2/config.php file
+That file will then override the /etc/phpbb3/config.php file
 
 */
 
 if (!defined('PHPBB_INSTALLED')) {
-	if (!file_exists('/etc/phpbb2/config.php')) {
+	if (!file_exists('/etc/phpbb3/config.php')) {
 		die("You need to install a configuration file in
-		<tt>/etc/phpbb2/config.php</tt> to tell phpbb where its database can
-		be found. Install phpbb2-conf-mysql to have a database setup
-		automatically, or see <tt>/usr/share/doc/phpbb2/README.Debian</tt> for
+		<tt>/etc/phpbb3/config.php</tt> to tell phpbb where its database can
+		be found. Install phpbb3-conf-mysql to have a database setup
+		automatically, or see <tt>/usr/share/doc/phpbb3/README.Debian</tt> for
 		information on how to make one yourself.");
 	}
-	require '/etc/phpbb2/config.php';
+	require '/etc/phpbb3/config.php';
 	if (!defined('PHPBB_INSTALLED')) {
 		die("Config file incorrect - see 
-			<tt>/usr/share/doc/phpbb2/README.Debian.gz</tt>");
+			<tt>/usr/share/doc/phpbb3/README.Debian.gz</tt>");
 	}
 }
 

Modified: trunk/phpbb3/control
===================================================================
--- trunk/phpbb3/control	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/control	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,4 +1,4 @@
-Source: phpbb2
+Source: phpbb3
 Section: web
 Priority: optional
 Maintainer: Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
@@ -7,12 +7,11 @@
 Build-Depends-Indep: bzip2, sed (>= 3.95), sharutils
 Standards-Version: 3.7.2
 
-Package: phpbb2
+Package: phpbb3
 Architecture: all
 Depends: libapache2-mod-php4 | libapache-mod-php4 | php4-cgi | php4 | libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5, php4-mysql | php4-pgsql | php4-odbc | php4-sybase | php5-mysql | php5-pgsql | php5-odbc | php5-sybase, apache2 | httpd, debconf (>= 1.2.0) | debconf-2.0
-Conflicts: phpbb2-languages (<< 2.0.8a-3)
-Recommends: exim4 | mail-transport-agent, phpbb2-conf-mysql
-Suggests: phpbb2-languages, mysql-server | postgresql
+Recommends: exim4 | mail-transport-agent
+Suggests: phpbb3-languages, mysql-server | postgresql
 Provides: phpbb
 Description: A fully featured and skinnable flat (non-threaded) webforum
  phpBB is a high powered, fully scalable, and highly customisable open-source
@@ -21,24 +20,12 @@
  PHP server language and your choice of MySQL or PostgreSQL database servers,
  phpBB is the ideal free community solution for all web sites.
  .
- More info: http://www.phpbb.com
+ Homepage: http://www.phpbb.com
 
-Package: phpbb2-conf-mysql
-Priority: extra
+Package: phpbb3-languages
 Architecture: all
-Depends: phpbb2 (>= 2.0.18-1), php4-mysql | php5-mysql, wwwconfig-common (>= 0.0.34), mysql-client, makepasswd, ucf (>= 0.8), debconf (>= 1.2.0) | debconf-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)
- by hand, but rather want it all to `just work'.
- .
- Make sure you have already a MySQL server (either locally or on another
- server) ready. Its packagename is mysql-server.
-
-Package: phpbb2-languages
-Architecture: all
-Depends: phpbb2 (>= 2.0.8a-3)
-Description: phpBB2 additional languages
- This package will install 53 additional languages for your phpBB2 forum.  The
- English language pack is already included in the phpbb2 package itself.
+Depends: phpbb3
+Description: phpBB3 additional languages
+ This package will install 53 additional languages for your phpBB3 forum.  The
+ English language pack is already included in the phpbb3 package itself.
  

Modified: trunk/phpbb3/docs
===================================================================
--- trunk/phpbb3/docs	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/docs	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,5 +1,5 @@
-debian/build/phpBB2/docs/FAQ.html
-debian/build/phpBB2/docs/README.html
+debian/build/phpBB3/docs/FAQ.html
+debian/build/phpBB3/docs/README.html
 debian/UPGRADING.Debian
 debian/README.templates
 debian/README.multiboard

Modified: trunk/phpbb3/examples/config.php
===================================================================
--- trunk/phpbb3/examples/config.php	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/examples/config.php	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,7 +1,7 @@
 <?php
  
 //
-// phpBB 2.x configuration file
+// phpBB 3.x configuration file
 //
   
 /*

Modified: trunk/phpbb3/export-sources
===================================================================
--- trunk/phpbb3/export-sources	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/export-sources	2006-07-03 13:42:24 UTC (rev 297)
@@ -8,8 +8,8 @@
 
 if [ -z "$1" ]; then
 	echo -n "Need to specify path to right version, like "
-	echo    "tags/releases/phpbb2/2.0.6-1" >&2
-	echo    "or trunk/phpbb2" >&2
+	echo    "tags/releases/phpbb3/3.0.6-1" >&2
+	echo    "or trunk/phpbb3" >&2
 	exit 1
 fi
 
@@ -22,8 +22,8 @@
 svn export http://svn.wolffelaar.nl/phpbb/$1 debian
 debian/rules get-orig-source
 cd ..
-tar xzvf phpbb2_*.orig.tar.gz
-mv tmp/debian phpbb2-*
+tar xzvf phpbb3_*.orig.tar.gz
+mv tmp/debian phpbb3-*
 rmdir tmp
-dpkg-source -b phpbb2-*
+dpkg-source -b phpbb3-*
 

Modified: trunk/phpbb3/get-orig-source
===================================================================
--- trunk/phpbb3/get-orig-source	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/get-orig-source	2006-07-03 13:42:24 UTC (rev 297)
@@ -11,10 +11,10 @@
 	exit 1
 fi
 
-echo "***>" Going to make a source tarball for phpBB2
+echo "***>" Going to make a source tarball for phpBB3
 
-TMPDIR=`mktemp -d -t phpbb2.debian.XXXXXX`
-SOURCEDIR=$TMPDIR/phpbb2-$1
+TMPDIR=`mktemp -d -t phpbb3.debian.XXXXXX`
+SOURCEDIR=$TMPDIR/phpbb3-$1
 mkdir $SOURCEDIR $SOURCEDIR/lang $SOURCEDIR/subSilver
 
 echo "***>" Using $TMPDIR 
@@ -40,9 +40,9 @@
 cd "$OLDWD"
 
 echo "***>" Creating tarball...
-NEW=`mktemp phpbb2_$1.orig.tar.gz.XXXXXX` 
-tar czvCf $TMPDIR $NEW phpbb2-$1
-mv $NEW phpbb2_$1.orig.tar.gz
+NEW=`mktemp phpbb3_$1.orig.tar.gz.XXXXXX` 
+tar czvCf $TMPDIR $NEW phpbb3-$1
+mv $NEW phpbb3_$1.orig.tar.gz
 
 echo "***>" Cleaning up...
 rm -r $TMPFILE $TMPDIR

Modified: trunk/phpbb3/install
===================================================================
--- trunk/phpbb3/install	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/install	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,6 +1,6 @@
-debian/build/phpBB2/{admin,db,images,includes,language,*.{php,inc}} /usr/share/phpbb2/site
-debian/build/phpBB2/templates /usr/share/phpbb2
-debian/config.php /usr/share/phpbb2/site
-debian/build/phpBB2/install/schemas /usr/share/phpbb2
-debian/examples /usr/share/doc/phpbb2
-debian/apache.conf /etc/phpbb2
+debian/build/phpBB3/{admin,db,images,includes,language,*.{php,inc}} /usr/share/phpbb3/www
+debian/build/phpBB3/templates /usr/share/phpbb3
+debian/config.php /usr/share/phpbb3/www
+debian/build/phpBB3/install/schemas /usr/share/phpbb3
+debian/examples /usr/share/doc/phpbb3
+debian/apache.conf /etc/phpbb3

Deleted: trunk/phpbb3/phpbb2-conf-mysql.config
===================================================================
--- trunk/phpbb3/phpbb2-conf-mysql.config	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2-conf-mysql.config	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,77 +0,0 @@
-#!/bin/sh
-# config script for phpbb2
-# Copyright 2004 Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-db_capb backup
-
-# Flow of questions:
-#
-# prio | detail |  dbms  | dbsetup | Question(s)
-# prio | T C M  | M P O  | C P N   |
-# -----+--------+--------+-------- +-----
-# High |  ASK   |        |         | detail
-# Low  | - - x  |        |         | manual_warning
-# High | - x -  |  ASK   |         | dbms
-# High | - x -  | x x -  |   ASK   | dbsetup
-###### | - x -  | - - x  |         | dbnosetup_warning
-# Mix  | - x -  | x x x  | x x x   | dbinfo
-# High | x x -  | x x -  | x - -   | dbrootpasswd
-
-# Debconf's backup behaviour and seen behaviour makes a state machine almost
-# impossible: seen flags are not update until after this script is finished,
-# so reinjecting and trusting debconf to have unseen the previous question
-# not gonna work -- too bad.
-
-STATE=init
-while [ "$STATE" != "finish" ]; do 
-	case "$STATE" in
-	init|dbsetup)
-		db_input high phpbb2-conf-mysql/dbsetup || true
-		db_go
-
-		db_get phpbb2-conf-mysql/dbsetup || true
-		if [ "$RET" = Populate ] || [ "$RET" = None ]; then
-			DBSETUP=PN
-		else
-			DBSETUP=C
-		fi
-		STATE=dbinfo
-		;;
-	dbinfo)
-		db_input medium   phpbb2-conf-mysql/dbserver || true
-		db_input medium   phpbb2-conf-mysql/dbname   || true
-		db_input medium   phpbb2-conf-mysql/dbuser   || true
-		db_input low      phpbb2-conf-mysql/dbpass   || true
-		if db_go; then
-			if [ "$DBSETUP" = C ]; then
-				STATE=dbrootpass
-			else
-				STATE=finish
-			fi
-		else
-			STATE=init
-		fi
-		;;
-	dbrootpass)
-		db_get phpbb2-conf-mysql/db_created
-		if [ "$RET" = "true" ]; then
-			STATE=finish
-			break
-		fi
-		db_input high phpbb2-conf-mysql/dbrootpass || true
-		if db_go; then
-			STATE=finish
-		else
-			STATE=init
-		fi
-		;;
-	finish)
-		;;
-	esac
-done
-

Deleted: trunk/phpbb3/phpbb2-conf-mysql.lintian
===================================================================
--- trunk/phpbb3/phpbb2-conf-mysql.lintian	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2-conf-mysql.lintian	2006-07-03 13:42:24 UTC (rev 297)
@@ -1 +0,0 @@
-postinst-uses-db-input

Deleted: trunk/phpbb3/phpbb2-conf-mysql.postinst
===================================================================
--- trunk/phpbb3/phpbb2-conf-mysql.postinst	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2-conf-mysql.postinst	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,191 +0,0 @@
-#!/bin/sh
-# postinst script for phpbb2
-# By Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-
-set -e
-
-#export DEBCONF_DEBUG=developer
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-for i in setup server name user pass pass_generated rootpass; do
-	db_get phpbb2-conf-mysql/db$i || true
-	eval db$i'="$RET"'
-done
-
-# purge database rootpassword
-db_reset phpbb2-conf-mysql/dbrootpass
-
-if [ -z "$dbpass" ]; then
-	if [ -z "$dbpass_generated" ]; then
-		dbpass="`makepasswd --chars 12`"
-		db_set phpbb2-conf-mysql/dbpass_generated $dbpass
-	else
-		dbpass="$dbpass_generated"
-	fi
-fi
-
-bailout ()
-{
-	echo "Postinstallation of phpbb2-conf-mysql failed. Run"
-	echo "\`dpkg --configure -a' to retry"
-	for i in setup server name user pass _created; do
-		db_fset phpbb2-conf-mysql/db$i seen false
-	done
-	exit 1
-}
-
-if [ "$dbserver" = localhost ] && ! [ -e /usr/sbin/mysqld ]; then
-	echo "You need to have mysql-server installed if you want the MySQL
-	database to be hosted locally. Aborting." >&2
-	bailout
-fi
-
-	db_get phpbb2-conf-mysql/db_created
-	if [ "$dbsetup" = Create ] && [ "$RET" != true ]; then
-			dbadmin=root
-			dbadmpass="$dbrootpass"
-			echo "Creating MySQL database..."
-			. /usr/share/wwwconfig-common/mysql-createdb.sh
-			if [ "$status" = "error" ]; then
-				db_reset phpbb2-conf-mysql/dbfailcreate
-				db_subst phpbb2-conf-mysql/dbfailcreate error $(echo "$error"|head -1)
-				db_input high phpbb2-conf-mysql/dbfailcreate || true
-				db_go || true
-				bailout
-			fi
-
-			dballow=localhost
-			if [ "$dbserver" != localhost ]; then
-				dballow=%
-			fi
-			echo "Creating MySQL user..."
-			. /usr/share/wwwconfig-common/mysql-createuser.sh 
-			if [ "$status" = "error" ]; then
-				db_reset phpbb2-conf-mysql/dbfailcreateuser
-				db_subst phpbb2-conf-mysql/dbfailcreateuser error $(echo "$error"|head -1) 
-				db_input high phpbb2-conf-mysql/dbfailcreateuser || true
-				db_go || true
-				bailout
-			fi
-			db_set phpbb2-conf-mysql/db_created true
-	fi
-	if [ "$dbsetup" = Populate ] || [ "$dbsetup" = Create ]; then
-# Okay, being idempotent in creating tables and adding a few rows is extremely
-# hard thing to do. The tables is possible, but those rows? How can one
-# distinguish from not having added a row yet because of a crash, and the row
-# being intermittingly removed/edited by the user
-
-# I'll assume that either the creating/populating of tables succeeds fully or
-# it fails fully
-			dbadmin="$dbuser"
-			dbadmpass="$dbpass"
-			statement='SELECT * FROM phpbb_config'
-			sqlfile=`mktemp -t phpbb2-conf-mysql.schema.XXXXXX`
-			zcat /usr/share/phpbb2/schemas/mysql_schema.sql.gz \
-				> $sqlfile
-			zcat /usr/share/phpbb2/schemas/mysql_basic.sql.gz \
-				>> $sqlfile
-			echo "Creating MySQL tables if they don't exist yet..."
-			. /usr/share/wwwconfig-common/mysql-ifnot-exec.sh
-			rm -f $sqlfile
-			case "$status" in
-			*error)
-				db_reset phpbb2-conf-mysql/dbfailcreatetables || true
-				db_subst phpbb2-conf-mysql/dbfailcreatetables error $(echo "$error"|head -1)
-				db_input high phpbb2-conf-mysql/dbfailcreatetables || true
-				db_go || true
-				bailout
-				;;
-			exec)
-				# this is the table layout version, manually updated
-				db_set phpbb2-conf-mysql/db_version 2.0.18-1
-				;;
-			nothing)
-				# the config table already existed. But maybe we're still
-				# missing the sessions_keys table. Huge code duplication
-				# follows...
-				statement='SELECT * FROM phpbb_sessions_keys'
-				sqlfile=`mktemp -t phpbb2-conf-mysql.schema.XXXXXX`
-				zcat /usr/share/phpbb2/schemas/mysql_schema.sql.gz \
-					| sed -n '/^CREATE TABLE phpbb_sessions_keys /,/^)/p' \
-					> $sqlfile
-				echo "Creating phpbb_sessions_keys table if it doesn't exist yet..."
-				. /usr/share/wwwconfig-common/mysql-ifnot-exec.sh
-				rm -f $sqlfile
-				case "$status" in
-				*error)
-					db_reset phpbb2-conf-mysql/dbfailcreatetables || true
-					db_subst phpbb2-conf-mysql/dbfailcreatetables error $(echo "$error"|head -1)
-					db_input high phpbb2-conf-mysql/dbfailcreatetables || true
-					db_go || true
-					bailout
-					;;
-				exec|nothing)
-					# [nothing] We were already running with the new table,
-					# apparantly, or [exec] at least, we're now
-					db_set phpbb2-conf-mysql/db_version 2.0.18-1
-					;;
-				*)
-					echo "Unrecognized status from \
-						wwwconfig-common/mysql-ifnot-exec.sh: $status" >&2
-					exit 1
-				esac
-				;;
-			*)
-				echo "Unrecognized status from \
-					wwwconfig-common/mysql-ifnot-exec.sh: $status" >&2
-				exit 1
-			esac
-	fi
-
-# Install/update config file
-	tmpfile=`mktemp /tmp/phpbb2.config.php.XXXXXX`
-
-	cat <<-NEWCONFIG > $tmpfile
-	<?php
-	// Database configuration file for phpbb2. This file is automatically
-	// generated by phpbb2-conf-mysql
-	
-	/*
-		Please use \`dpkg-reconfigure phpbb2-conf-mysql' if you want to modify
-		these variables, or deinstall phpbb2-conf-mysql altogether.
-
-		Only this way phpbb2-conf-mysql can upgrade your table definitions
-		when needed.
-	*/
-
-	\$dbms         = "mysql";
-
-	\$dbhost       = "$dbserver";
-	\$dbname       = "$dbname";
-	\$dbuser       = "$dbuser";
-	\$dbpasswd     = "$dbpass";
-
-	\$table_prefix = "phpbb_";
-
-	define('PHPBB_INSTALLED', true);
-
-	?>
-	NEWCONFIG
-
-	# If /etc/phpbb2/config.php disappeared, purge it from ucf too, otherwise
-	# ucf will go crazy
-	if [ ! -e /etc/phpbb2/config.php ]; then
-		ucf --purge /etc/phpbb2/config.php
-	fi
-
-	# because of debconf, make ucf read from /dev/tty
-	ucf --three-way $tmpfile /etc/phpbb2/config.php < /dev/tty
-		
-	rm -f $tmpfile
-
-# fix permissions
-chgrp www-data /etc/phpbb2/config.php
-chmod g=r,o=   /etc/phpbb2/config.php
-
-# Debhelper
-
-#DEBHELPER#

Deleted: trunk/phpbb3/phpbb2-conf-mysql.postrm
===================================================================
--- trunk/phpbb3/phpbb2-conf-mysql.postrm	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2-conf-mysql.postrm	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,49 +0,0 @@
-#! /bin/sh
-# postrm script for phpbb2
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-case "$1" in
-       purge)
-	    ucf --purge /etc/phpbb2/config.php
-
-		db_reset phpbb2/nodbpurge || true
-		db_input high phpbb2/nodbpurge || true
-		db_go
-
-	   ;;
-	   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Deleted: trunk/phpbb3/phpbb2-conf-mysql.templates
===================================================================
--- trunk/phpbb3/phpbb2-conf-mysql.templates	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2-conf-mysql.templates	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,119 +0,0 @@
-Template: phpbb2-conf-mysql/redodb
-Type: boolean
-Default: false
-_Description: Overwrite your current configuration?
- An existing configuration file for the database has been found as
- /etc/phpbb2/config.php
- .
- 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.
-
-Template: phpbb2-conf-mysql/dbsetup
-Type: select
-_Choices: Create, Populate, None
-Default: Create
-_Description: Database creation
- If you have not yet created a database and want to do so now, choose
- "Create".
- .
- If you have created a database that currently has no tables and want to
- create the tables now, choose "Populate".
- .
- If none of the above options applies to you, choose "None".
-
-Template: phpbb2-conf-mysql/dbserver
-Type: string
-Default: localhost
-_Description: What is the hostname of your database server?
- If your database is local, accept the default of 'localhost'.
- .
- If your database is on a separate computer, then you will need to enter
- the resolvable domain name for that computer.
-
-Template: phpbb2-conf-mysql/dbname
-Type: string
-Default: phpbb2
-_Description: What name do you want for the database?
- All users, posts, etc., are stored in a single database. What would you like
- to name it?
-
-Template: phpbb2-conf-mysql/dbuser
-Type: string
-Default: phpbb2
-_Description: What database username do you want to use?
- A database-user dedicated to running phpBB will be created, in the interest
- of security.
-
-Template: phpbb2-conf-mysql/dbpass
-Type: password
-_Description: What database password do you want to use?
- Choose a password for the databaseuser.
- .
- If you leave this empty, random password will be generated.
-
-Template: phpbb2-conf-mysql/dbpass_generated
-Type: password
-Description: [Internal] makepasswd generated password
- No need to translate this.
- .
- Here the password generated by makepasswd is stored for later reference
- (for example, on upgrade). Only used if dbpass is empty.
-
-Template: phpbb2-conf-mysql/dbrootpass
-Type: password
-_Description: What is the MySQL root password?
- In order to create the necessary user and database, the MySQL root password
- is needed.
- .
- The password will be temporarily stored by debconf until the configuration
- phase of this installation.  If you do not trust debconf to securely manage
- this password, you will need to create the user and database yourself, and
- re-configure phpbb2-conf-mysql chosing "Populate".
-
-Template: phpbb2-conf-mysql/dbfailcreate
-Type: note
-_Description: FAILURE: Database not created
- The configuration script failed to create the phpbb database. Please run
- dpkg-reconfigure phpbb2-conf-mysql, to try with different options, or don't
- use phpbb2-conf-mysql at all.
- .
- Error: ${error}
-
-Template: phpbb2-conf-mysql/dbfailcreateuser
-Type: note
-_Description: FAILURE: Database user not created
- The configuration script failed to create the phpbb database user. Please
- run dpkg-reconfigure phpbb2-conf-mysql, to try with different options,
- or don't use phpbb2-conf-mysql at all.
- .
- Error: ${error}
-
-Template: phpbb2-conf-mysql/dbfailcreatetables
-Type: note
-_Description: FAILURE: Tables not created
- The configuration script failed to create the phpbb tables. Please run
- dpkg-reconfigure phpbb2-conf-mysql, to try with different options, or don't
- use phpbb2-conf-mysql at all.
- .
- Error: ${error}
-
-Template: phpbb2-conf-mysql/db_created
-Type: select
-Choices: true, false
-Default: false
-Description: [internal] Whether the DB plus user is created
- phpbb maintainer scripts will not ask for the DB admin password once the
- db and an accessing user is created
-
-Template: phpbb2-conf-mysql/db_version
-Type: string
-Description: [internal] what db_version is currently setup
- 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.
-
-Template: phpbb2-conf-mysql/nodbpurge
-Type: note
-_Description: Database not purged
- The purge script did not drop the database for phpbb2, nor the user created
- for it. You will need to do so yourself (but only if you want to lose all
- data and board configuration).

Deleted: trunk/phpbb3/phpbb2-languages.install
===================================================================
--- trunk/phpbb3/phpbb2-languages.install	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2-languages.install	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,2 +0,0 @@
-debian/build/l10n/templates /usr/share/phpbb2
-debian/build/l10n/language /usr/share/phpbb2/site

Deleted: trunk/phpbb3/phpbb2.config
===================================================================
--- trunk/phpbb3/phpbb2.config	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.config	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,13 +0,0 @@
-#!/bin/sh
-# config script for phpbb2
-# Copyright 2004 Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-db_input medium phpbb2/httpd || true
-db_go
-

Deleted: trunk/phpbb3/phpbb2.lintian
===================================================================
--- trunk/phpbb3/phpbb2.lintian	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.lintian	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,2 +0,0 @@
-non-standard-dir-perm var/lib/phpbb2/avatars/ 0730 != 0755
-non-standard-dir-perm var/lib/phpbb2/avatars/gallery/ 0730 != 0755

Deleted: trunk/phpbb3/phpbb2.postinst
===================================================================
--- trunk/phpbb3/phpbb2.postinst	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.postinst	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,72 +0,0 @@
-#!/bin/sh
-# postinst script for phpbb2
-# By Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-
-set -e
-
-#export DEBCONF_DEBUG=developer
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-# /usr/share/phpbb2/site/templates used to be a dir, should be a symlink now
-if ! [ -L /usr/share/phpbb2/site/templates ]; then
-	if [ -d /usr/share/phpbb2/site/templates ] && \
-		! rmdir /usr/share/phpbb2/site/templates; then
-
-		echo 
-		echo "Error: /usr/share/phpbb2/site/templates is not empty. Its"
-		echo "contents need to be moved to /etc/phpbb2/templates, the new"
-		echo "location of custom templates."
-		echo
-		echo "Please move your custom templates to /etc/phpbb2/templates, and"
-		echo "try 'apt-get -f install' or 'dpkg --configure --pending' to"
-		echo "reconfigure/reinstall the phpbb2 package."
-		echo
-		echo "Aborting now."
-		echo
-		exit 1
-	fi
-
-	if ! [ -e /usr/share/phpbb2/site/templates ]; then
-		ln -s /etc/phpbb2/templates /usr/share/phpbb2/site/templates
-	fi
-
-	if ! [ -L /usr/share/phpbb2/site/templates ]; then
-		echo
-		echo "Error: /usr/share/phpbb2/site/templates must be a symlink"
-		echo "pointing to /etc/phpbb2/templates. Something weird is going on,"
-		echo "I give up. Try reinstalling phpbb2 and/or fixing this manually."
-		echo 
-		exit 1
-	fi
-fi
-
-#TODO
-# walk though supported apache's, and warn if they are configured but
-# shouldn't anymore
-
-# Maybe store the apache.conf's in the /etc/$apache/conf.d dirs itself, so the
-# user can have distinct configs and such?
-
-# Following lend from phpmyadmin's postinst
-db_get phpbb2/httpd
-webservers="$RET"
-
-for webserver in $webservers; do
-	webserver=${webserver%,}
-	if [ -e /etc/$webserver/httpd.conf ] && [ ! -e /etc/$webserver/phpbb2.conf ]; then
-		mkdir -p /etc/$webserver/conf.d
-		ln -sf /etc/phpbb2/apache.conf /etc/$webserver/conf.d/phpbb2.conf
-		if [ -h /etc/$webserver/conf.d/phpbb2 ]; then
-			rm -f /etc/$webserver/conf.d/phpbb2
-		fi
-	fi
-done
-
-# Offer to reload the changed ones?
-
-# Debhelper
-
-#DEBHELPER#

Deleted: trunk/phpbb3/phpbb2.postrm
===================================================================
--- trunk/phpbb3/phpbb2.postrm	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.postrm	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,45 +0,0 @@
-#! /bin/sh
-# postrm script for phpbb2
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-. /usr/share/debconf/confmodule
-
-db_version 2.0
-
-case "$1" in
-       purge)
-		rm -rf /etc/phpbb2
-
-	   ;;
-	   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Deleted: trunk/phpbb3/phpbb2.preinst
===================================================================
--- trunk/phpbb3/phpbb2.preinst	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.preinst	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,10 +0,0 @@
-#!/bin/sh
-# preinst script for phpbb2
-# By Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-
-set -e
-
-# Whatever is there, it should be removed, to be replaced by a symlink
-rm -rf /usr/share/doc/phpbb2/schemas
-
-#DEBHELPER#

Deleted: trunk/phpbb3/phpbb2.prerm
===================================================================
--- trunk/phpbb3/phpbb2.prerm	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.prerm	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,47 +0,0 @@
-#! /bin/sh
-# prerm script for phpbb2
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    remove|deconfigure)
-		for webserver in apache apache-ssl apache-perl apache2; do
-			if [ -h /etc/$webserver/conf.d/phpbb2 ]; then
-				rm -f /etc/$webserver/conf.d/phpbb2
-			fi
-			if [ -h /etc/$webserver/conf.d/phpbb2.conf ]; then
-				rm -f /etc/$webserver/conf.d/phpbb2.conf
-			fi
-		done
-		;;
-    upgrade)
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: trunk/phpbb3/phpbb2.templates
===================================================================
--- trunk/phpbb3/phpbb2.templates	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/phpbb2.templates	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,11 +0,0 @@
-Template: phpbb2/httpd
-Type: multiselect
-Choices: apache, apache-ssl, apache-perl, apache2
-Default: apache
-_Description: Webserver(s) to configure:
- phpBB runs on any webserver with PHP4 support. However, only Apache variants
- are currently supported by this configuration script. Select the one(s) you
- want to configure.
- .
- Note: You will need to restart the server(s) yourself (typically by running
- something like  /etc/init.d/apache-??? reload).

Copied: trunk/phpbb3/phpbb3-languages.install (from rev 295, trunk/phpbb3/phpbb2-languages.install)
===================================================================
--- trunk/phpbb3/phpbb2-languages.install	2006-07-03 13:20:49 UTC (rev 295)
+++ trunk/phpbb3/phpbb3-languages.install	2006-07-03 13:42:24 UTC (rev 297)
@@ -0,0 +1,2 @@
+debian/build/l10n/templates /usr/share/phpbb3
+debian/build/l10n/language /usr/share/phpbb3/www

Copied: trunk/phpbb3/phpbb3.config (from rev 295, trunk/phpbb3/phpbb2.config)

Copied: trunk/phpbb3/phpbb3.lintian (from rev 295, trunk/phpbb3/phpbb2.lintian)
===================================================================
--- trunk/phpbb3/phpbb2.lintian	2006-07-03 13:20:49 UTC (rev 295)
+++ trunk/phpbb3/phpbb3.lintian	2006-07-03 13:42:24 UTC (rev 297)
@@ -0,0 +1,2 @@
+non-standard-dir-perm var/lib/phpbb3/avatars/ 0730 != 0755
+non-standard-dir-perm var/lib/phpbb3/avatars/gallery/ 0730 != 0755

Copied: trunk/phpbb3/phpbb3.postinst (from rev 295, trunk/phpbb3/phpbb2.postinst)

Copied: trunk/phpbb3/phpbb3.postrm (from rev 295, trunk/phpbb3/phpbb2.postrm)

Copied: trunk/phpbb3/phpbb3.preinst (from rev 295, trunk/phpbb3/phpbb2.preinst)

Copied: trunk/phpbb3/phpbb3.prerm (from rev 295, trunk/phpbb3/phpbb2.prerm)

Copied: trunk/phpbb3/phpbb3.templates (from rev 295, trunk/phpbb3/phpbb2.templates)

Modified: trunk/phpbb3/rules
===================================================================
--- trunk/phpbb3/rules	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/rules	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #  $Id$
 #
-#  debian/rules file for phpbb2 Debian package
+#  debian/rules file for phpbb3 Debian package
 #
 #  Written from scratch, with inspiration from apache's debian/rules, and the
 #  examples from dh_make
@@ -23,7 +23,7 @@
 
 get-orig-source:
 	debian/get-orig-source $(UPSTREAM)
-	mv phpbb2_$(UPSTREAM).orig.tar.gz ..
+	mv phpbb3_$(UPSTREAM).orig.tar.gz ..
 
 # Extract sources from the tarball and apply all upstream patches (aka mods)
 source: source-upstream-stamp source-patch-stamp
@@ -75,7 +75,7 @@
 	@# No need to unpatch, as patched dir is cleaned anyway
 	dh_testdir
 
-	sed -i "s/Project-Id-Version: [^\\\\]*/Project-Id-Version: phpbb2 $(VERSION)/" debian/po/templates.pot
+	sed -i "s/Project-Id-Version: [^\\\\]*/Project-Id-Version: phpbb3 $(VERSION)/" debian/po/templates.pot
 	sed -i "s/Report-Msgid-Bugs-To: [^\\\\]*/Report-Msgid-Bugs-To: $(MAINTAINER)/" debian/po/templates.pot
 	debconf-updatepo
 
@@ -91,41 +91,38 @@
 	dh_installdirs
 	dh_installchangelogs debian/build/phpBB2/docs/CHANGELOG.html
 	dh_installdocs
-	html2text < debian/phpbb2/usr/share/doc/phpbb2/README.html \
-		> debian/phpbb2/usr/share/doc/phpbb2/README
-	html2text < debian/phpbb2/usr/share/doc/phpbb2/FAQ.html \
-		> debian/phpbb2/usr/share/doc/phpbb2/FAQ
-	gzip -9 debian/phpbb2/usr/share/doc/phpbb2/FAQ \
-		debian/phpbb2/usr/share/doc/phpbb2/FAQ.html
+	html2text < debian/phpbb3/usr/share/doc/phpbb3/README.html \
+		> debian/phpbb3/usr/share/doc/phpbb3/README
+	html2text < debian/phpbb3/usr/share/doc/phpbb3/FAQ.html \
+		> debian/phpbb3/usr/share/doc/phpbb3/FAQ
+	gzip -9 debian/phpbb3/usr/share/doc/phpbb3/FAQ \
+		debian/phpbb3/usr/share/doc/phpbb3/FAQ.html
 	dh_installexamples
 	dh_install
-	mkdir -p debian/phpbb2/var/lib/phpbb2
-	mv debian/phpbb2/usr/share/phpbb2/site/images/avatars debian/phpbb2/var/lib/phpbb2/avatars
-	ln -s /var/lib/phpbb2/avatars debian/phpbb2/usr/share/phpbb2/site/images/avatars
-	ln -s /etc/phpbb2/templates debian/phpbb2/usr/share/phpbb2/site/templates
-	mkdir debian/phpbb2/etc/phpbb2/templates
-	ln -s /usr/share/phpbb2/templates/subSilver debian/phpbb2/etc/phpbb2/templates
-	ln -s /usr/share/doc/phpbb2/README.templates \
-		debian/phpbb2/usr/share/phpbb2/templates/README
-	gzip -9 debian/phpbb2/usr/share/phpbb2/schemas/*.sql
-	ln -s /usr/share/phpbb2/schemas debian/phpbb2/usr/share/doc/phpbb2/schemas
-	chgrp www-data debian/phpbb2/var/lib/phpbb2/avatars
-	chmod g=wx,o=  debian/phpbb2/var/lib/phpbb2/avatars
-	chgrp www-data debian/phpbb2/var/lib/phpbb2/avatars/gallery
-	chmod g=wx,o=  debian/phpbb2/var/lib/phpbb2/avatars/gallery
+	mkdir -p debian/phpbb3/var/lib/phpbb3
+	mv debian/phpbb3/usr/share/phpbb3/site/images/avatars debian/phpbb3/var/lib/phpbb3/avatars
+	ln -s /var/lib/phpbb3/avatars debian/phpbb3/usr/share/phpbb3/site/images/avatars
+	ln -s /etc/phpbb3/templates debian/phpbb3/usr/share/phpbb3/site/templates
+	mkdir debian/phpbb3/etc/phpbb3/templates
+	ln -s /usr/share/phpbb3/templates/subSilver debian/phpbb3/etc/phpbb3/templates
+	ln -s /usr/share/doc/phpbb3/README.templates \
+		debian/phpbb3/usr/share/phpbb3/templates/README
+	gzip -9 debian/phpbb3/usr/share/phpbb3/schemas/*.sql
+	ln -s /usr/share/phpbb3/schemas debian/phpbb3/usr/share/doc/phpbb3/schemas
+	chgrp www-data debian/phpbb3/var/lib/phpbb3/avatars
+	chmod g=wx,o=  debian/phpbb3/var/lib/phpbb3/avatars
+	chgrp www-data debian/phpbb3/var/lib/phpbb3/avatars/gallery
+	chmod g=wx,o=  debian/phpbb3/var/lib/phpbb3/avatars/gallery
 
-	mkdir -p debian/phpbb2/usr/share/lintian/overrides
-	cp -a debian/phpbb2.lintian debian/phpbb2/usr/share/lintian/overrides/phpbb2
-	mkdir -p debian/phpbb2-conf-mysql/usr/share/lintian/overrides
-	cp -a debian/phpbb2-conf-mysql.lintian \
-		debian/phpbb2-conf-mysql/usr/share/lintian/overrides/phpbb2-conf-mysql
+	mkdir -p debian/phpbb3/usr/share/lintian/overrides
+	cp -a debian/phpbb3.lintian debian/phpbb3/usr/share/lintian/overrides/phpbb3
 	dh_installdebconf	
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
-	dh_fixperms -Xvar/lib/phpbb2/avatars
-	find debian/phpbb2* -type d -name .svn | xargs -r rm -r
+	dh_fixperms -Xvar/lib/phpbb3/avatars
+	find debian/phpbb3* -type d -name .svn | xargs -r rm -r
 
 binary-indep: install
 	dh_testdir

Modified: trunk/phpbb3/watch
===================================================================
--- trunk/phpbb3/watch	2006-07-03 13:31:17 UTC (rev 296)
+++ trunk/phpbb3/watch	2006-07-03 13:42:24 UTC (rev 297)
@@ -1,3 +1,3 @@
 # Site		Directory		Pattern			Version	Script
 version=2
-http://prdownloads.sourceforge.net/phpbb/phpBB-(2\.[^-]*)\.tar\.gz
+http://prdownloads.sourceforge.net/phpbb/phpBB-(3\.[^-]*)\.tar\.gz





More information about the phpBB-l mailing list