From thijs at alioth.debian.org  Mon Apr 21 22:19:33 2008
From: thijs at alioth.debian.org (thijs at alioth.debian.org)
Date: Mon, 21 Apr 2008 22:19:33 +0000
Subject: [pgv-svn] r89 - phpgedview/trunk/debian
Message-ID: <E1Jo4MH-0000wy-Oq@alioth.debian.org>

Author: thijs
Date: 2008-04-21 22:19:32 +0000 (Mon, 21 Apr 2008)
New Revision: 89

Modified:
   phpgedview/trunk/debian/changelog
   phpgedview/trunk/debian/control
   phpgedview/trunk/debian/phpgedview.install
   phpgedview/trunk/debian/phpgedview.links
   phpgedview/trunk/debian/rules
Log:
* New upstream release.
* Replace prototype.js with Debian packaged version (Closes: #475292).


Modified: phpgedview/trunk/debian/changelog
===================================================================
--- phpgedview/trunk/debian/changelog	2007-12-28 11:52:48 UTC (rev 88)
+++ phpgedview/trunk/debian/changelog	2008-04-21 22:19:32 UTC (rev 89)
@@ -1,3 +1,10 @@
+phpgedview (4.1.e+4.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Replace prototype.js with Debian packaged version (Closes: #475292).
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 21 Apr 2008 23:44:53 +0200
+
 phpgedview (4.1.e+4.1.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: phpgedview/trunk/debian/control
===================================================================
--- phpgedview/trunk/debian/control	2007-12-28 11:52:48 UTC (rev 88)
+++ phpgedview/trunk/debian/control	2008-04-21 22:19:32 UTC (rev 89)
@@ -10,7 +10,7 @@
 
 Package: phpgedview
 Architecture: all
-Depends: libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi | libapache2-mod-php5 | libapache-mod-php5 | php5 | php5-cgi , apache2 | httpd, php4-pear | php-pear, php-db, php4-sqlite | php5-sqlite | php4-mysql | php5-mysql, php-soap
+Depends: libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi | libapache2-mod-php5 | libapache-mod-php5 | php5 | php5-cgi , apache2 | httpd, php4-pear | php-pear, php-db, php4-sqlite | php5-sqlite | php4-mysql | php5-mysql, php-soap, libjs-prototype
 Recommends: phpgedview-themes, phpgedview-places, phpgedview-languages, ttf-dejavu
 Suggests: php4-gd | php5-gd, gallery2, phpsysinfo
 Description: Web-based genealogy viewer and editor

Modified: phpgedview/trunk/debian/phpgedview.install
===================================================================
--- phpgedview/trunk/debian/phpgedview.install	2007-12-28 11:52:48 UTC (rev 88)
+++ phpgedview/trunk/debian/phpgedview.install	2008-04-21 22:19:32 UTC (rev 89)
@@ -10,6 +10,7 @@
 modules/*txt		/usr/share/phpgedview/www/modules
 modules/FCKeditor		/usr/share/phpgedview/www/modules
 modules/googlemap		/usr/share/phpgedview/www/modules
+modules/lightbox		/usr/share/phpgedview/www/modules
 modules/punbb			/usr/share/phpgedview/www/modules
 modules/research_assistant	/usr/share/phpgedview/www/modules
 modules/sitemap			/usr/share/phpgedview/www/modules

Modified: phpgedview/trunk/debian/phpgedview.links
===================================================================
--- phpgedview/trunk/debian/phpgedview.links	2007-12-28 11:52:48 UTC (rev 88)
+++ phpgedview/trunk/debian/phpgedview.links	2008-04-21 22:19:32 UTC (rev 89)
@@ -3,3 +3,5 @@
 /usr/share/fonts/truetype/ttf-dejavu/dejavusans.ttf	usr/share/phpgedview/includes/fonts/DejaVuSans.ttf
 /usr/share/gallery2	usr/share/phpgedview/www/modules/gallery2
 /usr/share/phpsysinfo	usr/share/phpgedview/www/modules/phpsysinfo
+/usr/share/javascript/prototype/prototype.js	usr/share/phpgedview/www/modules/lightbox/js/prototype.js
+/usr/share/javascript/prototype/prototype.js	usr/share/phpgedview/www/js/conio/prototype.js

Modified: phpgedview/trunk/debian/rules
===================================================================
--- phpgedview/trunk/debian/rules	2007-12-28 11:52:48 UTC (rev 88)
+++ phpgedview/trunk/debian/rules	2008-04-21 22:19:32 UTC (rev 89)
@@ -18,6 +18,14 @@
 	# 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
+	# same for prototype.js
+	rm -f debian/phpgedview/usr/share/phpgedview/www/modules/lightbox/js/prototype.js \
+		debian/phpgedview/usr/share/phpgedview/www/js/conio/prototype.js
+	ln -s ../../../../javascript/prototype/prototype.js \
+		debian/phpgedview/usr/share/phpgedview/www/js/conio/prototype.js
+	ln -s ../../../../../javascript/prototype/prototype.js \
+		debian/phpgedview/usr/share/phpgedview/www/modules/lightbox/js/prototype.js
+
 	# cleanup empty dir
 	rmdir debian/phpgedview/usr/share/phpgedview/www/modules/punbb/include/user/
 	# prepare writable dir