[pkg-boinc-commits] r498 - in /branches/experimental/boinc/debian: patches/00list patches/05_correct-php-shebang.dpatch patches/06_remove-python-shebang.dpatch rules

[fst-guest at users.alioth.debian.org]

Author: fst-guest
Date: Sat Aug 12 11:27:34 2006
New Revision: 498

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=498
Log:
Use sed to correct PHP/Python shebangs instead of patches, because patches are more
difficult to maintain.

Removed:
    branches/experimental/boinc/debian/patches/05_correct-php-shebang.dpatch
    branches/experimental/boinc/debian/patches/06_remove-python-shebang.dpatch
Modified:
    branches/experimental/boinc/debian/patches/00list
    branches/experimental/boinc/debian/rules

Modified: branches/experimental/boinc/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/00list?rev=498&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/00list (original)
+++ branches/experimental/boinc/debian/patches/00list Sat Aug 12 11:27:34 2006
@@ -1,6 +1,4 @@
 04_sched-makefile.am.dpatch
-05_correct-php-shebang.dpatch
-06_remove-python-shebang.dpatch
 07_use-sensible-browser.dpatch
 08_boinc-path-config.dpatch
 10_exclude-sea.dpatch

Modified: branches/experimental/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/rules?rev=498&op=diff
==============================================================================
--- branches/experimental/boinc/debian/rules (original)
+++ branches/experimental/boinc/debian/rules Sat Aug 12 11:27:34 2006
@@ -179,8 +179,8 @@
 	      "debian/boinc-manager/usr/share/locale/$$i/LC_MESSAGES/BOINC Manager.mo"; \
 	  fi; \
 	done; 
-# The en_US po file is actually a po template, thus the corresponding
-# "BOINC Manager.mo" is empty and useless. 
+	# The en_US po file is actually a po template, thus the corresponding
+	# "BOINC Manager.mo" is empty and useless. 
 	rm -rf debian/boinc-manager/usr/share/locale/en_US/
 	
 	#
@@ -191,12 +191,37 @@
 	    usr/lib/boinc-server/sched/`basename $$i` \
 	    usr/share/boinc-server/sched/`basename $$i`; \
 	done;
-# Fix some file permissions.
+	
+	# Fix some file permissions.
 	chmod +x \
 	  debian/boinc-server/usr/share/boinc-server/html/ops/db_update.php \
 	  debian/boinc-server/usr/share/boinc-server/html/ops/watchdogs.php \
 	  debian/boinc-server/usr/share/boinc-server/html/ops/wd_nresults_changing.php \
 	  debian/boinc-server/usr/share/boinc-server/tools/watch_tcp
+	chmod -x \
+	  debian/boinc-server/usr/share/boinc-server/html/user/forum_search.php \
+	  debian/boinc-server/usr/share/boinc-server/html/user/forum_search_action.php \
+	  debian/boinc-server/usr/share/boinc-server/html/user/forum_thread_status.php \
+	  debian/boinc-server/usr/share/boinc-server/html/user/forum_thread_vote.php
+	
+	# Fix PHP shebang for executable PHP scripts.
+	sed -i -e '1 s/\/usr\/local\/bin\/php/\/usr\/bin\/php/' \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/db_update.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/make_fake_tables.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/migrate_tables.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/mungetest.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/update_forum_activities.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/update_profile_pages.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/update_uotd.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/watchdogs.php \
+	  debian/boinc-server/usr/share/boinc-server/html/ops/wd_nresults_changing.php
+	
+	# Remove Python shebang from Boinc module files that are not scripts.
+	sed -i -e '1 d' \
+	  debian/boinc-server/usr/share/python-support/Boinc/add_util.py \
+	  debian/boinc-server/usr/share/python-support/Boinc/boincxml.py \
+	  debian/boinc-server/usr/share/python-support/Boinc/configxml.py \
+	  debian/boinc-server/usr/share/python-support/Boinc/projectxml.py
 
 binary-arch: build install-arch
 	dh_testdir -a