[med-svn] r1531 - trunk/packages/netepi-analysis/trunk/debian
varun at alioth.debian.org
varun at alioth.debian.org
Fri Mar 7 07:20:20 UTC 2008
Author: varun
Date: 2008-03-07 07:20:19 +0000 (Fri, 07 Mar 2008)
New Revision: 1531
Added:
trunk/packages/netepi-analysis/trunk/debian/docs
trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.examples
trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.install
Removed:
trunk/packages/netepi-analysis/trunk/debian/python-distutils.mk
Modified:
trunk/packages/netepi-analysis/trunk/debian/
trunk/packages/netepi-analysis/trunk/debian/compat
trunk/packages/netepi-analysis/trunk/debian/control
trunk/packages/netepi-analysis/trunk/debian/rules
trunk/packages/netepi-analysis/trunk/debian/watch
Log:
* Cleanup the package
* Builds and installs now
Property changes on: trunk/packages/netepi-analysis/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/packages/netepi-analysis/trunk/debian/compat
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/compat 2008-03-07 05:36:56 UTC (rev 1530)
+++ trunk/packages/netepi-analysis/trunk/debian/compat 2008-03-07 07:20:19 UTC (rev 1531)
@@ -1 +1 @@
-4
+6
Modified: trunk/packages/netepi-analysis/trunk/debian/control
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/control 2008-03-07 05:36:56 UTC (rev 1530)
+++ trunk/packages/netepi-analysis/trunk/debian/control 2008-03-07 07:20:19 UTC (rev 1531)
@@ -2,56 +2,64 @@
Section: science
Priority: optional
Maintainer: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 4.0.0), cdbs (>= 0.4.30), python-numeric-ext
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 6), cdbs (>= 0.4.30), python-numeric-ext,
+ python2.4-dev, python-central
+Build-Depends-Indep: python-egenix-mxdatetime
+Standards-Version: 3.7.3
+XS-Python-Version: current
+Homepage: http://www.netepi.org/
+Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/netepi-analysis/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/netepi-analysis/trunk/?rev=0&sc=0
Package: netepi-analysis
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-numeric, python-egenix-mxdatetime, python-bsddb3, r-base, python-rpy, xvfb, yapps2
+Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-numeric,
+ python-egenix-mxdatetime, python-bsddb3, r-base, python-rpy, xvfb,
+ yapps2
Recommends: python-psyco
Description: network-enabled tools for epidemiology and public health practice
- NetEpi, which is short for "Network-enabled Epidemiology", is a collaborative
- project to create a suite of free, open source software tools for epidemiology
- and public health practice. Anyone with an interest in population health
- epidemiology or public health informatics is encouraged to examine the prototype
- tools and to consider contributing to their further development. Contributions
- which involve formal and/or informal testing of the tools in a wide range of
- circumstances and environments are particularly welcome, as is assistance with
- design, programming and documentation tasks.
+ NetEpi, which is short for "Network-enabled Epidemiology", is a
+ collaborative project to create a suite of free, open source software
+ tools for epidemiology and public health practice. Anyone with an
+ interest in population health epidemiology or public health
+ informatics is encouraged to examine the prototype tools and to
+ consider contributing to their further development. Contributions
+ which involve formal and/or informal testing of the tools in a wide
+ range of circumstances and environments are particularly welcome, as
+ is assistance with design, programming and documentation tasks.
.
- This is a tool for conducting epidemiological analysis of data sets, both large
- and small, either through a Web browser interface, or via a programmatic
- interface. In many respects it is similar to the analysis facilities included
- in the Epi Info suite, except that NetEpi Analysis is designed to be installed
- on servers and accessed remotely via Web browsers, although it can also be
- installed on individual desktop or laptop computers.
+ This is a tool for conducting epidemiological analysis of data sets,
+ both large and small, either through a Web browser interface, or via
+ a programmatic interface. In many respects it is similar to the
+ analysis facilities included in the Epi Info suite, except that
+ NetEpi Analysis is designed to be installed on servers and accessed
+ remotely via Web browsers, although it can also be installed on
+ individual desktop or laptop computers.
.
The software was developed by New South Wales Department of Health.
- .
- Homepage: http://www.netepi.org/
Package: netepi-analysis-web
Architecture: all
Depends: netepi-analysis, python-albatross
Description: network-enabled tools for epidemiology and public health practice
- NetEpi, which is short for "Network-enabled Epidemiology", is a collaborative
- project to create a suite of free, open source software tools for epidemiology
- and public health practice. Anyone with an interest in population health
- epidemiology or public health informatics is encouraged to examine the prototype
- tools and to consider contributing to their further development. Contributions
- which involve formal and/or informal testing of the tools in a wide range of
- circumstances and environments are particularly welcome, as is assistance with
- design, programming and documentation tasks.
+ NetEpi, which is short for "Network-enabled Epidemiology", is a
+ collaborative project to create a suite of free, open source software
+ tools for epidemiology and public health practice. Anyone with an
+ interest in population health epidemiology or public health
+ informatics is encouraged to examine the prototype tools and to
+ consider contributing to their further development. Contributions
+ which involve formal and/or informal testing of the tools in a wide
+ range of circumstances and environments are particularly welcome, as
+ is assistance with design, programming and documentation tasks.
.
- This is a tool for conducting epidemiological analysis of data sets, both large
- and small, either through a Web browser interface, or via a programmatic
- interface. In many respects it is similar to the analysis facilities included
- in the Epi Info suite, except that NetEpi Analysis is designed to be installed
- on servers and accessed remotely via Web browsers, although it can also be
- installed on individual desktop or laptop computers.
+ This is a tool for conducting epidemiological analysis of data sets,
+ both large and small, either through a Web browser interface, or via
+ a programmatic interface. In many respects it is similar to the
+ analysis facilities included in the Epi Info suite, except that
+ NetEpi Analysis is designed to be installed on servers and accessed
+ remotely via Web browsers, although it can also be installed on
+ individual desktop or laptop computers.
.
The software was developed by New South Wales Department of Health.
.
- Homepage: http://www.netepi.org/
- .
This package contains the web interface to NetEpi Analysis
Added: trunk/packages/netepi-analysis/trunk/debian/docs
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/docs (rev 0)
+++ trunk/packages/netepi-analysis/trunk/debian/docs 2008-03-07 07:20:19 UTC (rev 1531)
@@ -0,0 +1,2 @@
+docs/README.searchabletext
+README
Added: trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.examples
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.examples (rev 0)
+++ trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.examples 2008-03-07 07:20:19 UTC (rev 1531)
@@ -0,0 +1 @@
+demo
Added: trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.install
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.install (rev 0)
+++ trunk/packages/netepi-analysis/trunk/debian/netepi-analysis.install 2008-03-07 07:20:19 UTC (rev 1531)
@@ -0,0 +1 @@
+debian/tmp/*
Deleted: trunk/packages/netepi-analysis/trunk/debian/python-distutils.mk
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/python-distutils.mk 2008-03-07 05:36:56 UTC (rev 1530)
+++ trunk/packages/netepi-analysis/trunk/debian/python-distutils.mk 2008-03-07 07:20:19 UTC (rev 1531)
@@ -1,90 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters at debian.org>
-# Description: configure, compile, binary, and clean Python libraries and programs
-# This class works for Python packages which use the Python
-# "distutils". Note that optionally it can also use the
-# dh_python program which does some nice stuff. See
-# the manual page for that program for more information.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils := 1
-
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-DEB_PYTHON_COMPILE_VERSION =
-
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4
-
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-
-# make: *** No rule to make target `voodoo'. Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES := $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(DEB_ALL_PACKAGES)))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES := $(strip $(filter python-%,$(DEB_ALL_PACKAGES)))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst install/python%,%,$@)))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- echo "DEBUG: common-build-impl on $(DEB_BUILD_ARCH)"
- cd $(DEB_SRCDIR)/soomext && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
- if [ "$(DEB_BUILD_ARCH)" = "i386" ] ; then \
- ln -s lib.linux-i686-$(DEB_PYTHON_COMPILE_VERSION) soomext/build/lib.linux-$(DEB_BUILD_ARCH)-$(DEB_PYTHON_COMPILE_VERSION) ; \
- fi
- echo "DEBUG: now normal common-build-impl"
- cd $(DEB_SRCDIR) && PYTHONPATH=soomext/build/lib.linux-$(DEB_BUILD_ARCH)-$(DEB_PYTHON_COMPILE_VERSION) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-clean::
-# Ignore errors from this rule. In a tarball build, the file
-# may not exist.
- -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
- cd $(DEB_SRCDIR) && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && /usr/bin/python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && python $(DEB_PYTHON_SETUP_CMD) install --root="debian/$(cdbs_curpkg)" $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- dh_python -p$(cdbs_curpkg)
-endif
-
-endif
Modified: trunk/packages/netepi-analysis/trunk/debian/rules
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/rules 2008-03-07 05:36:56 UTC (rev 1530)
+++ trunk/packages/netepi-analysis/trunk/debian/rules 2008-03-07 07:20:19 UTC (rev 1531)
@@ -1,19 +1,23 @@
#!/usr/bin/make -f
+DEB_PYTHON_SYSTEM:= pycentral
+
include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# include /usr/share/cdbs/1/class/python-distutils.mk
-include debian/python-distutils.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
-DEB_PYTHON_COMPILE_VERSION = 2.3
+# Add soomext build dir to PYTHONPATH; required for building other modules.
+export PYTHONPATH=$(CURDIR)/soomext/build/build-modules/
-# Workaround for #252134
clean::
- python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) || rm -f SOOMv0/*.pyc
- rm -rf soomext/build
+ $(RM) -r soomext/build
-# first build soomext
-common-install-impl::
- echo common-install-impl
- cd $(DEB_SRCDIR)/soomext && /usr/bin/python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)
+makebuilddir::
+ (cd soomext; \
+ python setup.py build --build-platlib build/build-modules; \
+ python setup.py install --root=debian/netepi-analysis/)
+install/netepi-analysis-web::
+ (cd web; python install.py install_prefix=$(CURDIR)/debian/netepi-analysis-web)
+
+get-orig-source:
+ -uscan --upstream-version 0 --rename
Modified: trunk/packages/netepi-analysis/trunk/debian/watch
===================================================================
--- trunk/packages/netepi-analysis/trunk/debian/watch 2008-03-07 05:36:56 UTC (rev 1530)
+++ trunk/packages/netepi-analysis/trunk/debian/watch 2008-03-07 07:20:19 UTC (rev 1531)
@@ -5,5 +5,4 @@
## direct scan works as well
# http://heanet.dl.sourceforge.net/sourceforge/netepi NetEpi-Analysis-(.*)\.tar\.gz
-# http://heanet.dl.sourceforge.net/sourceforge/netepi/NetEpi-Analysis-(.*)\.tar\.gz
-
+# http://heanet.dl.sourceforge.net/sourceforge/netepi/NetEpi-Analysis-(.*)\.tar\.gz
More information about the debian-med-commit
mailing list