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

[Charles Fry]

Author: cfry-guest
Date: 2006-01-06 20:49:46 +0000 (Fri, 06 Jan 2006)
New Revision: 30

Added:
   phpgedview/trunk/debian/patches/01_config.patch
Removed:
   phpgedview/trunk/debian/patches/00list
   phpgedview/trunk/debian/patches/01_config.dpatch
Modified:
   phpgedview/trunk/debian/rules
Log:
moved to simple-patchsys


Deleted: phpgedview/trunk/debian/patches/00list
===================================================================
--- phpgedview/trunk/debian/patches/00list	2006-01-03 20:19:44 UTC (rev 29)
+++ phpgedview/trunk/debian/patches/00list	2006-01-06 20:49:46 UTC (rev 30)
@@ -1 +0,0 @@
-01_config

Deleted: phpgedview/trunk/debian/patches/01_config.dpatch
===================================================================
--- phpgedview/trunk/debian/patches/01_config.dpatch	2006-01-03 20:19:44 UTC (rev 29)
+++ phpgedview/trunk/debian/patches/01_config.dpatch	2006-01-06 20:49:46 UTC (rev 30)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_config.dpatch by Charles Fry <debian at frogcircus.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: set debian paths
-
- at DPATCH@
-diff -urNad phpgedview~/config.php phpgedview/config.php
---- phpgedview~/config.php	2005-10-17 14:52:18.000000000 -0400
-+++ phpgedview/config.php	2005-11-22 14:10:04.258298857 -0500
-@@ -48,7 +48,7 @@
- $DBNAME = "phpgedview";							//-- 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
-@@ -71,6 +71,6 @@
- 
- $DIRECTORY_MODE = "ldap";						//-- User info stored in db or ldap directory
- 
--$CONFIGURED = false;
--require_once($PGV_BASE_DIRECTORY."includes/session.php");
-+$CONFIGURED = true;
-+require_once('/usr/share/phpgedview/www/includes/session.php');
- ?>

Copied: phpgedview/trunk/debian/patches/01_config.patch (from rev 29, phpgedview/trunk/debian/patches/01_config.dpatch)
===================================================================
--- phpgedview/trunk/debian/patches/01_config.dpatch	2006-01-03 20:19:44 UTC (rev 29)
+++ phpgedview/trunk/debian/patches/01_config.patch	2006-01-06 20:49:46 UTC (rev 30)
@@ -0,0 +1,21 @@
+diff -urNad phpgedview~/config.php phpgedview/config.php
+--- phpgedview~/config.php	2005-10-17 14:52:18.000000000 -0400
++++ phpgedview/config.php	2005-11-22 14:10:04.258298857 -0500
+@@ -48,7 +48,7 @@
+ $DBNAME = "phpgedview";							//-- 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
+@@ -71,6 +71,6 @@
+ 
+ $DIRECTORY_MODE = "ldap";						//-- User info stored in db or ldap directory
+ 
+-$CONFIGURED = false;
+-require_once($PGV_BASE_DIRECTORY."includes/session.php");
++$CONFIGURED = true;
++require_once('/usr/share/phpgedview/www/includes/session.php');
+ ?>

Modified: phpgedview/trunk/debian/rules
===================================================================
--- phpgedview/trunk/debian/rules	2006-01-03 20:19:44 UTC (rev 29)
+++ phpgedview/trunk/debian/rules	2006-01-06 20:49:46 UTC (rev 30)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_INSTALL_CHANGELOGS_ALL = changelog.txt
 
@@ -12,6 +12,3 @@
 	chmod 0770 debian/phpgedview/var/lib/phpgedview
 	mv debian/phpgedview/usr/share/lintian/overrides/phpgedview.lintian \
 		debian/phpgedview/usr/share/lintian/overrides/phpgedview
-
-# allow dpatch-edit-patch to work (since dpatch.mk is broken, see bug #284231)
-unpatch: deapply-dpatches