r443 - in zope2.9/trunk/debian: . patches

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-02 21:43:50 +0100 (Thu, 02 Nov 2006)
New Revision: 443

Modified:
   zope2.9/trunk/debian/changelog
   zope2.9/trunk/debian/patches/deb-zopeconf.dpatch
   zope2.9/trunk/debian/rules
Log:
Changes for zope2.9 2.9.5-2.


Modified: zope2.9/trunk/debian/changelog
===================================================================
--- zope2.9/trunk/debian/changelog	2006-11-02 20:15:12 UTC (rev 442)
+++ zope2.9/trunk/debian/changelog	2006-11-02 20:43:50 UTC (rev 443)
@@ -1,3 +1,10 @@
+zope2.9 (2.9.5-2) unstable; urgency=low
+
+  * debian/rules: added a symlinked README.Debian from zope-common.
+    (Closes: #387643)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu,  2 Nov 2006 21:18:00 +0100
+
 zope2.9 (2.9.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: zope2.9/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope2.9/trunk/debian/patches/deb-zopeconf.dpatch	2006-11-02 20:15:12 UTC (rev 442)
+++ zope2.9/trunk/debian/patches/deb-zopeconf.dpatch	2006-11-02 20:43:50 UTC (rev 443)
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urN zope2.9-2.9.5/z/skel/etc/zope.conf.in zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in
---- zope2.9-2.9.5/z/skel/etc/zope.conf.in	2006-07-20 07:31:24.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in	2006-07-21 09:47:24.000000000 +0200
+--- zope2.9-2.9.5/z/skel/etc/zope.conf.in	2006-10-02 17:53:36.000000000 +0200
++++ zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in	2006-11-02 21:02:15.000000000 +0100
 @@ -24,6 +24,8 @@
  
  %define INSTANCE <<INSTANCE_HOME>>
@@ -36,8 +36,8 @@
  </http-server>
  
 diff -urN zope2.9-2.9.5/z/utilities/copyzopeskel.py zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py
---- zope2.9-2.9.5/z/utilities/copyzopeskel.py	2006-07-20 07:31:23.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py	2006-07-21 09:47:24.000000000 +0200
+--- zope2.9-2.9.5/z/utilities/copyzopeskel.py	2006-10-02 17:53:35.000000000 +0200
++++ zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py	2006-11-02 21:02:15.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.4
 +#!/usr/bin/python2.4
@@ -119,9 +119,19 @@
      if msg:
          print >>stream, msg
 diff -urN zope2.9-2.9.5/z/utilities/mkzopeinstance.py zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py
---- zope2.9-2.9.5/z/utilities/mkzopeinstance.py	2006-07-20 07:31:23.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py	2006-07-21 09:47:24.000000000 +0200
-@@ -36,8 +36,8 @@
+--- zope2.9-2.9.5/z/utilities/mkzopeinstance.py	2006-10-02 17:53:35.000000000 +0200
++++ zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py	2006-11-02 21:16:48.000000000 +0100
+@@ -22,6 +22,9 @@
+ -d/--dir  -- the dir in which the instance home should be created
+ -u/--user NAME:PASSWORD -- set the user name and password of the initial user
+ -s/--skelsrc -- the dir from which skeleton files should be copied
++-l/--layout -- layout to use while copying the skeleton files (`fhs' or `zope')
++--service-user -- system user to be used to run this instance (user:group)
++--service-port -- HTTP port used to run this instance
+ 
+ When run without arguments, this script will ask for the information necessary
+ to create a Zope instance home.
+@@ -36,8 +39,8 @@
  def main():
      try:
          opts, args = getopt.getopt(sys.argv[1:],
@@ -132,7 +142,7 @@
              )
      except getopt.GetoptError, msg:
          usage(sys.stderr, msg)
-@@ -48,6 +48,9 @@
+@@ -48,6 +51,9 @@
      password = None
      skeltarget = None
      skelsrc = None
@@ -142,7 +152,7 @@
  
      for opt, arg in opts:
          if opt in ("-d", "--dir"):
-@@ -71,6 +74,28 @@
+@@ -71,6 +77,28 @@
                  usage(sys.stderr, "user must be specified as name:password")
                  sys.exit(2)
              user, password = arg.split(":", 1)
@@ -171,7 +181,7 @@
  
      if not skeltarget:
          # interactively ask for skeltarget and initial user name/passwd.
-@@ -119,9 +144,17 @@
+@@ -119,9 +147,17 @@
          "INSTANCE_HOME": instancehome,
          "SOFTWARE_HOME": softwarehome,
          "ZOPE_HOME": zopehome,

Modified: zope2.9/trunk/debian/rules
===================================================================
--- zope2.9/trunk/debian/rules	2006-11-02 20:15:12 UTC (rev 442)
+++ zope2.9/trunk/debian/rules	2006-11-02 20:43:50 UTC (rev 443)
@@ -86,8 +86,7 @@
 	find $(DEBIAN) -name '*.pyc' | xargs -r rm -r
 
 	# FHS enforcement
-	mkdir -p $(DEBIAN)/usr/sbin \
-	         $(DEBIAN)/etc/$(ZOPE) \
+	mkdir -p $(DEBIAN)/etc/$(ZOPE) \
 	         $(DEBIAN)/var/log/$(ZOPE) \
 	         $(DEBIAN)/var/lib/$(ZOPE)/instance \
 	         $(DEBIAN)/var/lib/$(ZOPE)/zeo \
@@ -152,6 +151,8 @@
 	dh_testroot
 	dh_installchangelogs -k z/doc/CHANGES.txt
 	dh_installdocs -X INSTALL.txt z/doc/*
+	dh_link /usr/share/doc/zope-common/README.Debian.gz \
+	        /usr/share/doc/zope$(ZVER)/README.Debian.gz
 	dh_installdocs
 	dh_installlogrotate
 	dh_installdebconf