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

pumazi-guest at users.alioth.debian.org pumazi-guest at users.alioth.debian.org
Sun Nov 14 00:21:46 UTC 2010


    Date: Sunday, November 14, 2010 @ 00:21:38
  Author: pumazi-guest
Revision: 2138

Adding python-dev and python-pip to the build dependencies. Removing the debian-changes-* patch.

Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/control
  zope2.12/trunk/debian/patches/series
Deleted:
  zope2.12/trunk/debian/patches/debian-changes-2.12.10-1

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2010-11-12 18:31:13 UTC (rev 2137)
+++ zope2.12/trunk/debian/changelog	2010-11-14 00:21:38 UTC (rev 2138)
@@ -1,7 +1,7 @@
 zope2.12 (2.12.10-1) unstable; urgency=low
 
   * Adding myself to the package Uploaders.
-  * Adding python-pkg-resources as a build dependency.
+  * Adding python-pkg-resources as a dependency.
   * Modified the watch file to point at the new tarball location.
   * Rewrote the rules file to use the newest style debhelper with override
     support.
@@ -16,8 +16,9 @@
     python-zope.security
   * Adding python-profiler as a suggested package, since a Zope2
     ZPublisher test module uses the profiler.
+  * Adding python-pip as a build dependency.
 
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 01:57:23 -0500
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 10:49:36 -0500
 
 zope2.12 (2.12.0-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2010-11-12 18:31:13 UTC (rev 2137)
+++ zope2.12/trunk/debian/control	2010-11-14 00:21:38 UTC (rev 2138)
@@ -3,7 +3,7 @@
 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 (>= 7.0.50~), quilt (>= 0.40), python-support, python, python-setuptools, python-pkg-resources, zope-debhelper (>= 0.3.12)
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40), python, python-dev, python-support, python-setuptools, python-pkg-resources, python-pip, zope-debhelper (>= 0.3.12)
 Standards-Version: 3.9.1
 Homepage: http://www.zope.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/branches/with-revived-tarball

Deleted: zope2.12/trunk/debian/patches/debian-changes-2.12.10-1
===================================================================
--- zope2.12/trunk/debian/patches/debian-changes-2.12.10-1	2010-11-12 18:31:13 UTC (rev 2137)
+++ zope2.12/trunk/debian/patches/debian-changes-2.12.10-1	2010-11-14 00:21:38 UTC (rev 2138)
@@ -1,151 +0,0 @@
-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.
-   * Rewrote the rules file to use the newest style debhelper with override
-     support.
-   * Added the following package dependencies: python-clientform,
-     python-mechanize, python-transaction, python-zconfig, python-zdaemon,
-     python-zodb, python-zope.authentication, python-zope.browser,
-     python-zope.component, python-zope.component-zcml,
-     python-zope.configuration, python-zope.contenttype, python-zope.copy,
-     python-zope.event, python-zope.exceptions, python-zope.hookable,
-     python-zope.i18n, python-zope.i18nmessageid, python-zope.location,
-     python-zope.proxy, python-zope.publisher, python-zope.schema,
-     python-zope.security
-   * Adding python-profiler as a suggested package, since a Zope2
-     ZPublisher test module uses the profiler.
- .
- 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/python
-+export SCRIPT_DEST:=/usr/lib/zope2.12/bin
-+export PTH_DEST:=/usr/lib/zope2.12/lib/python
-+
-+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

Modified: zope2.12/trunk/debian/patches/series
===================================================================
--- zope2.12/trunk/debian/patches/series	2010-11-12 18:31:13 UTC (rev 2137)
+++ zope2.12/trunk/debian/patches/series	2010-11-14 00:21:38 UTC (rev 2138)
@@ -1,4 +1,3 @@
-debian-changes-2.12.10-1
 webdav.patch
 deb-zopeconf.patch
 zodb-script-fix.patch




More information about the pkg-zope-developers mailing list