r2144 - in zope2.12/trunk/debian (5 files)

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

    Date: Tuesday, November 16, 2010 @ 15:19:33
  Author: pumazi-guest
Revision: 2144

Bumping the tarball source tag version. Also updating the patches and removing the README.Debian dh_make generated file.

Modified:
  zope2.12/trunk/debian/patches/deb-zopeconf.patch
  zope2.12/trunk/debian/patches/fix_lib_location.patch
  zope2.12/trunk/debian/patches/series
  zope2.12/trunk/debian/rules
Deleted:
  zope2.12/trunk/debian/README.Debian

Deleted: zope2.12/trunk/debian/README.Debian
===================================================================
--- zope2.12/trunk/debian/README.Debian	2010-11-15 01:16:55 UTC (rev 2143)
+++ zope2.12/trunk/debian/README.Debian	2010-11-16 15:19:33 UTC (rev 2144)
@@ -1,6 +0,0 @@
-zope2.12 for Debian
--------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Sun, 07 Nov 2010 03:05:06 -0500

Modified: zope2.12/trunk/debian/patches/deb-zopeconf.patch
===================================================================
--- zope2.12/trunk/debian/patches/deb-zopeconf.patch	2010-11-15 01:16:55 UTC (rev 2143)
+++ zope2.12/trunk/debian/patches/deb-zopeconf.patch	2010-11-16 15:19:33 UTC (rev 2144)
@@ -6,7 +6,7 @@
 +
  ##############################################################################
  #
- # Copyright (c) 2002 Zope Foundation and Contributors.
+ # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 @@ -162,7 +164,7 @@
  
      copyskel(sourcedir, targetdir, uid, gid, **replacements)
@@ -88,7 +88,7 @@
 +
  ##############################################################################
  #
- # Copyright (c) 2002 Zope Foundation and Contributors.
+ # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 @@ -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
  #
-@@ -964,7 +967,7 @@
+@@ -952,7 +955,7 @@
  
  <http-server>
    # valid keys are "address" and "force-connection-close"
@@ -225,7 +225,7 @@
  
    # force-connection-close on
    #
-@@ -1065,7 +1068,7 @@
+@@ -1053,7 +1056,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-15 01:16:55 UTC (rev 2143)
+++ zope2.12/trunk/debian/patches/fix_lib_location.patch	2010-11-16 15:19:33 UTC (rev 2144)
@@ -1,7 +1,7 @@
 Fixing the python path to the zope2.x legacy location.
 --- a/configure
 +++ b/configure
-@@ -51,8 +51,7 @@
+@@ -55,8 +55,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/patches/series
===================================================================
--- zope2.12/trunk/debian/patches/series	2010-11-15 01:16:55 UTC (rev 2143)
+++ zope2.12/trunk/debian/patches/series	2010-11-16 15:19:33 UTC (rev 2144)
@@ -1,5 +1,4 @@
 remove_documenttemplate_release_script.patch
 webdav.patch
 deb-zopeconf.patch
-zodb-script-fix.patch
 fix_lib_location.patch

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2010-11-15 01:16:55 UTC (rev 2143)
+++ zope2.12/trunk/debian/rules	2010-11-16 15:19:33 UTC (rev 2144)
@@ -13,7 +13,7 @@
 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
 
 SRC_VERSION:=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
-PKGD_VERSION:=4
+PKGD_VERSION:=5
 SVN_TAG:=$(SRC_VERSION)-pkgd_$(PKGD_VERSION)
 SVN_HOME:=https://weblion.psu.edu/svn/weblion/weblion/hosting/zope2-tarball/tags
 
@@ -32,7 +32,7 @@
 
 get-orig-source:
 	svn export $(SVN_HOME)/$(SVN_TAG)
-	cd $(SVN_TAG); ./configure && make fetch DEBUG=$(DH_VERBOSE) && make clean && make distclean
+	cd $(SVN_TAG); ./configure && make fetch DIST_SINGLE_EXCLUSIONS=$(DEB_SATISFIED) DEBUG=$(DH_VERBOSE) && make clean && make distclean
 	tar czf $(CURDIR)/../$(TARBALL) $(SVN_TAG)
 	rm -rf $(CURDIR)/$(SVN_TAG)