r2126 - in zope2.12/branches/with-revived-tarball/debian (16 files)
pumazi-guest at users.alioth.debian.org
pumazi-guest at users.alioth.debian.org
Tue Nov 9 17:03:26 UTC 2010
Date: Tuesday, November 9, 2010 @ 17:03:00
Author: pumazi-guest
Revision: 2126
Rewrote the rules file. Removed the patches for the time being. Updated the source format to 3.0 quilt.
Added:
zope2.12/branches/with-revived-tarball/debian/README.Debian
zope2.12/branches/with-revived-tarball/debian/dirs
zope2.12/branches/with-revived-tarball/debian/docs
zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1
zope2.12/branches/with-revived-tarball/debian/source/
zope2.12/branches/with-revived-tarball/debian/source/format
Modified:
zope2.12/branches/with-revived-tarball/debian/README.source
zope2.12/branches/with-revived-tarball/debian/changelog
zope2.12/branches/with-revived-tarball/debian/compat
zope2.12/branches/with-revived-tarball/debian/control
zope2.12/branches/with-revived-tarball/debian/patches/series
zope2.12/branches/with-revived-tarball/debian/pyversions
zope2.12/branches/with-revived-tarball/debian/rules
Deleted:
zope2.12/branches/with-revived-tarball/debian/patches/01_webdav.patch
zope2.12/branches/with-revived-tarball/debian/patches/02_deb-zopeconf.patch
zope2.12/branches/with-revived-tarball/debian/patches/03_makefile.patch
Added: zope2.12/branches/with-revived-tarball/debian/README.Debian
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/README.Debian (rev 0)
+++ zope2.12/branches/with-revived-tarball/debian/README.Debian 2010-11-09 17:03:00 UTC (rev 2126)
@@ -0,0 +1,6 @@
+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/branches/with-revived-tarball/debian/README.source
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/README.source 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/README.source 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1,2 +1,8 @@
+zope2.12 for Debian
+-------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
This package uses quilt for its patch management, see
/usr/share/doc/quilt/README.source if you are unfamiliar with it.
Modified: zope2.12/branches/with-revived-tarball/debian/changelog
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/changelog 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/changelog 2010-11-09 17:03:00 UTC (rev 2126)
@@ -4,8 +4,10 @@
* Adding python-pkg-resources and python-virtualenv as build
dependencies.
* Modified the watch file to point at the new tarball location.
+ * Rewrote the rules file to use the newest style debhelper with override
+ support.
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com> Sat, 09 Oct 2010 03:21:59 -0400
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com> Sun, 07 Nov 2010 05:17:31 -0500
zope2.12 (2.12.0-1) unstable; urgency=low
Modified: zope2.12/branches/with-revived-tarball/debian/compat
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/compat 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/compat 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1 +1 @@
-5
+7
Modified: zope2.12/branches/with-revived-tarball/debian/control
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/control 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/control 2010-11-09 17:03:00 UTC (rev 2126)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
Uploaders: Fabio Tranchitella <kobold at debian.org>, Jonas Meurer <mejo at debian.org>, Michael Mulich (pumazi) <michael.mulich at gmail.com>
-Build-Depends: debhelper (>= 6.0.0), python-support (>= 0.5.3), python2.6-dev, python2.6, python, python-setuptools, python-pkg-resources, python-virtualenv, zope-debhelper (>= 0.3.12), lsb-release, quilt (>= 0.40)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40), python-support, python, python-setuptools, python-pkg-resources, python-virtualenv, zope-debhelper (>= 0.3.12)
+Standards-Version: 3.9.1
XS-Python-Version: 2.6
Homepage: http://www.zope.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/branches/with-revived-tarball
@@ -13,7 +13,7 @@
Package: zope2.12
Architecture: any
Pre-Depends: zope-common (>= 0.5.49)
-Depends: python2.6, python-zope.traversing, python-zope.testbrowser, python-zope.testing, python-tz, python-docutils, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
+Depends: python, python-zope.traversing, python-zope.testbrowser, python-zope.testing, python-tz, python-docutils, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
Provides: zope
Suggests: python-unit, zope-book, zope-devguide
XB-Python-Version: 2.6
Added: zope2.12/branches/with-revived-tarball/debian/dirs
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/dirs (rev 0)
+++ zope2.12/branches/with-revived-tarball/debian/dirs 2010-11-09 17:03:00 UTC (rev 2126)
@@ -0,0 +1,3 @@
+usr/lib/zope2.12
+usr/lib/zope2.12/bin
+usr/lib/zope2.12/lib/python/site-packages
Added: zope2.12/branches/with-revived-tarball/debian/docs
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/docs (rev 0)
+++ zope2.12/branches/with-revived-tarball/debian/docs 2010-11-09 17:03:00 UTC (rev 2126)
@@ -0,0 +1,2 @@
+README
+version.txt
Deleted: zope2.12/branches/with-revived-tarball/debian/patches/01_webdav.patch
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/01_webdav.patch 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/patches/01_webdav.patch 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1,15 +0,0 @@
-## 01_webdav.patch
-##
-## Fix quoting for webdav resources
-
---- a/src/webdav/davcmds.py
-+++ b/src/webdav/davcmds.py
-@@ -173,7 +173,7 @@
- if dflag:
- ob._p_deactivate()
- elif hasattr(ob, '__dav_resource__'):
-- uri = urljoin(url, absattr(ob.getId()))
-+ uri = urljoin(url, quote(absattr(ob.getId())))
- depth = depth=='infinity' and depth or 0
- self.apply(ob, uri, depth, result, top=0)
- if dflag:
Deleted: zope2.12/branches/with-revived-tarball/debian/patches/02_deb-zopeconf.patch
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/02_deb-zopeconf.patch 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/patches/02_deb-zopeconf.patch 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1,239 +0,0 @@
-## 02_deb-zopeconf.patch
-## by Fabio Tranchitella <kobold at debian.org> and Jonas Meurer <mejo at debian.org>
-##
-## Debian specific configuration;
-
---- a/src/Zope2/utilities/skel/etc/zope.conf.in
-+++ b/src/Zope2/utilities/skel/etc/zope.conf.in
-@@ -23,6 +23,9 @@
- # ZConfig "defines" used for later textual substitution
-
- %define INSTANCE <<INSTANCE_HOME>>
-+%define HTTPPORT <<ZOPE_HTTPPORT>>
-+%define ZOPE_USER <<ZOPE_USER>>
-+%define ZEO_SERVER <<ZEO_SERVER>>
-
- # Directive: instancehome
- #
-@@ -146,6 +149,7 @@
- # Example:
- #
- # effective-user chrism
-+effective-user $ZOPE_USER
-
-
- # Directive: enable-product-installation
-@@ -952,7 +956,7 @@
-
- <http-server>
- # valid keys are "address" and "force-connection-close"
-- address 8080
-+ address $HTTPPORT
-
- # force-connection-close on
- #
-@@ -1061,7 +1065,7 @@
- # <zeoclient>
- # # See .../ZODB/component.xml for directives (sectiontype
- # # "zeoclient").
--# server localhost:8100
-+# server $ZEO_SERVER
- # storage 1
- # name zeostorage
- # var $INSTANCE/var
---- a/src/Zope2/utilities/copyzopeskel.py
-+++ b/src/ZOpe2/utilities/copyzopeskel.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/python2.6
-+
- ##############################################################################
- #
- # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-@@ -164,7 +164,7 @@
-
- copyskel(sourcedir, targetdir, uid, gid, **replacements)
-
--def copyskel(sourcedir, targetdir, uid, gid, **replacements):
-+def copyskel(sourcedir, targetdir, uid, gid, layout='zope', **replacements):
- """ This is an independent function because we'd like to
- import and call it from mkzopeinstance """
- # Create the top of the instance:
-@@ -176,13 +176,22 @@
- # with it.
- pwd = os.getcwd()
- os.chdir(sourcedir)
-- try:
-+ #try:
-+ if True:
- try:
- os.path.walk(os.curdir, copydir,
- (targetdir, replacements, uid, gid))
-+ if layout == 'fhs':
-+ movedir(os.path.join(targetdir, 'etc'),
-+ os.path.join('/etc/zope2.11', os.path.basename(targetdir)),
-+ uid, gid)
-+ movedir(os.path.join(targetdir, 'log'),
-+ os.path.join('/var/log/zope2.11', os.path.basename(targetdir)),
-+ uid, gid)
- finally:
- os.chdir(pwd)
-- except (IOError, OSError), msg:
-+ #except (IOError, OSError), msg:
-+ else:
- print >>sys.stderr, msg
- sys.exit(1)
-
-@@ -242,6 +251,39 @@
- if uid is not None:
- os.chown(dst, uid, gid)
-
-+def movedir(sourcedir, targetdir, uid, gid):
-+ try:
-+ os.makedirs(os.path.dirname(targetdir))
-+ if uid is not None:
-+ os.chown(os.path.dirname(targetdir), uid, gid)
-+ except:
-+ pass
-+ if not os.path.isdir(targetdir):
-+ shutil.move(sourcedir, targetdir)
-+ elif os.path.islink(sourcedir):
-+ return
-+ else:
-+ import glob
-+ for src in glob.glob(sourcedir + '/*') + glob.glob(targetdir + '/.*'):
-+ base = os.path.basename(src)
-+ target = os.path.join(targetdir, base)
-+ if os.path.exists(target):
-+ backup = target + '.old'
-+ if os.path.exists(backup):
-+ if os.path.isdir(backup):
-+ shutil.rmtree(backup, ignore_errors=True)
-+ else:
-+ os.unlink(backup)
-+ os.rename(target, backup)
-+ shutil.move(src, target)
-+ shutil.rmtree(sourcedir, ignore_errors=True)
-+ if uid is not None:
-+ os.chown(targetdir, uid, gid)
-+ for root, dirs, files in os.walk(targetdir):
-+ for name in files + dirs:
-+ os.chown(os.path.join(root, name), uid, gid)
-+ os.symlink(targetdir, sourcedir)
-+
- def usage(stream, msg=None):
- if msg:
- print >>stream, msg
---- a/src/Zope2/utilities/mkzopeinstance.py
-+++ b/src/Zope2/utilities/mkzopeinstance.py
-@@ -1,3 +1,5 @@
-+#!/usr/bin/python2.6
-+
- ##############################################################################
- #
- # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
-@@ -23,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
- -p/--python -- the Python interpreter to use
-+-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
-+--zeo-server HOST:PORT -- use a ZEO server instead of a local ZODB database
-
- When run without arguments, this script will ask for the information necessary
- to create a Zope instance home.
- """
-
-+import re
- import getopt
- import os
- import sys
-@@ -36,8 +41,8 @@
- def main():
- try:
- opts, args = getopt.getopt(sys.argv[1:],
-- "hu:d:s:p:",
-- ["help", "user=", "dir=", "skelsrc=", "python="]
-+ "hu:d:s:p:l:",
-+ ["help", "user=", "dir=", "skelsrc=", "python=", "layout=", "service-user=", "service-port=", "zeo-server="]
- )
- except getopt.GetoptError, msg:
- usage(sys.stderr, msg)
-@@ -49,6 +54,10 @@
- skeltarget = None
- skelsrc = None
- python = None
-+ layout = "zope"
-+ srvuser = "zope:zope"
-+ srvport = 9673
-+ zeoserver = None
-
- if check_buildout():
- python = os.path.abspath('bin/zopepy')
-@@ -80,6 +89,36 @@
- usage(sys.stderr, "user must be specified as name:password")
- sys.exit(2)
- user, password = arg.split(":", 1)
-+ if opt in ("--layout",):
-+ if not arg or arg not in ('fhs', 'zope'):
-+ usage(sys.stderr, "layout to use while copying the skeleton files (`fhs' or `zope')")
-+ sys.exit(2)
-+ layout = arg
-+ if opt in ("--service-user",):
-+ if not arg:
-+ usage(sys.stderr, "service user must not be empty")
-+ sys.exit(2)
-+ if not ":" in arg:
-+ usage(sys.stderr, "service user must be specified as user:group")
-+ sys.exit(2)
-+ srvuser = arg
-+ if opt in ("--service-port",):
-+ if not arg:
-+ usage(sys.stderr, "service port must not be empty")
-+ sys.exit(2)
-+ try:
-+ srvport = int(arg)
-+ except ValueError:
-+ usage(sys.stderr, "service port must be an integer")
-+ sys.exit(2)
-+ if opt in ("--zeo-server",):
-+ if not arg:
-+ usage(sys.stderr, "zeo server must not be empty")
-+ sys.exit(2)
-+ if not ":" in arg:
-+ usage(sys.stderr, "zeo server must be specified as host:port")
-+ sys.exit(2)
-+ zeoserver = arg
-
- if not skeltarget:
- # interactively ask for skeltarget and initial user name/passwd.
-@@ -130,12 +169,28 @@
- "PYTHONW":PYTHONW,
- "INSTANCE_HOME": instancehome,
- "ZOPE2PATH": zope2path,
-+ "ZOPE_USER": srvuser.split(":")[0],
-+ "ZOPE_HTTPPORT": str(srvport),
-+ "ZEO_SERVER": zeoserver or 'localhost:8100',
- }
-
-- copyzopeskel.copyskel(skelsrc, skeltarget, None, None, **kw)
-+ import pwd, grp
-+ uid = pwd.getpwnam(srvuser.split(":")[0])
-+ if uid: uid = uid[2]
-+ gid = grp.getgrnam(srvuser.split(":")[1])
-+ if gid: gid = gid[2]
-+
-+ copyzopeskel.copyskel(skelsrc, skeltarget, uid, gid, layout, **kw)
- if user and password:
- write_inituser(inituser, user, password)
-
-+ zope_conf = os.path.join(skeltarget, 'etc', 'zope.conf')
-+ re_zodb = re.compile('^# %s: ' % (zeoserver and 'ZEO' or 'ZODB')).sub
-+ output = []
-+ for r in open(zope_conf).readlines():
-+ output.append(re_zodb('', r))
-+ open(zope_conf, 'w').write(''.join(output))
-+
- def usage(stream, msg=None):
- if msg:
- print >>stream, msg
Deleted: zope2.12/branches/with-revived-tarball/debian/patches/03_makefile.patch
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/03_makefile.patch 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/patches/03_makefile.patch 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1,11 +0,0 @@
---- ./inst/Makefile.in~ 2009-09-04 04:23:30.000000000 +0000
-+++ ./inst/Makefile.in 2009-09-20 10:47:31.000000000 +0000
-@@ -56,7 +56,7 @@
- install: build version_txt
- ${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} install \
- --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
-- [ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
-+ [ -f ${ROOT}${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${ROOT}${PREFIX}/bin/python
- @echo
- @echo Zope binaries installed successfully.
- @echo Now run \'${PREFIX}/bin/mkzopeinstance.py\'
Added: zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1 (rev 0)
+++ zope2.12/branches/with-revived-tarball/debian/patches/debian-changes-2.12.10-1 2010-11-09 17:03:00 UTC (rev 2126)
@@ -0,0 +1,161 @@
+Description: Upstream changes introduced in version 2.12.10-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ zope2.12 (2.12.10-1) unstable; urgency=low
+ .
+ * Adding myself to the package Uploaders.
+ * Adding python-pkg-resources and python-virtualenv as build
+ dependencies.
+ * Modified the watch file to point at the new tarball location.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Michael Mulich (pumazi) <michael.mulich at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ zope2.12-2.12.10/Makefile
+@@ -0,0 +1,55 @@
++#!/usr/bin/make -f
++# -*- makefile -*-
++export PYTHON:=/usr/lib/zope2.12/bin/python
++export ZVER:=2.12
++export ZFULLVER:=$(ZVER).10
++export PIPVER:=0.8.1
++
++export DIST_DEST:=/usr/lib/zope2.12/lib/python2.6/site-packages
++export SCRIPT_DEST:=/usr/lib/zope2.12/bin
++export PTH_DEST:=/usr/lib/zope2.12/lib/python2.6/site-packages
++
++export PYTHONPATH:=
++DESTDIR:=
++# Exclusions are a colon separated list of distribution names.
++DIST_EXCLUSIONS:=
++
++# Change the following value to 1 to enable debug logging.
++export DEBUG:=0
++
++all: clean build
++ @echo Now run 'make install'
++
++clean:
++ -rm -rf ./build
++
++fetchclean:
++ @echo "Clear out the data that fetch downloaded. This is only useful for the tarball maintainer."
++ -rm -rf ./source/*
++
++pipfinder:
++ @export PYTHONPATH=$(shell ${PYTHON} ./scripts/_pip_dependency.py ${PIPVER})
++
++prep: pipfinder
++ @echo "Preparing the environment for the build..."
++ @$(PYTHON) ./scripts/prep.py
++
++build: prep
++ @echo "Building Zope2..."
++ @$(PYTHON) ./scripts/build.py \
++ --exclude ${DIST_EXCLUSIONS} \
++ --final-dir ${DIST_DEST}
++ @echo "Now run 'make install'"
++
++install:
++ @$(PYTHON) scripts/install.py \
++ --dists-dest ${DESTDIR}${DIST_DEST} \
++ --scripts-dest ${DESTDIR}${SCRIPT_DEST} \
++ --pth-dest ${DESTDIR}${PTH_DEST}
++
++fetch:
++ @echo "Fetching the source tarballs..."
++ @echo "Caution: This rule is only useful for the tarball maintainer."
++ @$(PYTHON) scripts/fetch.py
++
++.PHONY: all pack build install clean fetch fetchclean
+\ No newline at end of file
+--- /dev/null
++++ zope2.12-2.12.10/test
+@@ -0,0 +1,47 @@
++#!/bin/bash
++# -*- coding: utf-8 -*-
++# ---
++# A set of tests that are not very accurate, but serve there purpose.
++# These test have been created mostly so that I don't have to retype the test
++# case each and every time. :)
++#
++# Author: Michael Mulich
++# Copyright: 2010 by Penn State University
++# Organization: WebLion Group, Penn State University
++# License: GPL, see LICENSE for more detail
++# ---
++
++if [ -d testcase-env ]; then
++ rm -rf testcase-env
++fi
++
++ENV=testcase-env
++
++virtualenv --no-site-packages --distribute ${ENV}
++
++./configure --with-python ./${ENV}/bin/python
++make
++if [ ! $? -eq 0 ]; then
++ echo "Failed during while building."
++ exit 1
++fi
++
++make install
++if [ ! $? -eq 0 ]; then
++ echo "Failed during the install."
++ exit 2
++fi
++
++if [ ! -f ./${ENV}/bin/mkzopeinstance ]; then
++ echo "Can't find the mkzopeinstance script."
++ exit 3
++fi
++
++./${ENV}/bin/mkzopeinstance --help
++if [ ! $? -eq 0 ]; then
++ echo "Failed when attempting to call one of the generated scripts."
++ exit 5
++fi
++
++echo "The testcase was successful"
++exit 0
+\ No newline at end of file
+--- zope2.12-2.12.10.orig/configuration/buildout.cfg
++++ zope2.12-2.12.10/configuration/buildout.cfg
+@@ -10,11 +10,11 @@ dists = Zope2
+ # Exclude Setuptools, because it is a prerequisite of the build
+ exclude-dists =
+ distribute
+-dists-location = /home/mrm41/z2tar/testcase-env/lib/python2.6/site-packages
+-scripts-location = /home/mrm41/z2tar/testcase-env/bin
+-pth-location = /home/mrm41/z2tar/testcase-env/lib/python2.6/site-packages
++dists-location = /usr/lib/zope2.12/lib/python2.6/site-packages
++scripts-location = /usr/lib/zope2.12/bin
++pth-location = /usr/lib/zope2.12/lib/python2.6/site-packages
+ # Do we really need this if we are adjusting the path in rules build anyhow?
+-executable = /home/mrm41/z2tar/testcase-env/bin/python
++executable = python
+ # We definitely want to stage it locally, because the installation process
+ # takes care of putting the "stuff" in it's final location.
+ exclude-own-pth = true
+--- zope2.12-2.12.10.orig/source/docutils/extras/docutils.egg-info/top_level.txt
++++ zope2.12-2.12.10/source/docutils/extras/docutils.egg-info/top_level.txt
+@@ -1,2 +1 @@
+ docutils
+-roman
Modified: zope2.12/branches/with-revived-tarball/debian/patches/series
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/patches/series 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/patches/series 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1,3 +1 @@
-01_webdav.patch
-02_deb-zopeconf.patch
-03_makefile.patch
+debian-changes-2.12.10-1
Modified: zope2.12/branches/with-revived-tarball/debian/pyversions
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/pyversions 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/pyversions 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1 +1 @@
-2.6
+2.6-
Modified: zope2.12/branches/with-revived-tarball/debian/rules
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/rules 2010-11-03 15:46:10 UTC (rev 2125)
+++ zope2.12/branches/with-revived-tarball/debian/rules 2010-11-09 17:03:00 UTC (rev 2126)
@@ -1,202 +1,26 @@
#!/usr/bin/make -f
# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+ZVER:=2.12
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+ dh $@
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+override_dh_auto_configure:
+ ./configure --prefix=/usr/lib/zope${ZVER}
-CFLAGS = -Wall -g
+override_dh_auto_build:
+ make PYTHON=python
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-# disable parallel building for now, as the package builds fast enough
-# ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# MAKEFLAGS += -j$(NUMJOBS)
-# endif
+override_dh_auto_install:
+ make install PYTHON=python DESTDIR=$(CURDIR)/debian/zope${ZVER}
-# Include quilt stuff.
-include /usr/share/quilt/quilt.make
-
-include /usr/share/python/python.mk
-
-ZVER := 2.12
-ZOPE := zope$(ZVER)
-PACKAGE := zope$(ZVER)
-DEBIAN := $(CURDIR)/debian/$(PACKAGE)
-PYTHONVER := 2.6
-PYTHONBIN := /usr/bin/python$(PYTHONVER)
-
-distribution := $(shell lsb_release -is)
-
-clean: unpatch
- dh_testdir
- dh_testroot
- if test -f makefile; then $(MAKE) clean; fi
- for f in debian/*.in; do \
- generated=`echo $$f | sed 's,.in$$,,;s,ZVER,$(ZVER),'`; \
- rm -f $$generated $$generated.tmp; \
- done
- rm -rf build
- find -name '*.py[co]' | xargs -r rm -f
- dh_clean configure-stamp build-indep-stamp build-arch-stamp
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
- CFLAGS="$(CFLAGS)" ./configure $(confflags) \
- --prefix=/usr/lib/$(ZOPE) \
- --with-python=$(PYTHONBIN)
- touch $@
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
- dh_testdir
- $(MAKE) BUILD_FLAGS=
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:
- dh_testdir
- touch $@
-
-install: install-indep install-arch
-
-install-indep: build-arch-stamp
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
- dh_installdocs -i
- dh_install -i
-ifeq ($(distribution),Ubuntu)
- mv debian/zope$(ZVER)-sandbox/usr/share/doc/zope$(ZVER)-sandbox/README.Debian \
- debian/zope$(ZVER)-sandbox/usr/share/doc/zope$(ZVER)-sandbox/README.Ubuntu
-endif
-
-install-arch: build-indep-stamp
- dh_testdir
- dh_testroot
- dh_prep -s
- for f in debian/*.in; do \
- generated=`echo $$f | sed 's,.in$$,,;s,ZVER,$(ZVER),'`; \
- sed 's, at ZVER@,$(ZVER),g' $$f > $$generated.tmp; \
- if cmp --quiet "$$generated" "$$generated.tmp"; then \
- rm -f $$generated.tmp; \
- else \
- mv -f $$generated.tmp $$generated; \
- fi; \
- done
- dh_installdirs -s
-
- # Install Zope and remove *.pyc
- mkdir -p lib/python/Zope2
- $(MAKE) install BUILD_FLAGS= INSTALL_FLAGS=--root=$(DEBIAN) ROOT=$(DEBIAN)
-
- find $(DEBIAN) -name '*.py[co]' | xargs -r rm -f
-
- # Add private directory to sys.path
- sed -i 's|^import sys$$|import sys; sys.path.insert(sys.path.index("$(call py_libdir,$(PYTHONVER))"),"/usr/lib/$(ZOPE)/lib/python")|' $$(find $(DEBIAN)/usr/lib/$(ZOPE)/bin -type f ! -type l)
-
- # FHS enforcement
- mkdir -p $(DEBIAN)/usr/sbin \
- $(DEBIAN)/etc/$(ZOPE) \
- $(DEBIAN)/var/log/$(ZOPE) \
- $(DEBIAN)/var/lib/$(ZOPE)/instance \
- $(DEBIAN)/var/lib/$(ZOPE)/zeo \
- $(DEBIAN)/usr/lib/$(ZOPE)/lib
-
- echo "Zope$(ZVER) logs placeholder" > $(DEBIAN)/var/log/$(ZOPE)/.placeholder
-
- # Fix python interpreter where needed
- for i in `find $(DEBIAN) -type f`; do \
- if sed '1s,#!.*python[^ ]*\(.*\),#!$(PYTHONBIN)\1,' \
- $$i > $$i~ ; then \
- if cmp --quiet $$i $$i~ ; then \
- rm -f $$i~ ; \
- else \
- mv -f $$i~ $$i; \
- chmod 755 $$i; \
- echo "fixed interpreter: $$i"; \
- fi; else rm -f $$i~ ; fi ; \
- done
-
- # Remove zope documentation, as it is redundant
- rm -fr $(DEBIAN)/usr/lib/$(ZOPE)/doc
-
- # Fix permissions for files
- chmod 755 \
- $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZPublisher/Client.py \
- $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZPublisher/Test.py
-
- find $(DEBIAN)/usr/lib/$(ZOPE)/lib/python -type f -a \
- \( -name \*.gif -o -name \*.html -o -name \*.dtml -o -name \*.txt -o -name \*.bat -o -name \*.jpg \) -exec chmod 644 {} \;
-
- chmod 644 $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Zope2/utilities/reindex_catalog.py
-
- # Lintian overrides (images in /usr/lib)
- mkdir -p -m 0755 $(DEBIAN)/usr/share/lintian/overrides
- install -m 0644 debian/$(ZOPE).lintian-overrides \
- $(DEBIAN)/usr/share/lintian/overrides/$(ZOPE)
-
- # use python-tz instead of shipping it
- rm -fr $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/pytz
-
- # fix some of the lintian warnings
- rmdir $(DEBIAN)/usr/sbin
-
- dh_installdocs -p$(ZOPE) README.txt
- dh_installexamples -p$(ZOPE) src/Products/PageTemplates/examples/*
- dh_pysupport -p$(ZOPE) -V $(PYTHONVER) /usr/lib/$(ZOPE)
-
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs -k doc/CHANGES.rst
- dh_installdocs -X INSTALL.rst -X Makefile doc/*
- dh_installdocs
- dh_installlogrotate
- dh_installdebconf
- dh_installinit
- dh_installman
- dh_link
- dh_strip
- dh_compress -X.zexp
- dh_fixperms
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: configure build clean install install-indep install-arch binary-common binary-indep binary-arch binary patch unpatch
+.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_install
\ No newline at end of file
Added: zope2.12/branches/with-revived-tarball/debian/source/format
===================================================================
--- zope2.12/branches/with-revived-tarball/debian/source/format (rev 0)
+++ zope2.12/branches/with-revived-tarball/debian/source/format 2010-11-09 17:03:00 UTC (rev 2126)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-zope-developers
mailing list