r2126 - in zope2.12/branches/with-revived-tarball/debian (16 files)

Fri Nov 12 18:03:38 UTC 2010

Hey Michael,

First, the changes you commit to svn look very promising!

Today I took a look at the with-revived-tarball branch, and noted that
something must be wrong with the build process. dpkg-source adds a patch
to debian/patches at build time. I guess this is due to differences
between the original tarball at ../tarballs/zope2.12_2.12.0.orig.tar.gz
and the build environment you build from.
maybe the reason is that you don't update the tarball while you modify
the source files in your build directory, from where you start
dpkg-buildpackage.

I'm not sure what causes this patch. But this event indicates, that
something wents wrong.

greetings,
 jonas

On 09/11/2010 pumazi-guest at users.alioth.debian.org wrote:
> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-zope-developers/attachments/20101112/0ceb0813/attachment.pgp>