[Pkg-drupal-commits] r2053 - in /branches/drupal-5.0/debian: changelog control links rules

[luigi at users.alioth.debian.org]

Author: luigi
Date: Tue Jun  2 17:22:13 2009
New Revision: 2053

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2053
Log:
Removed dependency on libjs-jquery and use jquery.js from drupal ources to avoid conflict with newer version (Closes: 518515)

Modified:
    branches/drupal-5.0/debian/changelog
    branches/drupal-5.0/debian/control
    branches/drupal-5.0/debian/links
    branches/drupal-5.0/debian/rules

Modified: branches/drupal-5.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/changelog?rev=2053&op=diff
==============================================================================
--- branches/drupal-5.0/debian/changelog (original)
+++ branches/drupal-5.0/debian/changelog Tue Jun  2 17:22:13 2009
@@ -2,6 +2,10 @@
 
   [ Luigi Gangitano ]
   * New upstream release (Acknowledges NMU by Security Team)
+
+  * debian/{control,rules,links}
+    - Removed dependency on libjs-jquery and use jquery.js from drupal
+      sources to avoid conflict with newer version (Closes: 518515)
 
  -- Luigi Gangitano <luigi at debian.org>  Tue, 02 Jun 2009 19:03:57 +0200
 

Modified: branches/drupal-5.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/control?rev=2053&op=diff
==============================================================================
--- branches/drupal-5.0/debian/control (original)
+++ branches/drupal-5.0/debian/control Tue Jun  2 17:22:13 2009
@@ -10,7 +10,7 @@
 
 Package: drupal5
 Architecture: all
-Depends: ${debconf-depends}, ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, exim4 | mail-transport-agent, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client, dbconfig-common, curl, libjs-jquery
+Depends: ${debconf-depends}, ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, exim4 | mail-transport-agent, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client, dbconfig-common, curl
 Recommends: mysql-server | postgresql
 Description: a fully-featured content management framework
  Drupal is a dynamic web site platform which allows an individual or

Modified: branches/drupal-5.0/debian/links
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/links?rev=2053&op=diff
==============================================================================
--- branches/drupal-5.0/debian/links (original)
+++ branches/drupal-5.0/debian/links Tue Jun  2 17:22:13 2009
@@ -2,4 +2,3 @@
 etc/drupal/5/sites		usr/share/drupal5/sites
 etc/drupal/5/profiles	usr/share/drupal5/profiles
 var/lib/drupal5/files	usr/share/drupal5/files
-usr/share/javascript/jquery/jquery.js	usr/share/drupal5/misc/jquery.js

Modified: branches/drupal-5.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/rules?rev=2053&op=diff
==============================================================================
--- branches/drupal-5.0/debian/rules (original)
+++ branches/drupal-5.0/debian/rules Tue Jun  2 17:22:13 2009
@@ -49,7 +49,7 @@
 	find $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal5/themes \
 	  -name '*.png' -o -name '*.jpg' | xargs chmod a-x
 	chmod +x $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal5/scripts/*
-	rm $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal5/misc/jquery.js
+	#rm $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal5/misc/jquery.js
 
 
 	install -m640 .htaccess debian/drupal5/etc/drupal/5/htaccess