[Python-apps-commits] r3307 - in packages/waf/trunk/debian (18 files)
dktrkranz-guest at users.alioth.debian.org
dktrkranz-guest at users.alioth.debian.org
Sun Jul 19 18:33:49 UTC 2009
Date: Sunday, July 19, 2009 @ 18:33:39
Author: dktrkranz-guest
Revision: 3307
Adjust packaging, with Devid's approval
Added:
packages/waf/trunk/debian/README.source
packages/waf/trunk/debian/docs
packages/waf/trunk/debian/links
packages/waf/trunk/debian/manpages
packages/waf/trunk/debian/patches/
packages/waf/trunk/debian/patches/series
packages/waf/trunk/debian/patches/unpack_in_cwd.patch
packages/waf/trunk/debian/patches/waf_noninteractive.patch
packages/waf/trunk/debian/patches/waf_stylesheet.patch
packages/waf/trunk/debian/waf-doc.docs
Modified:
packages/waf/trunk/debian/changelog
packages/waf/trunk/debian/compat
packages/waf/trunk/debian/control
packages/waf/trunk/debian/copyright
packages/waf/trunk/debian/rules
Deleted:
packages/waf/trunk/debian/bin
packages/waf/trunk/debian/dirs
packages/waf/trunk/debian/pyversions
Added: packages/waf/trunk/debian/README.source
===================================================================
--- packages/waf/trunk/debian/README.source (rev 0)
+++ packages/waf/trunk/debian/README.source 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Deleted: packages/waf/trunk/debian/bin
===================================================================
--- packages/waf/trunk/debian/bin 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/bin 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-DIR=`pwd`
-ln -s /usr/share/waf/waf $DIR/waf
-
-OPTIONS=$(echo "$@" | sed -e 's/.*'$2'/'$2'/')
-
-if [ "$1" != "" ]; then
- if [ -d $1 ]; then
- cd $1 && $DIR/waf $OPTIONS
- else
- $DIR/waf $@
- fi
-else
- man waf
-fi
-
-rm -f $DIR/waf
-if [ -d $DIR/.waf-?.?.?-???????????????????????????????? ]; then
- rm -rf $DIR/.waf-?.?.?-????????????????????????????????
-fi
Modified: packages/waf/trunk/debian/changelog
===================================================================
--- packages/waf/trunk/debian/changelog 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/changelog 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1,5 +1,5 @@
-waf (1.5.6-1) unstable; urgency=low
+waf (1.5.8-1) UNRELEASED; urgency=low
* Initial release (Closes: #466304).
- -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sat, 30 May 2009 17:34:40 +0200
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com> Sun, 19 Jul 2009 16:23:56 +0200
Modified: packages/waf/trunk/debian/compat
===================================================================
--- packages/waf/trunk/debian/compat 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/compat 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1 +1 @@
-6
+7
Modified: packages/waf/trunk/debian/control
===================================================================
--- packages/waf/trunk/debian/control 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/control 2009-07-19 18:33:39 UTC (rev 3307)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Devid Antonio Filoni <d.filoni at ubuntu.com>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 6)
-Build-Depends-Indep: python (>= 2.4), python-support (>= 0.5.3)
-XS-Python-Version: all
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.2.6), quilt (>= 0.46-7)
+Build-Depends-Indep: python (>= 2.4), python-support (>= 0.5.3), xsltproc, docbook-xsl
+XS-Python-Version: >= 2.4
+Standards-Version: 3.8.2
Homepage: http://code.google.com/p/waf/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/waf/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/waf/trunk/
@@ -14,7 +14,7 @@
Package: waf
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-XB-Python-Version: ${python:Versions}
+Suggests: waf-doc
Description: Python-based build system
Waf is a Python-based framework for configuring, compiling and installing
applications. It derives from the concepts of other build tools such as
@@ -27,3 +27,15 @@
* It features excellent performance and scalability
* It is designed to be flexible
* It is very easy to use and to deploy
+
+Package: waf-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: waf
+Description: documentation for waf
+ Waf is a Python-based framework for configuring, compiling and installing
+ applications. It derives from the concepts of other build tools such as
+ SCons, Autotools, CMake or Ant.
+ .
+ This package provides documentation for Waf.
Modified: packages/waf/trunk/debian/copyright
===================================================================
--- packages/waf/trunk/debian/copyright 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/copyright 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1,5 +1,5 @@
This package was debianized by Devid Antonio Filoni <d.filoni at ubuntu.com> on
-Sat, 30 May 2009 17:34:40 +0200.
+Sun, 19 Jul 2009 16:23:56 +0200
It was downloaded from http://code.google.com/p/waf/
Deleted: packages/waf/trunk/debian/dirs
===================================================================
--- packages/waf/trunk/debian/dirs 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/dirs 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1 +0,0 @@
-usr/share/waf
Added: packages/waf/trunk/debian/docs
===================================================================
--- packages/waf/trunk/debian/docs (rev 0)
+++ packages/waf/trunk/debian/docs 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1 @@
+README
Added: packages/waf/trunk/debian/links
===================================================================
--- packages/waf/trunk/debian/links (rev 0)
+++ packages/waf/trunk/debian/links 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1 @@
+usr/share/waf/bin/waf usr/bin/waf
Added: packages/waf/trunk/debian/manpages
===================================================================
--- packages/waf/trunk/debian/manpages (rev 0)
+++ packages/waf/trunk/debian/manpages 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1 @@
+debian/waf.1
Added: packages/waf/trunk/debian/patches/series
===================================================================
--- packages/waf/trunk/debian/patches/series (rev 0)
+++ packages/waf/trunk/debian/patches/series 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1,3 @@
+waf_noninteractive.patch
+waf_stylesheet.patch
+unpack_in_cwd.patch
Added: packages/waf/trunk/debian/patches/unpack_in_cwd.patch
===================================================================
--- packages/waf/trunk/debian/patches/unpack_in_cwd.patch (rev 0)
+++ packages/waf/trunk/debian/patches/unpack_in_cwd.patch 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1,17 @@
+Description: Always unpack Waf lib directory in the current working directory
+Origin: Debian
+Forwarded: not-needed
+
+Index: waf-1.5.8/waf-light
+===================================================================
+--- waf-1.5.8.orig/waf-light 2009-07-19 16:45:26.000000000 +0200
++++ waf-1.5.8/waf-light 2009-07-19 16:46:10.000000000 +0200
+@@ -111,7 +111,7 @@
+
+ def find_lib():
+ name = sys.argv[0]
+- base = os.path.dirname(os.path.abspath(name))
++ base = os.path.dirname(os.getcwd())
+
+ #devs use $WAFDIR
+ w=test(os.environ.get('WAFDIR', ''))
Added: packages/waf/trunk/debian/patches/waf_noninteractive.patch
===================================================================
--- packages/waf/trunk/debian/patches/waf_noninteractive.patch (rev 0)
+++ packages/waf/trunk/debian/patches/waf_noninteractive.patch 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1,17 @@
+Description: Do not ask to install files system-wide, simply do it
+Origin: Debian
+Forwarded: not-needed
+
+Index: waf-1.5.8/wscript
+===================================================================
+--- waf-1.5.8.orig/wscript 2009-07-19 15:25:38.000000000 +0200
++++ waf-1.5.8/wscript 2009-07-19 15:25:51.000000000 +0200
+@@ -310,8 +310,6 @@
+ compute_revision()
+
+ if Options.commands['install']:
+- val = Options.options.yes or (not sys.stdin.isatty() or raw_input("Installing Waf is discouraged. Proceed? [y/n]"))
+- if val != True and val != "y": sys.exit(1)
+ create_waf()
+
+ dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
Added: packages/waf/trunk/debian/patches/waf_stylesheet.patch
===================================================================
--- packages/waf/trunk/debian/patches/waf_stylesheet.patch (rev 0)
+++ packages/waf/trunk/debian/patches/waf_stylesheet.patch 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1,19 @@
+Description: Adjust path to the stylesheet file to match Debian packaging
+Origin: Debian
+Forwarded: not-needed
+
+Index: waf-1.5.8/doc/book/wscript
+===================================================================
+--- waf-1.5.8.orig/doc/book/wscript 2009-07-19 15:26:47.000000000 +0200
++++ waf-1.5.8/doc/book/wscript 2009-07-19 15:27:01.000000000 +0200
+@@ -87,8 +87,8 @@
+ obj.source = 'waf.xml'
+
+ obj.type = 'html'
+- obj.stylesheet='/usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl'
+- obj.stylesheet='/home/waf/Escritorio/docbook/docbook-xsl-snapshot/html/chunk.xsl'
++ obj.stylesheet='/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunk.xsl'
++ #obj.stylesheet='/home/waf/Escritorio/docbook/docbook-xsl-snapshot/html/chunk.xsl'
+ #obj.stylesheet='/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl'
+ #obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/chunk.xsl'
+
Deleted: packages/waf/trunk/debian/pyversions
===================================================================
--- packages/waf/trunk/debian/pyversions 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/pyversions 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1 +0,0 @@
-2.4-
Modified: packages/waf/trunk/debian/rules
===================================================================
--- packages/waf/trunk/debian/rules 2009-07-19 16:32:50 UTC (rev 3306)
+++ packages/waf/trunk/debian/rules 2009-07-19 18:33:39 UTC (rev 3307)
@@ -1,55 +1,21 @@
#!/usr/bin/make -f
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- $(CURDIR)/waf-light configure --prefix /usr --nopyc --nopyo
- touch configure-stamp
+export DEB_BUILD_OPTIONS := nocheck
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
- $(CURDIR)/waf-light --make-waf
- touch build-stamp
+%:
+ dh --with quilt $@
-clean:
- dh_testdir
- dh_testroot
- -$(CURDIR)/waf-light clean
- -rm -rf $(CURDIR)/build
- find $(CURDIR) -name "*.pyc" -delete
- dh_clean build-stamp configure-stamp .lock-wscript waf
+override_dh_auto_clean:
+ find -name "*.lock-wscript" -delete
+ find -name "*.pyc" -delete
+ rm -fr waf .waf-* doc/.waf-* build doc/book/build
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_configure:
+ ./waf-light configure --prefix=$(CURDIR)/debian/waf/usr/share/waf
- $(CURDIR)/waf-light install --destdir=$(CURDIR)/debian/waf --yes
- rm -rf $(CURDIR)/debian/waf/usr/lib
- cp -f $(CURDIR)/debian/waf/usr/bin/waf $(CURDIR)/debian/waf/usr/share/waf/
- rm -f $(CURDIR)/debian/waf/usr/bin/waf
- cp -f $(CURDIR)/debian/bin $(CURDIR)/debian/waf/usr/bin/waf
+override_dh_auto_build:
+ ./waf-light --make-waf --prefix=/usr --zip-type=bz2 --strip --nopyc --nopyo
+ cd doc/book && ../../waf configure && ../../waf build
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs ChangeLog
- dh_installman debian/waf.1
- dh_pysupport
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_install:
+ ./waf-light install --strip --nopyc --nopyo
Added: packages/waf/trunk/debian/waf-doc.docs
===================================================================
--- packages/waf/trunk/debian/waf-doc.docs (rev 0)
+++ packages/waf/trunk/debian/waf-doc.docs 2009-07-19 18:33:39 UTC (rev 3307)
@@ -0,0 +1 @@
+doc/book/build/default/*
More information about the Python-apps-commits
mailing list