* Drop empty patch 02_disable_pydoctor.patch.

* Add patch 05_pydoctor_build_time.diff: Pass package change time to
  pydoctor, to create reproducible builds.

8 files changed, 34 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 43ef255..b58eb91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ kiwi (1.9.22-3) UNRELEASED; urgency=low
   [ Jelmer Vernooij ]
   * Bump standards version to 3.9.6.
   * Migrate to 3.0 (quilt).
+  * Drop empty patch 02_disable_pydoctor.patch.
+  * Add patch 05_pydoctor_build_time.diff: Pass package change time to
+    pydoctor, to create reproducible builds.
 
  -- Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>  Wed, 06 May 2015 22:39:09 +0000
 
diff --git a/debian/control b/debian/control
index 60e0ad2..95fd1cf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Goedson Teixeira Paixao <goedson@debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python, python-setuptools (>= 0.6b3)
-Build-Depends-Indep: python-all (>= 2.3.5-10), python-glade2 (>= 2.8.6), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.6.4), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0), xvfb, xfonts-base, python-pydoctor (>= 0.2-4.1)
+Build-Depends-Indep: python-all (>= 2.3.5-10), python-glade2 (>= 2.8.6), python-gtk2 (>= 2.8.2-3.1), python-support (>= 0.6.4), python-epydoc (>= 2.1-11), python-twisted-core (>= 2.4.0), xvfb, xfonts-base, python-pydoctor (>= 0.5+git20150410-1)
 Homepage: http://www.async.com.br/projects/kiwi/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/kiwi/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/kiwi/trunk/
diff --git a/debian/patches/00_eggify.diff b/debian/patches/00_eggify.diff
index a88bb6d..9247c6c 100644
--- a/debian/patches/00_eggify.diff
+++ b/debian/patches/00_eggify.diff
@@ -1,5 +1,5 @@
---- kiwi/dist.py~	2006-04-25 12:08:54.000000000 -0300
-+++ kiwi/dist.py	2006-05-06 19:29:41.000000000 -0300
+--- a/kiwi/dist.py~	2006-04-25 12:08:54.000000000 -0300
++++ b/kiwi/dist.py	2006-05-06 19:29:41.000000000 -0300
 @@ -25,7 +25,8 @@
  
  from distutils.command.install_data import install_data
diff --git a/debian/patches/01_avoid_building_howto.diff b/debian/patches/01_avoid_building_howto.diff
index fa35b2d..8550f72 100644
--- a/debian/patches/01_avoid_building_howto.diff
+++ b/debian/patches/01_avoid_building_howto.diff
@@ -1,11 +1,11 @@
---- doc/Makefile.old	2006-08-24 21:43:21.000000000 -0300
-+++ doc/Makefile	2006-08-26 15:30:15.000000000 -0300
-@@ -14,7 +14,7 @@
- NAME=Kiwi
+--- kiwi-1.9.22/doc/Makefile	2008-05-28 20:31:04.000000000 +0000
++++ b/doc/Makefile	2015-05-06 22:53:08.280130780 +0000
+@@ -15,7 +15,7 @@
  URL=http://www.async.com.br/projects/kiwi/
+ FIXIMG=perl -p -i -e 's/WIDTH=\"[0-9]+\" HEIGHT=\"[0-9]+\"//'
  
 -all: api howto
 +all: api # howto (not working for now)
  
  howto: howto.tex
- 	mkdir -p howto
+ 	@echo Creating howto
diff --git a/debian/patches/02_disable_pydoctor.diff b/debian/patches/02_disable_pydoctor.diff
deleted file mode 100644
index e69de29..0000000
--- a/debian/patches/02_disable_pydoctor.diff
+++ /dev/null
diff --git a/debian/patches/05_pydoctor_build_time.diff b/debian/patches/05_pydoctor_build_time.diff
new file mode 100644
index 0000000..252bf4b
--- /dev/null
+++ b/debian/patches/05_pydoctor_build_time.diff
@@ -0,0 +1,15 @@
+Description: Allow passing in extra options to pydoctor
+Author: Jelmer Vernoij <jelmer@debian.org>
+Status: not forwarded upstream
+
+--- a/doc/Makefile	2008-05-28 20:31:04.000000000 +0000
++++ b/doc/Makefile	2015-05-06 22:46:20.162496364 +0000
+@@ -46,7 +46,7 @@
+ 
+ api:
+ 	@echo Creating API documentation
+-	@cd .. && pydoctor --project-name="Kiwi" --add-package=kiwi --make-html
++	@cd .. && pydoctor $(PYDOCTOR_OPTIONS) --project-name="Kiwi" --add-package=kiwi --make-html
+ 	@mv ../apidocs api
+ 
+ clean:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7aa7e61
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+00_eggify.diff
+01_avoid_building_howto.diff
+02_avoid_version_checking.diff
+04_avoid_building_helper_module.diff
+05_pydoctor_build_time.diff
diff --git a/debian/rules b/debian/rules
index 929497d..5230a1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,14 @@ DEB_PYTHON_SYSTEM := pysupport
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_COMPRESS_EXCLUDE += .py .glade .gladep
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
+BUILD_DATE = $(shell dpkg-parsechangelog -S Date)
+
 build/python-kiwi::
-	cd doc && $(MAKE) api
+	cd doc && $(MAKE) api PYDOCTOR_OPTIONS="--buildtime=$(shell date -u +'%Y-%m-%d\\ %H:%M:%S' --date='$(BUILD_DATE)')"
 
 install/python-kiwi::
 	mv debian/python-kiwi/usr/share/doc/kiwi/api debian/python-kiwi/usr/share/doc/python-kiwi/api