[DRE-commits] r4314 - trunk/passenger/debian

[Micah Anderson]

Author: micah
Date: 2009-11-09 17:52:09 +0000 (Mon, 09 Nov 2009)
New Revision: 4314

Modified:
   trunk/passenger/debian/changelog
   trunk/passenger/debian/control
   trunk/passenger/debian/repack.sh
Log:
fix #555273

Modified: trunk/passenger/debian/changelog
===================================================================
--- trunk/passenger/debian/changelog	2009-11-09 17:45:56 UTC (rev 4313)
+++ trunk/passenger/debian/changelog	2009-11-09 17:52:09 UTC (rev 4314)
@@ -1,6 +1,8 @@
 passenger (2.2.5debian-6) unstable; urgency=low
 
   * Really sort out the Build-deps this time (Closes: #555155)
+  * Remove embedded prototype.js, Build-dep on libjs-prototype
+    and symlink to that version (Closes: #555273)
 
  -- Micah Anderson <micah at debian.org>  Mon, 09 Nov 2009 12:07:15 -0500
 

Modified: trunk/passenger/debian/control
===================================================================
--- trunk/passenger/debian/control	2009-11-09 17:45:56 UTC (rev 4313)
+++ trunk/passenger/debian/control	2009-11-09 17:52:09 UTC (rev 4314)
@@ -14,7 +14,7 @@
 Package: libapache2-mod-passenger
 Architecture: any
 Depends: ${shlibs:Depends}, apache2-mpm-worker (>= 2.2.9-9) | apache2-mpm-prefork (>= 2.2.9-9), ruby, 
- rubygems (>= 1.2), ${misc:Depends}, librack-ruby
+ rubygems (>= 1.2), ${misc:Depends}, librack-ruby, libjs-prototype
 Suggests: python, rails, passenger-doc
 Description: Rails and Rack support for Apache2
  Phusion Passenger — a.k.a. mod_rails or mod_rack — makes

Modified: trunk/passenger/debian/repack.sh
===================================================================
--- trunk/passenger/debian/repack.sh	2009-11-09 17:45:56 UTC (rev 4313)
+++ trunk/passenger/debian/repack.sh	2009-11-09 17:52:09 UTC (rev 4314)
@@ -30,6 +30,10 @@
 ## Remove stuff
 rm -vfr $UP_BASE/test/support/valgrind.h
 rm -vfr $UP_BASE/debian
+
+# remove embedded prototype.js (#555273)
+rm -vfr $UP_BASE/test/stub/rails_apps/mycook/public/javascripts/prototype.js
+ln -s /usr/share/javascript/prototype/prototype.js test/stub/rails_apps/mycook/public/javascripts
 ## End
 
 mv "$UP_BASE" "$DIR/$REPACK_DIR"