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

jeroen at wolffelaar.nl jeroen at wolffelaar.nl
Tue Mar 30 04:10:01 CEST 2004


Author: jeroen
Date: 2004-03-30 04:09:34 +0200 (Tue, 30 Mar 2004)
New Revision: 90

Added:
   trunk/phpbb2/patches/012_fix_version_display.diff
Modified:
   trunk/phpbb2/changelog
   trunk/phpbb2/control
   trunk/phpbb2/rules
Log:
Show Debian version number, not the database one, and eliminate one place of
hardcoding version number, it's now taken from changelog


Modified: trunk/phpbb2/changelog
===================================================================
--- trunk/phpbb2/changelog	2004-03-29 21:58:39 UTC (rev 89)
+++ trunk/phpbb2/changelog	2004-03-30 02:09:34 UTC (rev 90)
@@ -6,8 +6,9 @@
     Martin Quinson (thanks!), who in progress also fixed my language a bit
     (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
 
- -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Mon, 29 Mar 2004 22:40:32 +0200
+ -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl>  Tue, 30 Mar 2004 04:08:43 +0200
 
 phpbb2 (2.0.6d-1) unstable; urgency=low
 

Modified: trunk/phpbb2/control
===================================================================
--- trunk/phpbb2/control	2004-03-29 21:58:39 UTC (rev 89)
+++ trunk/phpbb2/control	2004-03-30 02:09:34 UTC (rev 90)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Jeroen van Wolffelaar <jeroen at wolffelaar.nl>
-Build-Depends-Indep: debhelper (>= 4.1.16), bzip2
+Build-Depends-Indep: debhelper (>= 4.1.16), bzip2, sed (>= 3.95)
 Standards-Version: 3.6.0
 
 Package: phpbb2

Added: trunk/phpbb2/patches/012_fix_version_display.diff
===================================================================
--- trunk/phpbb2/patches/012_fix_version_display.diff	2004-03-29 21:58:39 UTC (rev 89)
+++ trunk/phpbb2/patches/012_fix_version_display.diff	2004-03-30 02:09:34 UTC (rev 90)
@@ -0,0 +1,36 @@
+diff -ur phpBB2.old/admin/page_footer_admin.php phpBB2/admin/page_footer_admin.php
+--- phpBB2.old/admin/page_footer_admin.php	2003-07-20 17:42:23.000000000 +0200
++++ phpBB2/admin/page_footer_admin.php	2004-03-30 03:38:23.000000000 +0200
+@@ -33,7 +33,7 @@
+ );
+ 
+ $template->assign_vars(array(
+-	'PHPBB_VERSION' => '2' . $board_config['version'], 
++	'PHPBB_VERSION' => PHPBB_VERSION, 
+ 	'TRANSLATION_INFO' => $lang['TRANSLATION_INFO'])
+ );
+ 
+diff -ur phpBB2.old/common.php phpBB2/common.php
+--- phpBB2.old/common.php	2004-03-29 23:09:59.000000000 +0200
++++ phpBB2/common.php	2004-03-30 03:41:25.000000000 +0200
+@@ -25,6 +25,8 @@
+ 	die("Hacking attempt");
+ }
+ 
++define('PHPBB_VERSION', '@VERSION@');
++
+ error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
+ set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
+ 
+diff -ur phpBB2.old/includes/page_tail.php phpBB2/includes/page_tail.php
+--- phpBB2.old/includes/page_tail.php	2003-07-20 17:42:24.000000000 +0200
++++ phpBB2/includes/page_tail.php	2004-03-30 03:38:25.000000000 +0200
+@@ -35,7 +35,7 @@
+ );
+ 
+ $template->assign_vars(array(
+-	'PHPBB_VERSION' => '2' . $board_config['version'],
++	'PHPBB_VERSION' => PHPBB_VERSION,
+ 	'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 
+ 	'ADMIN_LINK' => $admin_link)
+ );

Modified: trunk/phpbb2/rules
===================================================================
--- trunk/phpbb2/rules	2004-03-29 21:58:39 UTC (rev 89)
+++ trunk/phpbb2/rules	2004-03-30 02:09:34 UTC (rev 90)
@@ -13,11 +13,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-UPSTREAM_VERSION=2.0.7
+VERSION:=$(shell head -1 debian/changelog | sed -e 's/.*(//;s/).*//')
+UPSTREAM:=$(shell head -1 debian/changelog | sed -e 's/.*(//;s/-.*).*//')
 
 get-orig-source:
-	debian/get-orig-source $(UPSTREAM_VERSION)
-	mv phpbb2_$(UPSTREAM_VERSION).orig.tar.gz ..
+	debian/get-orig-source $(UPSTREAM)
+	mv phpbb2_$(UPSTREAM).orig.tar.gz ..
 
 # Extract sources from the tarball and apply all upstream patches (aka mods)
 source: source-upstream-stamp source-patch-stamp
@@ -44,6 +45,7 @@
 	for patch in debian/patches/*.diff; do \
 		patch -f -d debian/build -p0 < $$patch ; \
 	done
+	sed -i "s/@VERSION@/$(VERSION) (Debian)/" debian/build/phpBB2/common.php
 	touch $@
 
 build: source





More information about the phpBB-l mailing list