r2143 - in zope2.12/trunk/debian (6 files)

Mon Nov 15 01:16:56 UTC 2010

Date: Monday, November 15, 2010 @ 01:16:55
  Author: pumazi-guest
Revision: 2143

Correcting the numerous executable-not-elf-or-script warnings. Removed an ancient script in DocumentTemplate that dates back to the time of python1.5. Removing the script corrected the issue that was caused by previous correction. Touched up the init script to correct init.d-script-missing-dependency-on-remote_fs.

Added:
  zope2.12/trunk/debian/patches/remove_documenttemplate_release_script.patch
Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/patches/series
  zope2.12/trunk/debian/rules
  zope2.12/trunk/debian/zopeZVER.init.in
  zope2.12/trunk/debian/zopeZVER.lintian-overrides.in

Modified: zope2.12/trunk/debian/changelog
===================================================================

--- zope2.12/trunk/debian/changelog	2010-11-14 21:29:31 UTC (rev 2142)
+++ zope2.12/trunk/debian/changelog	2010-11-15 01:16:55 UTC (rev 2143)
@@ -19,9 +19,13 @@
   * Adding python-pip as a build dependency.
   * Added a get-orig-source rules target to build an orig.tar.gz.
   * Restored exclusive support for Python version 2.6.
-  * Bump zope-common version compatiblity.
+  * Bumped zope-common's version compatiblity.
+  * Removed the executable bit from the built distribution's python modules.
+  * Removed an acient shell script in DocumentTemplate that dates back
+    to the time of Python version 1.5.
+  * Touched up the init script to provide remote_fs compatiblity.
 
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 23:06:46 -0500
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Wed, 10 Nov 2010 03:11:35 -0500
 
 zope2.12 (2.12.0-1) unstable; urgency=low
 

Added: zope2.12/trunk/debian/patches/remove_documenttemplate_release_script.patch
===================================================================
--- zope2.12/trunk/debian/patches/remove_documenttemplate_release_script.patch	                        (rev 0)
+++ zope2.12/trunk/debian/patches/remove_documenttemplate_release_script.patch	2010-11-15 01:16:55 UTC (rev 2143)
@@ -0,0 +1,47 @@
+Removing an ancient shell script used to release DocumentTemplate.
+--- a/source/Zope2/src/DocumentTemplate/release.fl
++++ /dev/null
+@@ -1,20 +0,0 @@
+-DT_HTML.py
+-DT_If.py
+-DT_In.py
+-DT_String.py
+-DT_UI.py
+-DT_Util.py
+-DT_Var.py
+-DT_Raise.py
+-DTtest.py
+-DTtestExpr.py
+-DTtest_basicIn.py
+-DocumentTemplate.py
+-VSEval.py
+-__init__.py
+-pDocumentTemplate.py
+-release_notes
+-gparse.py
+-DT_With.py
+-DT_InSV.py
+-ts_regex.py
+--- a/source/Zope2/src/DocumentTemplate/release.sh
++++ /dev/null
+@@ -1,20 +0,0 @@
+-#!/bin/sh
+-
+-R=$1
+-M=DocumentTemplate
+-
+-# StructuredText < $M.stx > $M.html
+-StructuredText -t < release_notes > DocumentTemplate-rn.html
+-cp DocumentTemplate-rn.html ..
+-rm -rf "$M-$R"
+-mkdir  "$M-$R" "$M-$R/$M"
+-echo
+-for f in `cat pyfiles`; do
+-  python1.5 -c "import sys; sys.path.append('..'); from tabnanny import *; f='$f'; check(f)"
+-done 
+-echo
+-tar -c -T release.fl -f - | (cd "$M-$R/$M"; tar xvf -)
+-cp INSTALL "$M-$R"/
+-tar cvf "$M-$R.tar" "$M-$R"
+-rm -f "$M-$R.tar.gz"
+-gzip "$M-$R.tar"

Modified: zope2.12/trunk/debian/patches/series
===================================================================
--- zope2.12/trunk/debian/patches/series	2010-11-14 21:29:31 UTC (rev 2142)
+++ zope2.12/trunk/debian/patches/series	2010-11-15 01:16:55 UTC (rev 2143)
@@ -1,3 +1,4 @@
+remove_documenttemplate_release_script.patch
 webdav.patch
 deb-zopeconf.patch
 zodb-script-fix.patch

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2010-11-14 21:29:31 UTC (rev 2142)
+++ zope2.12/trunk/debian/rules	2010-11-15 01:16:55 UTC (rev 2143)
@@ -78,6 +78,8 @@
 
 override_dh_fixperms:
 	dh_fixperms --
+	# Setuptools apparently makes every .py file executable during the build.
+	find $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/ -type f -perm /a+x -exec chmod a-x {} \;
 	chmod 755 \
 		$(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/Zope2-*/ZPublisher/Client.py \
 		$(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/Zope2-*/ZPublisher/Test.py

Modified: zope2.12/trunk/debian/zopeZVER.init.in
===================================================================
--- zope2.12/trunk/debian/zopeZVER.init.in	2010-11-14 21:29:31 UTC (rev 2142)
+++ zope2.12/trunk/debian/zopeZVER.init.in	2010-11-15 01:16:55 UTC (rev 2143)
@@ -2,10 +2,10 @@
 
 ### BEGIN INIT INFO
 # Provides:          zope at ZVER@
-# Required-Start:    $syslog $local_fs
-# Required-Stop:     $syslog $syslog
-# Should-Start:      $local_fs
-# Should-Stop:       $local_fs
+# Required-Start:    $syslog $remote_fs
+# Required-Stop:     $syslog $remote_fs
+# Should-Start:      $remote_fs
+# Should-Stop:       $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start zope at ZVER@ instances

Modified: zope2.12/trunk/debian/zopeZVER.lintian-overrides.in
===================================================================
--- zope2.12/trunk/debian/zopeZVER.lintian-overrides.in	2010-11-14 21:29:31 UTC (rev 2142)
+++ zope2.12/trunk/debian/zopeZVER.lintian-overrides.in	2010-11-15 01:16:55 UTC (rev 2143)
@@ -1,2 +1,3 @@
 zope at ZVER@: image-file-in-usr-lib
 zope at ZVER@: package-contains-empty-directory usr/lib/zope at ZVER@/skel/etc/package-includes/
+zope at ZVER@: file-in-unusual-dir var/log/zope2.12/.placeholder
\ No newline at end of file


