[pgv-svn] r88 - in phpgedview/trunk/debian: . patches

thijs at alioth.debian.org thijs at alioth.debian.org
Fri Dec 28 11:52:48 UTC 2007


Author: thijs
Date: 2007-12-28 11:52:48 +0000 (Fri, 28 Dec 2007)
New Revision: 88

Modified:
   phpgedview/trunk/debian/changelog
   phpgedview/trunk/debian/control
   phpgedview/trunk/debian/copyright
   phpgedview/trunk/debian/patches/01_config.patch
   phpgedview/trunk/debian/phpgedview.install
   phpgedview/trunk/debian/rules
Log:
* New upstream release.
* Install missing JavaScript files.
* Some packaging cleanups.


Modified: phpgedview/trunk/debian/changelog
===================================================================
--- phpgedview/trunk/debian/changelog	2007-10-23 20:20:47 UTC (rev 87)
+++ phpgedview/trunk/debian/changelog	2007-12-28 11:52:48 UTC (rev 88)
@@ -1,3 +1,11 @@
+phpgedview (4.1.e+4.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Install missing JavaScript files.
+  * Some packaging cleanups.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Fri, 28 Dec 2007 12:48:50 +0100
+
 phpgedview (4.1.e+4.1.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: phpgedview/trunk/debian/control
===================================================================
--- phpgedview/trunk/debian/control	2007-10-23 20:20:47 UTC (rev 87)
+++ phpgedview/trunk/debian/control	2007-12-28 11:52:48 UTC (rev 88)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Thijs Kinkhorst <thijs at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.32)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Homepage: http://www.phpgedview.net/
 Vcs-Svn: svn://svn.debian.org/pkg-phpgedview/phpgedview/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-phpgedview

Modified: phpgedview/trunk/debian/copyright
===================================================================
--- phpgedview/trunk/debian/copyright	2007-10-23 20:20:47 UTC (rev 87)
+++ phpgedview/trunk/debian/copyright	2007-12-28 11:52:48 UTC (rev 88)
@@ -43,7 +43,7 @@
 /usr/share/common-licenses/LGPL
 
 webservice/genealogyService.php is copyright the PGV Development Team,
-includes/cssparser.inc.php is copyright Thomas Björk, includes/pclzip.lib.php
+includes/cssparser.inc.php is copyright Thomas Björk, includes/pclzip.lib.php
 is copyright 2006 Vincent Blavet and all are also distributed under the same
 LGPL.
 

Modified: phpgedview/trunk/debian/patches/01_config.patch
===================================================================
--- phpgedview/trunk/debian/patches/01_config.patch	2007-10-23 20:20:47 UTC (rev 87)
+++ phpgedview/trunk/debian/patches/01_config.patch	2007-12-28 11:52:48 UTC (rev 88)
@@ -1,28 +1,28 @@
---- config.php.orig	2007-08-03 13:24:06.000000000 +0200
-+++ config.php	2007-08-09 15:14:53.000000000 +0200
+--- config.php.orig	2007-11-16 14:02:48.000000000 +0100
++++ config.php	2007-12-28 12:34:07.000000000 +0100
 @@ -34,14 +34,14 @@
- 	exit;
- }
- 
--$DBTYPE = "mysql";								//-- type of database to connect when using the PEAR:DB module
-+$DBTYPE = "sqlite";								//-- type of database to connect when using the PEAR:DB module
- $DBHOST = "localhost";							//-- Host where MySQL database is kept
- $DBUSER = "root";									//-- MySQL database User Name
- $DBPASS = "";									//-- MySQL database User Password
--$DBNAME = "phpgedview";							//-- The MySQL database name where you want PHPGedView to build its tables
-+$DBNAME = "/var/lib/phpgedview/phpgedview.db";							//-- The MySQL database name where you want PHPGedView to build its tables
- $DBPERSIST = false;								//-- Use persistent database connections
- $TBLPREFIX = "pgv_";							//-- prefix to include on table names
--$INDEX_DIRECTORY = "./index/";					//-- Readable and Writeable Directory to store index files (include the trailing "/")
-+$INDEX_DIRECTORY = "/var/lib/phpgedview/";					//-- Readable and Writeable Directory to store index files (include the trailing "/")
- $AUTHENTICATION_MODULE = "authentication.php";	//-- File that contains authentication functions
- $PGV_STORE_MESSAGES = true;						//-- allow messages sent to users to be stored in the PGV system
- $PGV_SIMPLE_MAIL = true;						//-- allow admins to set this so that they can override the name <emailaddress> combination in the emails
+ 	exit;
+ }
+ 
+-$DBTYPE = "mysql";								//-- type of database to connect when using the PEAR:DB module
++$DBTYPE = "sqlite";								//-- type of database to connect when using the PEAR:DB module
+ $DBHOST = "localhost";							//-- Host where MySQL database is kept
+ $DBUSER = "root";									//-- MySQL database User Name
+ $DBPASS = "";									//-- MySQL database User Password
+-$DBNAME = "phpgedview";							//-- The MySQL database name where you want PHPGedView to build its tables
++$DBNAME = "/var/lib/phpgedview/phpgedview.db";							//-- The MySQL database name where you want PHPGedView to build its tables
+ $DBPERSIST = false;								//-- Use persistent database connections
+ $TBLPREFIX = "pgv_";							//-- prefix to include on table names
+-$INDEX_DIRECTORY = "./index/";					//-- Readable and Writeable Directory to store index files (include the trailing "/")
++$INDEX_DIRECTORY = "/var/lib/phpgedview/";					//-- Readable and Writeable Directory to store index files (include the trailing "/")
+ $AUTHENTICATION_MODULE = "authentication.php";	//-- File that contains authentication functions
+ $PGV_STORE_MESSAGES = true;						//-- allow messages sent to users to be stored in the PGV system
+ $PGV_SIMPLE_MAIL = true;						//-- allow admins to set this so that they can override the name <emailaddress> combination in the emails
 @@ -65,5 +65,5 @@
- $DIRECTORY_MODE = "ldap";						//-- User info stored in db or ldap directory
- $COMMIT_COMMAND = "";						//-- Choices are empty string, cvs or svn
- 
--$CONFIGURED = false;
--require_once("includes/session.php");
-+$CONFIGURED = true;
-+require_once("/usr/share/phpgedview/www/includes/session.php");
+ $DIRECTORY_MODE = "ldap";						//-- User info stored in db or ldap directory
+ $COMMIT_COMMAND = "";						//-- Choices are empty string, cvs or svn
+ 
+-$CONFIGURED = false;
+-require_once("includes/session.php");
++$CONFIGURED = true;
++require_once("/usr/share/phpgedview/www/includes/session.php");

Modified: phpgedview/trunk/debian/phpgedview.install
===================================================================
--- phpgedview/trunk/debian/phpgedview.install	2007-10-23 20:20:47 UTC (rev 87)
+++ phpgedview/trunk/debian/phpgedview.install	2007-12-28 11:52:48 UTC (rev 88)
@@ -22,6 +22,7 @@
 webservice		/usr/share/phpgedview/www
 *.php		/usr/share/phpgedview/www
 js		/usr/share/phpgedview/www
+*.js		/usr/share/phpgedview/www
 
 config.php		/etc/phpgedview
 config_gedcom.php	/etc/phpgedview

Modified: phpgedview/trunk/debian/rules
===================================================================
--- phpgedview/trunk/debian/rules	2007-10-23 20:20:47 UTC (rev 87)
+++ phpgedview/trunk/debian/rules	2007-12-28 11:52:48 UTC (rev 88)
@@ -18,6 +18,8 @@
 	# same for dejavu font
 	rm -rf debian/phpgedview/usr/share/phpgedview/www/includes/fonts/dejavu-ttf-2.15 \
 		debian/phpgedview/usr/share/phpgedview/www/includes/fonts/DejaVuSans.ttf
+	# cleanup empty dir
+	rmdir debian/phpgedview/usr/share/phpgedview/www/modules/punbb/include/user/
 	# prepare writable dir
 	chown www-data:www-data debian/phpgedview/var/lib/phpgedview
 




More information about the pkg-phpgedview-commit mailing list