Initialize git-dpm

6 files changed, 82 insertions, 38 deletions

diff --git a/debian/patches/00_eggify.diff b/debian/patches/00_eggify.diff
index 9247c6c..21a4e2c 100644
--- a/debian/patches/00_eggify.diff
+++ b/debian/patches/00_eggify.diff
@@ -1,5 +1,17 @@
---- a/kiwi/dist.py~	2006-04-25 12:08:54.000000000 -0300
-+++ b/kiwi/dist.py	2006-05-06 19:29:41.000000000 -0300
+From 59e0424ce12cb5e56311cba753917ada07cc7ca1 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:28:23 -0700
+Subject: 00_eggify.diff
+
+Patch-Name: 00_eggify.diff
+---
+ kiwi/dist.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kiwi/dist.py b/kiwi/dist.py
+index d47945a..535df03 100644
+--- a/kiwi/dist.py
++++ b/kiwi/dist.py
 @@ -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 8550f72..6aaad71 100644
--- a/debian/patches/01_avoid_building_howto.diff
+++ b/debian/patches/01_avoid_building_howto.diff
@@ -1,6 +1,18 @@
---- 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 @@
+From ed5ffb10c00eefda1807e41a5b48450a70d62b2a Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:28:25 -0700
+Subject: 01_avoid_building_howto.diff
+
+Patch-Name: 01_avoid_building_howto.diff
+---
+ doc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index f7dd3bb..73687f9 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -15,7 +15,7 @@ NAME=Kiwi
  URL=http://www.async.com.br/projects/kiwi/
  FIXIMG=perl -p -i -e 's/WIDTH=\"[0-9]+\" HEIGHT=\"[0-9]+\"//'
  
diff --git a/debian/patches/02_avoid_version_checking.diff b/debian/patches/02_avoid_version_checking.diff
index 524fea8..4898196 100644
--- a/debian/patches/02_avoid_version_checking.diff
+++ b/debian/patches/02_avoid_version_checking.diff
@@ -1,7 +1,19 @@
-diff -ru kiwi-1.9.15.orig/bin/kiwi-i18n kiwi-1.9.15/bin/kiwi-i18n
---- kiwi-1.9.15.orig/bin/kiwi-i18n	2007-05-11 12:45:39.000000000 -0300
-+++ kiwi-1.9.15/bin/kiwi-i18n	2007-05-28 20:28:38.000000000 -0300
-@@ -20,7 +20,7 @@
+From 72b5d4732db219ec84b824ad41074cfc5c07d1a4 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:28:26 -0700
+Subject: 02_avoid_version_checking.diff
+
+Patch-Name: 02_avoid_version_checking.diff
+---
+ bin/kiwi-i18n    | 12 ++++++------
+ bin/kiwi-ui-test | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/bin/kiwi-i18n b/bin/kiwi-i18n
+index d4d5752..ab0465d 100755
+--- a/bin/kiwi-i18n
++++ b/bin/kiwi-i18n
+@@ -20,7 +20,7 @@ import os
  import sys
  
  # Required version of Python
@@ -10,7 +22,7 @@ diff -ru kiwi-1.9.15.orig/bin/kiwi-i18n kiwi-1.9.15/bin/kiwi-i18n
  
  # Directory name, defaults to name of binary, it is relative to ..
  # a, __init__.py and main.py is expected to be found there.
-@@ -33,11 +33,11 @@
+@@ -33,11 +33,11 @@ APPNAME = None
  dirname = DIRNAME or os.path.split(sys.argv[0])[1]
  appname = APPNAME or dirname.capitalize()
  
@@ -27,10 +39,11 @@ diff -ru kiwi-1.9.15.orig/bin/kiwi-i18n kiwi-1.9.15/bin/kiwi-i18n
  
  # Figure out the directy which is the prefix
  # path-of-current-file/..
-diff -ru kiwi-1.9.15.orig/bin/kiwi-ui-test kiwi-1.9.15/bin/kiwi-ui-test
---- kiwi-1.9.15.orig/bin/kiwi-ui-test	2007-03-02 17:08:12.000000000 -0300
-+++ kiwi-1.9.15/bin/kiwi-ui-test	2007-05-28 20:28:58.000000000 -0300
-@@ -20,7 +20,7 @@
+diff --git a/bin/kiwi-ui-test b/bin/kiwi-ui-test
+index 491fa9a..fcfe6dd 100755
+--- a/bin/kiwi-ui-test
++++ b/bin/kiwi-ui-test
+@@ -20,7 +20,7 @@ import os
  import sys
  
  # Required version of Python
@@ -39,7 +52,7 @@ diff -ru kiwi-1.9.15.orig/bin/kiwi-ui-test kiwi-1.9.15/bin/kiwi-ui-test
  
  # Directory name, defaults to name of binary, it is relative to ..
  # a, __init__.py and main.py is expected to be found there.
-@@ -33,11 +33,11 @@
+@@ -33,11 +33,11 @@ APPNAME = None
  dirname = DIRNAME or os.path.split(sys.argv[0])[1]
  appname = APPNAME or dirname.capitalize()
  
diff --git a/debian/patches/02_disable_pydoctor.diff b/debian/patches/02_disable_pydoctor.diff
deleted file mode 100644
index 2fc0709..0000000
--- a/debian/patches/02_disable_pydoctor.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: doc/Makefile
-===================================================================
---- doc/Makefile	(revisão 6595)
-+++ doc/Makefile	(cópia de trabalho)
-@@ -46,8 +46,7 @@
- 
- api:
- 	@echo Creating API documentation
--	@cd .. && pydoctor --project-name="Kiwi" --add-package=kiwi --make-html
--	@mv ../apidocs api
-+	@mkdir api
- 
- clean:
- 	rm -rf api/ howto/ *.log *.aux *.l2h *.dvi *.ps *.bak *~
diff --git a/debian/patches/04_avoid_building_helper_module.diff b/debian/patches/04_avoid_building_helper_module.diff
index 74ce654..ecf70db 100644
--- a/debian/patches/04_avoid_building_helper_module.diff
+++ b/debian/patches/04_avoid_building_helper_module.diff
@@ -1,7 +1,18 @@
-diff -ur kiwi-1.9.15.orig/setup.py kiwi-1.9.15/setup.py
---- kiwi-1.9.15.orig/setup.py	2007-02-28 12:00:57.000000000 -0300
-+++ kiwi-1.9.15/setup.py	2007-05-23 15:25:04.000000000 -0300
-@@ -25,7 +25,7 @@
+From 7c3d9cffdc63b59ee01645c32867ee987576448d Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 09:28:27 -0700
+Subject: 04_avoid_building_helper_module.diff
+
+Patch-Name: 04_avoid_building_helper_module.diff
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a18c3e3..63a003f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -25,7 +25,7 @@ ext_modules = []
  # Build a helper module for testing on gtk+ versions lower than 2.10.
  # Don't build it on windows due to easy availability compilers and
  # the lack of pkg-config.
diff --git a/debian/patches/05_pydoctor_build_time.diff b/debian/patches/05_pydoctor_build_time.diff
index 252bf4b..80310f5 100644
--- a/debian/patches/05_pydoctor_build_time.diff
+++ b/debian/patches/05_pydoctor_build_time.diff
@@ -1,10 +1,20 @@
-Description: Allow passing in extra options to pydoctor
-Author: Jelmer Vernoij <jelmer@debian.org>
+From 919605930e763122dd7dd792b9b86305b32239e8 Mon Sep 17 00:00:00 2001
+From: Jelmer Vernoij <jelmer@debian.org>
+Date: Thu, 8 Oct 2015 09:28:28 -0700
+Subject: Allow passing in extra options to pydoctor
+
 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 @@
+Patch-Name: 05_pydoctor_build_time.diff
+---
+ doc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 73687f9..3684d0f 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -46,7 +46,7 @@ howto: howto.tex
  
  api:
  	@echo Creating API documentation