r2146 - in zope2.12/trunk/debian (4 files)

[pumazi-guest at users.alioth.debian.org]

    Date: Wednesday, November 24, 2010 @ 18:32:04
  Author: pumazi-guest
Revision: 2146

New upstream release. A tarball version of Zope 2.12.11 is available. Added pip to the deb-satisfied list, which prevents get-orig-source from fetching it. Updated the patches.

Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/patches/deb-zopeconf.patch
  zope2.12/trunk/debian/patches/fix_lib_location.patch
  zope2.12/trunk/debian/rules

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2010-11-24 16:22:24 UTC (rev 2145)
+++ zope2.12/trunk/debian/changelog	2010-11-24 18:32:04 UTC (rev 2146)
@@ -1,3 +1,12 @@
+zope2.12 (2.12.11-1) unstable; urgency=low
+
+  * New upstream release. A tarball version of Zope 2.12.11 is available.
+  * Added pip to the deb-satisfied list, which prevents get-orig-source
+    from fetching it.
+  * Updated the patches.
+
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Wed, 24 Nov 2010 13:30:25 -0500
+
 zope2.12 (2.12.10-1) unstable; urgency=low
 
   * Adding myself to the package Uploaders.

Modified: zope2.12/trunk/debian/patches/deb-zopeconf.patch
===================================================================
--- zope2.12/trunk/debian/patches/deb-zopeconf.patch	2010-11-24 16:22:24 UTC (rev 2145)
+++ zope2.12/trunk/debian/patches/deb-zopeconf.patch	2010-11-24 18:32:04 UTC (rev 2146)
@@ -6,7 +6,7 @@
 +
  ##############################################################################
  #
- # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+ # Copyright (c) 2002 Zope Foundation and Contributors.
 @@ -162,7 +164,7 @@
  
      copyskel(sourcedir, targetdir, uid, gid, **replacements)
@@ -88,7 +88,7 @@
 +
  ##############################################################################
  #
- # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+ # Copyright (c) 2002 Zope Foundation and Contributors.
 @@ -21,11 +23,16 @@
  -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
@@ -216,7 +216,7 @@
  
  # Directive: enable-product-installation
  #
-@@ -952,7 +955,7 @@
+@@ -964,7 +967,7 @@
  
  <http-server>
    # valid keys are "address" and "force-connection-close"
@@ -225,7 +225,7 @@
  
    # force-connection-close on
    #
-@@ -1053,7 +1056,7 @@
+@@ -1065,7 +1068,7 @@
  #   <zeoclient>
  #     # See .../ZODB/component.xml for directives (sectiontype
  #     # "zeoclient").

Modified: zope2.12/trunk/debian/patches/fix_lib_location.patch
===================================================================
--- zope2.12/trunk/debian/patches/fix_lib_location.patch	2010-11-24 16:22:24 UTC (rev 2145)
+++ zope2.12/trunk/debian/patches/fix_lib_location.patch	2010-11-24 18:32:04 UTC (rev 2146)
@@ -1,7 +1,7 @@
 Fixing the python path to the zope2.x legacy location.
 --- a/configure
 +++ b/configure
-@@ -55,8 +55,7 @@
+@@ -57,8 +57,7 @@
      python_version = '.'.join([str(i) for i in sys.version_info[:2]])
      python_str = 'python'
      prefixed_site_pkgs = os.path.join(prefix, 'lib',

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2010-11-24 16:22:24 UTC (rev 2145)
+++ zope2.12/trunk/debian/rules	2010-11-24 18:32:04 UTC (rev 2146)
@@ -10,10 +10,10 @@
 ZVER:=2.12
 ZOPE:=zope$(ZVER)
 DEBIAN:=$(CURDIR)/debian
-DEB_SATISFIED:=ClientForm:Docutils:mechanize:pytz:transaction:zc.lockfile:ZConfig:zdaemon:ZODB3:zope.authentication:zope.browser:zope.component:zope.configuration:zope.contenttype:zope.copy:zope.event:zope.exceptions:zope.hookable:zope.i18n:zope.i18nmessageid:zope.location:zope.proxy:zope.publisher:zope.schema:zope.security:zope.testbrowser:zope.testing:zope.traversing
+DEB_SATISFIED:=ClientForm:Docutils:mechanize:pip:pytz:transaction:zc.lockfile:ZConfig:zdaemon:ZODB3:zope.authentication:zope.browser:zope.component:zope.configuration:zope.contenttype:zope.copy:zope.event:zope.exceptions:zope.hookable:zope.i18n:zope.i18nmessageid:zope.location:zope.proxy:zope.publisher:zope.schema:zope.security:zope.testbrowser:zope.testing:zope.traversing
 
 SRC_VERSION:=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-PKGD_VERSION:=5
+PKGD_VERSION:=2
 SVN_TAG:=$(SRC_VERSION)-pkgd_$(PKGD_VERSION)
 SVN_HOME:=https://weblion.psu.edu/svn/weblion/weblion/hosting/zope2-tarball/tags