r1305 - in plone3/trunk/debian (changelog control rules)

[Fabio Tranchitella]

    Date: Tuesday, November 18, 2008 @ 19:18:55
  Author: kobold
Revision: 1305

* New upstream release. (Closes: #503877)
* debian/control:
  - removed dpatch from the build-dependencies;
  - added dependencies on libjs-jquery and libjs-mochikit;
  - removed duplicated words from the package descriptions.

Modified:
  plone3/trunk/debian/changelog
  plone3/trunk/debian/control
  plone3/trunk/debian/rules

Modified: plone3/trunk/debian/changelog
===================================================================
--- plone3/trunk/debian/changelog	2008-11-11 10:44:17 UTC (rev 1304)
+++ plone3/trunk/debian/changelog	2008-11-18 19:18:55 UTC (rev 1305)
@@ -1,3 +1,13 @@
+plone3 (3.1.7-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #503877)
+  * debian/control:
+    - removed dpatch from the build-dependencies;
+    - added dependencies on libjs-jquery and libjs-mochikit;
+    - removed duplicated words from the package descriptions.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 18 Nov 2008 20:18:24 +0100
+
 plone3 (3.1.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: plone3/trunk/debian/control
===================================================================
--- plone3/trunk/debian/control	2008-11-11 10:44:17 UTC (rev 1304)
+++ plone3/trunk/debian/control	2008-11-18 19:18:55 UTC (rev 1305)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0)
 Build-Depends-Indep: zope-debhelper (>= 0.3.11), lsb-release
 Standards-Version: 3.8.0
 Homepage: http://plone.org
@@ -11,7 +11,7 @@
 
 Package: zope-plone3
 Architecture: all
-Depends: ${zope:Depends}, zope-externaleditor (>= 0.9.3-2), python-imaging, lynx, pdftohtml, python-docutils (>= 0.3.3), xpdf-utils, xsltproc, python-elementtree, python-libxml2, libjs-prototype
+Depends: ${zope:Depends}, zope-externaleditor (>= 0.9.3-2), python-imaging, lynx, pdftohtml, python-docutils (>= 0.3.3), xpdf-utils, xsltproc, python-elementtree, python-libxml2, libjs-prototype, libjs-jquery, libjs-mochikit
 Recommends: zope-linguaplone (>= 2.0), zope-cachefu (>= 1.1), python-openid, python-markdown, python-textile
 Description: content management system based on zope and cmf
  Plone is a ready-to-run content management system that is built on the
@@ -22,9 +22,9 @@
  It benefits from all features of Zope/CMF such as: RDBMS integration,
  Python/Perl extensions, Object Oriented Database, Web configurable workflow,
  pluggable membership and authentication, Undos, Form validation, amongst
- many many other features.  Available protocols: FTP, XMLRPC, HTTP, WEBDAV
- and you can hack it to enable SOAP.  Turn it into a distributed application
- system by installing ZEO.
+ many other features.  Available protocols: FTP, XMLRPC, HTTP, WEBDAV and you
+ can hack it to enable SOAP.  Turn it into a distributed application system by
+ installing ZEO.
  .
  This package contains the Zope products needed to run a Plone instance. If you 
  want to install a ready-to-use plone instance, install the package plone3-site.
@@ -41,8 +41,8 @@
  It benefits from all features of Zope/CMF such as: RDBMS integration,
  Python/Perl extensions, Object Oriented Database, Web configurable workflow,
  pluggable membership and authentication, Undos, Form validation, amongst
- many many other features.  Available protocols: FTP, XMLRPC, HTTP, WEBDAV
- and you can hack it to enable SOAP.  Turn it into a distributed application
+ many other features.  Available protocols: FTP, XMLRPC, HTTP, WEBDAV and you
+ can hack it to enable SOAP.  Turn it into a distributed application
  system by installing ZEO.
  .
  This package setups a Zope instance ready to be used with a Plone site.

Modified: plone3/trunk/debian/rules
===================================================================
--- plone3/trunk/debian/rules	2008-11-11 10:44:17 UTC (rev 1304)
+++ plone3/trunk/debian/rules	2008-11-18 19:18:55 UTC (rev 1305)
@@ -7,12 +7,12 @@
 
 distribution := $(shell lsb_release -is)
 
-build: patch-stamp build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -24,13 +24,20 @@
 	dh_clean -k
 	dh_install -X cssQuery-license.txt -X ecmaunit-license.txt \
 	    -X LICENSE -X LICENSE.GPL -X LICENSE.txt -X LICENSE.ZPL \
-		-X Python-License.txt -X Pythonwin-License.txt -X debian
+		-X Python-License.txt -X Pythonwin-License.txt -X debian \
+        -X jquery-license.txt
 	dh_installdirs
 	dh_installzope -pzope-plone3
 	dh_installzopeinstance -pplone3-site plone3-site
 	rm debian/zope-plone3/usr/share/zope/Products/CMFPlone:3.0/.dzlib/kss/core/plugins/effects/3rd_party/prototype.js
 	dh_link -p zope-plone3 /usr/share/javascript/prototype/prototype.js \
 	    /usr/share/zope/Products/CMFPlone:3.0/.dzlib/kss/core/plugins/effects/3rd_party/prototype.js
+	rm debian/zope-plone3/usr/share/zope/Products/CMFPlone:3.0/.dzlib/kss/core/plugins/effects/3rd_party/jquery.js
+	dh_link -p zope-plone3 /usr/share/javascript/jquery/jquery.js \
+	    /usr/share/zope/Products/CMFPlone:3.0/.dzlib/kss/core/plugins/effects/3rd_party/jquery.js
+	rm debian/zope-plone3/usr/share/zope/Products/CMFPlone:3.0/.dzlib/kss/core/plugins/effects/3rd_party/MochiKit.js
+	dh_link -p zope-plone3 /usr/share/javascript/mochikit/MochiKit.js \
+	    /usr/share/zope/Products/CMFPlone:3.0/.dzlib/kss/core/plugins/effects/3rd_party/MochiKit.js
 
 binary-indep: build install
 	dh_testdir
@@ -55,5 +62,3 @@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary install
-
-include /usr/share/dpatch/dpatch.make