diff options
author | jim <jim@38b22f21-9aea-0310-abfc-843a9883df58> | 2009-05-06 03:35:31 (GMT) |
---|---|---|
committer | jim <jim@38b22f21-9aea-0310-abfc-843a9883df58> | 2009-05-06 03:35:31 (GMT) |
commit | f2fab5e86d2c149ac729ae10239f2570750c687d (patch) | |
tree | 97e5f8e18ad17e8e3e854807d2130c45c2666c60 | |
parent | 81176f70f3cc4c699aff7c166a535bfec8ccfca2 (diff) |
change Debian/Ubuntu package name to exe from python-exe
make the new policy build files the default, using python-support
git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@3592 38b22f21-9aea-0310-abfc-843a9883df58
-rw-r--r-- | installs/debian/ubuntu/debian/control | 31 | ||||
-rw-r--r-- | installs/debian/ubuntu/debian/control.new-policy | 20 | ||||
-rw-r--r-- | installs/debian/ubuntu/debian/control.old | 35 | ||||
-rw-r--r-- | installs/debian/ubuntu/debian/exe.1 | 48 | ||||
-rw-r--r-- | installs/debian/ubuntu/debian/python-exe.1 | 47 | ||||
-rwxr-xr-x | installs/debian/ubuntu/debian/rules | 132 | ||||
-rwxr-xr-x | installs/debian/ubuntu/debian/rules.new-policy | 63 | ||||
-rwxr-xr-x | installs/debian/ubuntu/debian/rules.old | 149 | ||||
-rw-r--r-- | installs/debian/ubuntu/debian/run-exe.sh.1 | 2 | ||||
-rwxr-xr-x | installs/debian/ubuntu/make.py | 8 |
10 files changed, 269 insertions, 266 deletions
diff --git a/installs/debian/ubuntu/debian/control b/installs/debian/ubuntu/debian/control index 0e989c6..fb641fa 100644 --- a/installs/debian/ubuntu/debian/control +++ b/installs/debian/ubuntu/debian/control @@ -1,35 +1,20 @@ -Source: python-exe +Source: exe Maintainer: Jim Tittsler <jim@eXeLearning.org> Section: python -XS-Python-Version: all Priority: optional Standards-Version: 3.6.1 -Build-Depends-Indep: debhelper (>= 4.1.67), python-all-dev +Build-Depends-Indep: debhelper (>= 5.0.38), python-support (>0.5.3), python-all-dev (>= 2.4) +XS-Python-Version: all, >=2.4 -Package: python-exe +Package: exe Architecture: i386 Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging +Conflicts: python2.3-exe, python2.4-exe, python2.5-exe +Replaces: python2.3-exe, python2.4-exe, python2.5-exe +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} Description: eLearning XHTML editor [dummy package] The eXe project is an authoring environment to enable teachers to publish web content without the need to become proficient in HTML or XML markup. Content generated using eXe can be used by any Learning Management System. - . - This package is an empty dummy package that always depends on a package - built for Debian's default Python version. - -Package: python2.4-exe -Architecture: i386 -Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging -Description: eLearning XHTML editor - The eXe project is an authoring environment to enable teachers to publish - web content without the need to become proficient in HTML or XML markup. - Content generated using eXe can be used by any Learning Management System. - -Package: python2.5-exe -Architecture: i386 -Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging -Description: eLearning XHTML editor - The eXe project is an authoring environment to enable teachers to publish - web content without the need to become proficient in HTML or XML markup. - Content generated using eXe can be used by any Learning Management System. diff --git a/installs/debian/ubuntu/debian/control.new-policy b/installs/debian/ubuntu/debian/control.new-policy deleted file mode 100644 index 786744d..0000000 --- a/installs/debian/ubuntu/debian/control.new-policy +++ /dev/null @@ -1,20 +0,0 @@ -Source: python-exe -Maintainer: Jim Tittsler <jim@eXeLearning.org> -Section: python -Priority: optional -Standards-Version: 3.6.1 -Build-Depends-Indep: debhelper (>= 5.0.38), python-support (>0.5.3), python-all-dev (>= 2.4) -XS-Python-Version: all, >=2.4 - -Package: python-exe -Architecture: i386 -Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging -Conflicts: python2.3-exe, python2.4-exe, python2.5-exe -Replaces: python2.3-exe, python2.4-exe, python2.5-exe -Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} -Description: eLearning XHTML editor [dummy package] - The eXe project is an authoring environment to enable teachers to publish - web content without the need to become proficient in HTML or XML markup. - Content generated using eXe can be used by any Learning Management System. - diff --git a/installs/debian/ubuntu/debian/control.old b/installs/debian/ubuntu/debian/control.old new file mode 100644 index 0000000..0e989c6 --- /dev/null +++ b/installs/debian/ubuntu/debian/control.old @@ -0,0 +1,35 @@ +Source: python-exe +Maintainer: Jim Tittsler <jim@eXeLearning.org> +Section: python +XS-Python-Version: all +Priority: optional +Standards-Version: 3.6.1 +Build-Depends-Indep: debhelper (>= 4.1.67), python-all-dev + +Package: python-exe +Architecture: i386 +Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging +Description: eLearning XHTML editor [dummy package] + The eXe project is an authoring environment to enable teachers to publish + web content without the need to become proficient in HTML or XML markup. + Content generated using eXe can be used by any Learning Management System. + . + This package is an empty dummy package that always depends on a package + built for Debian's default Python version. + +Package: python2.4-exe +Architecture: i386 +Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging +Description: eLearning XHTML editor + The eXe project is an authoring environment to enable teachers to publish + web content without the need to become proficient in HTML or XML markup. + Content generated using eXe can be used by any Learning Management System. + +Package: python2.5-exe +Architecture: i386 +Depends: ${python:Depends}, python-zopeinterface (>=3.0.0-6), python-imaging +Description: eLearning XHTML editor + The eXe project is an authoring environment to enable teachers to publish + web content without the need to become proficient in HTML or XML markup. + Content generated using eXe can be used by any Learning Management System. + diff --git a/installs/debian/ubuntu/debian/exe.1 b/installs/debian/ubuntu/debian/exe.1 index 0d33721..0cd217f 100644 --- a/installs/debian/ubuntu/debian/exe.1 +++ b/installs/debian/ubuntu/debian/exe.1 @@ -1 +1,47 @@ -.so man1/python-exe.1 +.\" Hey, EMACS: -*- nroff -*- +.\" +.\" If you want to edit this manpage to make it more useful, +.\" you might find the groff_man(7) manpage helpful. +.\" +.TH PYTHON-EXE "1" "September 2005" "python-exe 0.10" "User Commands" +.SH NAME +python-exe \- eLearning XHTML editor +.SH SYNOPSIS +.B exe +.I [ ... ] +.br +.B run-exe.sh +.I [ ... ] +.SH DESCRIPTION +.RS 6 +.B Note: +This is a mostly useless dummy manual page for the +.B python-exe +package. +What follows in the description of the package (if any) +provided in the packages setup.py file. +.RE +.PP +The eXe project is an authoring environment to enable teachers to publish +web content without the need to become proficient in HTML or XML markup. +Content generated using eXe can be used by any Learning Management System. +.SH SEE ALSO +Other places which may or may not offer more information +on the commands in this package include: +.IP +/usr/share/doc/python-exe/ +.IP +http://exelearning.org +.PP +You might also try running +.B pydoc +on the scripts themselves (or just examine them with your +favorite text viewer) to see if they contain any documention. +.SH AUTHOR +exe was written by University of Auckland <exe@exelearning.org> +.PP +This manual page was generated automatically by +Matthew Sherborne <matthew@exelearning.org> +using dh_make (distutils 2.4.1) +for the Debian project. + diff --git a/installs/debian/ubuntu/debian/python-exe.1 b/installs/debian/ubuntu/debian/python-exe.1 deleted file mode 100644 index 0cd217f..0000000 --- a/installs/debian/ubuntu/debian/python-exe.1 +++ /dev/null @@ -1,47 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" -.\" If you want to edit this manpage to make it more useful, -.\" you might find the groff_man(7) manpage helpful. -.\" -.TH PYTHON-EXE "1" "September 2005" "python-exe 0.10" "User Commands" -.SH NAME -python-exe \- eLearning XHTML editor -.SH SYNOPSIS -.B exe -.I [ ... ] -.br -.B run-exe.sh -.I [ ... ] -.SH DESCRIPTION -.RS 6 -.B Note: -This is a mostly useless dummy manual page for the -.B python-exe -package. -What follows in the description of the package (if any) -provided in the packages setup.py file. -.RE -.PP -The eXe project is an authoring environment to enable teachers to publish -web content without the need to become proficient in HTML or XML markup. -Content generated using eXe can be used by any Learning Management System. -.SH SEE ALSO -Other places which may or may not offer more information -on the commands in this package include: -.IP -/usr/share/doc/python-exe/ -.IP -http://exelearning.org -.PP -You might also try running -.B pydoc -on the scripts themselves (or just examine them with your -favorite text viewer) to see if they contain any documention. -.SH AUTHOR -exe was written by University of Auckland <exe@exelearning.org> -.PP -This manual page was generated automatically by -Matthew Sherborne <matthew@exelearning.org> -using dh_make (distutils 2.4.1) -for the Debian project. - diff --git a/installs/debian/ubuntu/debian/rules b/installs/debian/ubuntu/debian/rules index cc14d65..e6f961c 100755 --- a/installs/debian/ubuntu/debian/rules +++ b/installs/debian/ubuntu/debian/rules @@ -1,64 +1,23 @@ #!/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. + +DEB_PYTHON_SYSTEM=pysupport # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -PYTHON_VERSIONS = 2.4 2.5 -IS_PURE = yes -HAVE_DH_PYTHON = yes -DUMMY_PACKAGE = python-exe -CHANGELOG = ChangeLog -ARCHITECTURE = all # architecture for binary packages - -PYTHON = /usr/bin/python${PYTHON_VERSION} -SETUP_PY = setup.py -SETUP = ${PYTHON} ${SETUP_PY} -DEBPACKAGE = python${PYTHON_VERSION}-exe -DESTDIR = ${CURDIR}/debian/${DEBPACKAGE} - -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -export CFLAGS - -ifeq (,$(wildcard PKG-INFO)) - PKG_INFO = debian/PKG-INFO # generate our own PKG-INFO -else - PKG_INFO = PKG-INFO # use the distributed one -endif +PYDEF=$(shell pyversions -d) +PYVERS=$(shell pyversions -r) +EXEPKG=exe -# Macro to run setup.py once for each of the PYTHON_VERSIONS -echo_and_run = { echo $(1); $(1); } -foreach_python_version\ - = @$(foreach PYTHON_VERSION, ${PYTHON_VERSIONS}, \ - $(call echo_and_run, ${$(firstword $(1))_CMD}) \ - && ) true -# Commands which can be run by the foreach_python_version macro: -SETUP_CLEAN_CMD = ${SETUP} clean --all -SETUP_BUILD_CMD = ${SETUP} build -SETUP_INSTALL_CMD= ${SETUP} install --root='${DESTDIR}' --no-compile -DH_PYTHON_CMD = dh_python -V ${PYTHON_VERSION} -p ${DEBPACKAGE} - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - touch configure-stamp - -build: build-stamp $(PKG_INFO) -build-stamp: configure-stamp - rm -rf build dist +build: build-stamp +build-stamp: dh_testdir - $(call foreach_python_version, SETUP_BUILD) + set -e; \ + for python in $(PYVERS); do \ + python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \ + $$python setup.py build; \ + done touch build-stamp debian/PKG-INFO: ${SETUP_PY} @@ -69,10 +28,12 @@ debian/PKG-INFO: ${SETUP_PY} clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp rm -f debian/PKG-INFO - $(call foreach_python_version, SETUP_CLEAN) - rm -rf build dist + for python in $(PYVERS); do \ + python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \ + $$python setup.py clean; \ + done + rm -rf build build-stamp *.pyc dist dh_clean install: build @@ -80,68 +41,21 @@ install: build dh_testroot dh_clean -k dh_installdirs - $(call foreach_python_version, SETUP_INSTALL) - + for python in $(PYVERS); do \ + python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \ + $$python setup.py install --root=debian/$(EXEPKG); \ + done -binary-indep: build install dummy-package +binary-indep: build install binary-arch: build install - -export DH_OPTIONS = - -ifeq (${ARCHITECTURE},all) - binary-indep: real-packages -else - binary-arch: real-packages -endif - -# Build the real packages -ifdef DUMMY_PACKAGE -real-packages: DH_OPTIONS = -N${DUMMY_PACKAGE} -endif -real-packages: - @echo DH_OPTIONS=$$DH_OPTIONS dh_testdir dh_testroot - dh_installchangelogs $(CHANGELOG) - dh_installdocs -A $(PKG_INFO) - dh_installexamples - dh_installmenu - dh_installman -ifndef IS_PURE - dh_strip -endif - dh_compress - dh_fixperms -ifdef HAVE_DH_PYTHON - $(call foreach_python_version, DH_PYTHON) -endif + dh_pysupport dh_installdeb -ifndef IS_PURE - dh_shlibdeps -endif dh_gencontrol dh_md5sums dh_builddeb -# Build the dummy package -# -# There's not much to do, since the only content of the package -# is a symlink: -# -# /usr/share/doc/python-<basename> -> python<curver>-<basename> -# -dummy-package: DH_OPTIONS = -p${DUMMY_PACKAGE} -dummy-package: -ifdef DUMMY_PACKAGE - @echo DH_OPTIONS=$$DH_OPTIONS - dh_testdir - dh_testroot - dh_link - dh_fixperms - dh_gencontrol - dh_builddeb -endif - binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure .PHONY: dummy-package real-packages diff --git a/installs/debian/ubuntu/debian/rules.new-policy b/installs/debian/ubuntu/debian/rules.new-policy deleted file mode 100755 index 14a8d48..0000000 --- a/installs/debian/ubuntu/debian/rules.new-policy +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -DEB_PYTHON_SYSTEM=pysupport - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -PYDEF=$(shell pyversions -d) -PYVERS=$(shell pyversions -r) - -build: build-stamp -build-stamp: - dh_testdir - set -e; \ - for python in $(PYVERS); do \ - python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \ - $$python setup.py build; \ - done - touch build-stamp - -debian/PKG-INFO: ${SETUP_PY} - @echo generating $@; \ - python -c 'import sys; from distutils.core import run_setup; \ - run_setup(sys.argv[1]).metadata.write_pkg_info("debian")' $< - -clean: - dh_testdir - dh_testroot - rm -f debian/PKG-INFO - for python in $(PYVERS); do \ - python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \ - $$python setup.py clean; \ - done - rm -rf build build-stamp *.pyc dist - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - for python in $(PYVERS); do \ - python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \ - $$python setup.py install --root=debian/python-exe; \ - done - -binary-indep: build install -binary-arch: build install - dh_testdir - dh_testroot - dh_pysupport - dh_python - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure -.PHONY: dummy-package real-packages - - diff --git a/installs/debian/ubuntu/debian/rules.old b/installs/debian/ubuntu/debian/rules.old new file mode 100755 index 0000000..cc14d65 --- /dev/null +++ b/installs/debian/ubuntu/debian/rules.old @@ -0,0 +1,149 @@ +#!/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 + +PYTHON_VERSIONS = 2.4 2.5 +IS_PURE = yes +HAVE_DH_PYTHON = yes +DUMMY_PACKAGE = python-exe +CHANGELOG = ChangeLog +ARCHITECTURE = all # architecture for binary packages + +PYTHON = /usr/bin/python${PYTHON_VERSION} +SETUP_PY = setup.py +SETUP = ${PYTHON} ${SETUP_PY} +DEBPACKAGE = python${PYTHON_VERSION}-exe +DESTDIR = ${CURDIR}/debian/${DEBPACKAGE} + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +export CFLAGS + +ifeq (,$(wildcard PKG-INFO)) + PKG_INFO = debian/PKG-INFO # generate our own PKG-INFO +else + PKG_INFO = PKG-INFO # use the distributed one +endif + +# Macro to run setup.py once for each of the PYTHON_VERSIONS +echo_and_run = { echo $(1); $(1); } +foreach_python_version\ + = @$(foreach PYTHON_VERSION, ${PYTHON_VERSIONS}, \ + $(call echo_and_run, ${$(firstword $(1))_CMD}) \ + && ) true +# Commands which can be run by the foreach_python_version macro: +SETUP_CLEAN_CMD = ${SETUP} clean --all +SETUP_BUILD_CMD = ${SETUP} build +SETUP_INSTALL_CMD= ${SETUP} install --root='${DESTDIR}' --no-compile +DH_PYTHON_CMD = dh_python -V ${PYTHON_VERSION} -p ${DEBPACKAGE} + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + touch configure-stamp + +build: build-stamp $(PKG_INFO) +build-stamp: configure-stamp + rm -rf build dist + dh_testdir + $(call foreach_python_version, SETUP_BUILD) + touch build-stamp + +debian/PKG-INFO: ${SETUP_PY} + @echo generating $@; \ + python -c 'import sys; from distutils.core import run_setup; \ + run_setup(sys.argv[1]).metadata.write_pkg_info("debian")' $< + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + rm -f debian/PKG-INFO + $(call foreach_python_version, SETUP_CLEAN) + rm -rf build dist + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(call foreach_python_version, SETUP_INSTALL) + + +binary-indep: build install dummy-package +binary-arch: build install + +export DH_OPTIONS = + +ifeq (${ARCHITECTURE},all) + binary-indep: real-packages +else + binary-arch: real-packages +endif + +# Build the real packages +ifdef DUMMY_PACKAGE +real-packages: DH_OPTIONS = -N${DUMMY_PACKAGE} +endif +real-packages: + @echo DH_OPTIONS=$$DH_OPTIONS + dh_testdir + dh_testroot + dh_installchangelogs $(CHANGELOG) + dh_installdocs -A $(PKG_INFO) + dh_installexamples + dh_installmenu + dh_installman +ifndef IS_PURE + dh_strip +endif + dh_compress + dh_fixperms +ifdef HAVE_DH_PYTHON + $(call foreach_python_version, DH_PYTHON) +endif + dh_installdeb +ifndef IS_PURE + dh_shlibdeps +endif + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build the dummy package +# +# There's not much to do, since the only content of the package +# is a symlink: +# +# /usr/share/doc/python-<basename> -> python<curver>-<basename> +# +dummy-package: DH_OPTIONS = -p${DUMMY_PACKAGE} +dummy-package: +ifdef DUMMY_PACKAGE + @echo DH_OPTIONS=$$DH_OPTIONS + dh_testdir + dh_testroot + dh_link + dh_fixperms + dh_gencontrol + dh_builddeb +endif + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: dummy-package real-packages + + diff --git a/installs/debian/ubuntu/debian/run-exe.sh.1 b/installs/debian/ubuntu/debian/run-exe.sh.1 index 0d33721..72c1f67 100644 --- a/installs/debian/ubuntu/debian/run-exe.sh.1 +++ b/installs/debian/ubuntu/debian/run-exe.sh.1 @@ -1 +1 @@ -.so man1/python-exe.1 +.so man1/exe.1 diff --git a/installs/debian/ubuntu/make.py b/installs/debian/ubuntu/make.py index bcc0054..4db6ad2 100755 --- a/installs/debian/ubuntu/make.py +++ b/installs/debian/ubuntu/make.py @@ -14,6 +14,8 @@ import tempfile SRCDIR = os.path.abspath('../../..') WDIR = os.getcwd() +#exepkg = 'python-exe' +exepkg = 'exe' changelog = 'debian/changelog' # this is done in a way consistent with the other builds... @@ -49,7 +51,8 @@ while True: sys.exit(1) versionstring = tl.group('version') + '.0.' + tl.group('revision') timestamp = time.strptime(tl.group('date'), '%Y-%m-%d') - cl.write("python-exe (%s-ubuntu1) unstable; urgency=low\n" % versionstring) + cl.write("%s (%s-ubuntu1) unstable; urgency=low\n" % + (exepkg, versionstring)) elif nl.strip() == "": cl.write("\n") cl.write(" -- eXe Project <exe@exelearning.org> %s\n" % @@ -58,7 +61,8 @@ while True: else: if need_version: need_version = False - cl.write("python-exe (%s-ubuntu1) unstable; urgency=low\n" % version.version) + cl.write("%s (%s-ubuntu1) unstable; urgency=low\n" % + (exepkg, version.version)) cl.write(' ' + nl) news.close() |