From 1c7012db050dd279c7d665190eba40c53e739455 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sun, 8 Apr 2012 08:00:45 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 debian/README.source                               |    3 ---
 debian/changelog                                   |   12 ++++++++++++
 debian/compat                                      |    2 +-
 debian/control                                     |    5 +++--
 debian/copyright                                   |   10 ++++++----
 debian/didiwiki.init                               |    5 ++++-
 debian/patches/00list                              |    9 ---------
 ...modified_code.dpatch => 10_modified_code.patch} |   14 +++++---------
 .../{20_redirect.dpatch => 20_redirect.patch}      |    8 ++------
 ...0_preformatted.dpatch => 30_preformatted.patch} |    8 ++------
 .../{40_spelling.dpatch => 40_spelling.patch}      |   10 +++-------
 .../{50_accesslog.dpatch => 50_accesslog.patch}    |    8 ++------
 ...0_bind_address.dpatch => 60_bind_address.patch} |   10 +++-------
 debian/patches/{70_usage.dpatch => 70_usage.patch} |    8 ++------
 ...gint_sigterm.dpatch => 80_sigint_sigterm.patch} |    8 ++------
 ...search_engine.dpatch => 90_search_engine.patch} |   16 +++++-----------
 debian/patches/series                              |    9 +++++++++
 debian/rules                                       |    1 -
 debian/source/format                               |    1 +
 19 files changed, 62 insertions(+), 85 deletions(-)
 delete mode 100644 debian/README.source
 mode change 100644 => 100755 debian/didiwiki.init
 delete mode 100644 debian/patches/00list
 rename debian/patches/{10_modified_code.dpatch => 10_modified_code.patch} (94%)
 rename debian/patches/{20_redirect.dpatch => 20_redirect.patch} (91%)
 rename debian/patches/{30_preformatted.dpatch => 30_preformatted.patch} (61%)
 rename debian/patches/{40_spelling.dpatch => 40_spelling.patch} (85%)
 rename debian/patches/{50_accesslog.dpatch => 50_accesslog.patch} (94%)
 rename debian/patches/{60_bind_address.dpatch => 60_bind_address.patch} (91%)
 rename debian/patches/{70_usage.dpatch => 70_usage.patch} (84%)
 rename debian/patches/{80_sigint_sigterm.dpatch => 80_sigint_sigterm.patch} (85%)
 rename debian/patches/{90_search_engine.dpatch => 90_search_engine.patch} (66%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7f7b2fb..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-This package uses the dpatch patch management solution.
-For more information about how to use it, please refer to:
-/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index 6bc648e..81d0898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+didiwiki (0.5-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+  * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+  * In copyright mentions that all URLs to upstream project are dead.
+  * Add homepage field to control file.
+  * Fix init.d-script-missing-lsb-description (Lintian).
+  * Fix init.d-script-does-not-implement-optional-option (Lintian).
+
+ -- Jari Aalto <jari.aalto@cante.net>  Sun, 08 Apr 2012 07:59:24 +0300
+
 didiwiki (0.5-9) unstable; urgency=low
 
   * Added debian/README.source pointing to the dpatch documentation.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 578ba9e..4761048 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: didiwiki
 Section: web
 Priority: optional
 Maintainer: Ignace Mouzannar <mouzannar@gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), cdbs
+Standards-Version: 3.9.3.1
+Homepage: None, Dead project
 
 Package: didiwiki
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 894ba34..14dd2bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,13 @@
 This package was debianised by Hanna Wallach <hmw26@cam.ac.uk> on Wed,
 12 Jan 2005 23:13:30 -0500.
 
-It was downloaded from http://didiwiki.org/
+Note: Dead project.
 
-Note: The upstream URL is not availabe anymore, now it's a spam-site.
-This software can be downloaded from: 
-     http://svn.o-hand.com/repos/didiwiki/trunk/
+The upstream sources is no longer in 2012-04-08 at any of these places:
+
+    http://didiwiki.org (Spam site)
+    http://svn.o-hand.com/repos/didiwiki/trunk/ (Domain not found)
+    http://freecode.com/projects/didiwiki
 
 Upstream Authors: Matthew Allum <mallum@o-hand.com>
                   Carsten Graeser <c.g.berlin@web.de>
diff --git a/debian/didiwiki.init b/debian/didiwiki.init
old mode 100644
new mode 100755
index b1a8eb8..e3ec972
--- a/debian/didiwiki.init
+++ b/debian/didiwiki.init
@@ -5,7 +5,10 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: start, restart and stop Didiwiki's daemon
+# Short-Description: Start, restart and stop Didiwiki's daemon
+# Description:       Controls wiki that does not require installation
+#                    of a separate webserver, scripting.
+ language, or database
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 129629e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,9 +0,0 @@
-10_modified_code.dpatch
-20_redirect.dpatch
-30_preformatted.dpatch
-40_spelling.dpatch
-50_accesslog.dpatch
-60_bind_address.dpatch
-70_usage.dpatch
-80_sigint_sigterm.dpatch
-90_search_engine.dpatch
diff --git a/debian/patches/10_modified_code.dpatch b/debian/patches/10_modified_code.patch
similarity index 94%
rename from debian/patches/10_modified_code.dpatch
rename to debian/patches/10_modified_code.patch
index 744a029..660d05e 100644
--- a/debian/patches/10_modified_code.dpatch
+++ b/debian/patches/10_modified_code.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_modified_code.dpatch by Mauro Lizaur <mauro@cacavoladora.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Modifies the modified code. (?)
-## DP: The src/ dir had modified files directly instead of using patches,
-## DP: so this (mega-)patch modifies the original (pristine) code
-## DP: to keep these modifications made before.
+From: Mauro Lizaur <mauro@cacavoladora.org>
+Subject: Modifies the modified code. (?)
+ The src/ dir had modified files directly instead of using patches,
+ so this (mega-)patch modifies the original (pristine) code
+ to keep these modifications made before.
 
-@DPATCH@
 
 diff -Naur src-orig/didi.c src/didi.c
 --- didiwiki-0.5/src-orig/didi.c	2004-07-29 10:33:47.000000000 -0300
diff --git a/debian/patches/20_redirect.dpatch b/debian/patches/20_redirect.patch
similarity index 91%
rename from debian/patches/20_redirect.dpatch
rename to debian/patches/20_redirect.patch
index f9766c5..9504a86 100644
--- a/debian/patches/20_redirect.dpatch
+++ b/debian/patches/20_redirect.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_redirect.dpatch by Alexey Khudyakov <alexey.skladnoy@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes unicode chars on page names
+From: Alexey Khudyakov <alexey.skladnoy@gmail.com>
+Subject: Fixes unicode chars on page names
 
-@DPATCH@
 
 diff -Naur didiwiki-0.5-deb/src/util.c didiwiki-0.5-patch/src/util.c
 --- didiwiki-0.5-deb/src/util.c	2007-04-21 15:56:13.000000000 +0400
diff --git a/debian/patches/30_preformatted.dpatch b/debian/patches/30_preformatted.patch
similarity index 61%
rename from debian/patches/30_preformatted.dpatch
rename to debian/patches/30_preformatted.patch
index 0261a9f..c7ab7bc 100644
--- a/debian/patches/30_preformatted.dpatch
+++ b/debian/patches/30_preformatted.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_preformatted.dpatch by Neil Stockbridge <neil@dist.ro>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes the double newlines in preformatted text
+From: Neil Stockbridge <neil@dist.ro>
+Subject: Removes the double newlines in preformatted text
 
-@DPATCH@
 
 --- didiwiki-orig/didiwiki-0.5/src/wiki.c	2009-06-01 16:16:50.000000000 -0300
 +++ didiwiki-0.5/src/wiki.c	2009-06-01 15:48:16.000000000 -0300
diff --git a/debian/patches/40_spelling.dpatch b/debian/patches/40_spelling.patch
similarity index 85%
rename from debian/patches/40_spelling.dpatch
rename to debian/patches/40_spelling.patch
index 46c4c56..6d3e351 100644
--- a/debian/patches/40_spelling.dpatch
+++ b/debian/patches/40_spelling.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_spelling.dpatch by Ignace Mouzannar <mouzannar@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Corrects spelling errors (seperated -> separated) in README file
-## DP: Corrects minor typo in src/wiki.c
+From: Ignace Mouzannar <mouzannar@gmail.com>
+Subject: Corrects spelling errors (seperated -> separated) in README file
+ Corrects minor typo in src/wiki.c
 
-@DPATCH@
 diff -urNad didiwiki-0.5~/README didiwiki-0.5/README
 --- didiwiki-0.5~/README	2009-10-06 23:12:56.000000000 +0200
 +++ didiwiki-0.5/README	2009-10-06 23:14:06.000000000 +0200
diff --git a/debian/patches/50_accesslog.dpatch b/debian/patches/50_accesslog.patch
similarity index 94%
rename from debian/patches/50_accesslog.dpatch
rename to debian/patches/50_accesslog.patch
index 5f527e4..2af0311 100644
--- a/debian/patches/50_accesslog.dpatch
+++ b/debian/patches/50_accesslog.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_accesslog.dpatch by Carlo Mandelli <camandel@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds access log to didiwiki using syslog
+From: Carlo Mandelli <camandel@gmail.com>
+Subject: Adds access log to didiwiki using syslog
 
-@DPATCH@
 diff -urNad didiwiki-0.5~/src/didi.h didiwiki-0.5/src/didi.h
 --- didiwiki-0.5~/src/didi.h	2009-07-23 14:34:34.000000000 +0200
 +++ didiwiki-0.5/src/didi.h	2009-07-23 14:34:34.000000000 +0200
diff --git a/debian/patches/60_bind_address.dpatch b/debian/patches/60_bind_address.patch
similarity index 91%
rename from debian/patches/60_bind_address.dpatch
rename to debian/patches/60_bind_address.patch
index e0ab7c6..8adcbeb 100644
--- a/debian/patches/60_bind_address.dpatch
+++ b/debian/patches/60_bind_address.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_bind_address.dpatch by Carlo Mandelli <camandel@gmail.com> and Ignace Mouzannar <mouzannar@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Implementation of the -l|--listen option that lets you bind to a 
-## DP: address other than the default "0.0.0.0"
+From: Carlo Mandelli <camandel@gmail.com> and Ignace Mouzannar <mouzannar@gmail.com>
+Subject: Implementation of the -l|--listen option that lets you bind to a
+ address other than the default "0.0.0.0"
 
-@DPATCH@
 diff -urNad didiwiki-0.5~/src/didi.c didiwiki-0.5/src/didi.c
 --- didiwiki-0.5~/src/didi.c	2009-07-23 14:33:33.000000000 +0200
 +++ didiwiki-0.5/src/didi.c	2009-07-23 14:33:33.000000000 +0200
diff --git a/debian/patches/70_usage.dpatch b/debian/patches/70_usage.patch
similarity index 84%
rename from debian/patches/70_usage.dpatch
rename to debian/patches/70_usage.patch
index 1090058..2ef8968 100644
--- a/debian/patches/70_usage.dpatch
+++ b/debian/patches/70_usage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_usage.dpatch by Ignace Mouzannar <mouzannar@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Usage() function implementation
+From: Ignace Mouzannar <mouzannar@gmail.com>
+Subject: Usage() function implementation
 
-@DPATCH@
 diff -urNad didiwiki-0.5~/src/didi.c didiwiki-0.5/src/didi.c
 --- didiwiki-0.5~/src/didi.c	2009-07-23 17:38:44.000000000 +0200
 +++ didiwiki-0.5/src/didi.c	2009-07-23 17:39:32.000000000 +0200
diff --git a/debian/patches/80_sigint_sigterm.dpatch b/debian/patches/80_sigint_sigterm.patch
similarity index 85%
rename from debian/patches/80_sigint_sigterm.dpatch
rename to debian/patches/80_sigint_sigterm.patch
index a4bbe97..66d1a5d 100644
--- a/debian/patches/80_sigint_sigterm.dpatch
+++ b/debian/patches/80_sigint_sigterm.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_sigint.dpatch by Ignace Mouzannar <mouzannar@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Implementation of a SIGINT handler in order to stop didiwiki cleanly
+From: Ignace Mouzannar <mouzannar@gmail.com>
+Subject: Implementation of a SIGINT handler in order to stop didiwiki cleanly
 
-@DPATCH@
 diff -urNad didiwiki-0.5~/src/http.c didiwiki-0.5/src/http.c
 --- didiwiki-0.5~/src/http.c	2009-07-24 17:19:53.000000000 +0200
 +++ didiwiki-0.5/src/http.c	2009-07-24 17:20:29.000000000 +0200
diff --git a/debian/patches/90_search_engine.dpatch b/debian/patches/90_search_engine.patch
similarity index 66%
rename from debian/patches/90_search_engine.dpatch
rename to debian/patches/90_search_engine.patch
index 4b06d80..41d2057 100644
--- a/debian/patches/90_search_engine.dpatch
+++ b/debian/patches/90_search_engine.patch
@@ -1,15 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_search_engine.dpatch by Carlo Mandelli <camandel@gmail.com> and
-## Ignace Mouzannar <mouzannar@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: - Make search case insensitive
-## DP: - Removes redirection to page when search terms are identical to 
-## DP;   a page name
-## DP: - If the search returns only one page, then it redirects the user there
-## DP: - This patch closes #536484
+From: Carlo Mandelli <camandel@gmail.com> and
+Subject: - Make search case insensitive
+- Removes redirection to page when search terms are identical to 
+- If the search returns only one page, then it redirects the user there
+- This patch closes #536484
 
-@DPATCH@
 diff -urNad didiwiki-0.5~/src/wiki.c didiwiki-0.5/src/wiki.c
 --- didiwiki-0.5~/src/wiki.c	2009-10-06 22:47:59.000000000 +0200
 +++ didiwiki-0.5/src/wiki.c	2009-10-06 22:49:07.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1fa4030
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+10_modified_code.patch
+20_redirect.patch
+30_preformatted.patch
+40_spelling.patch
+50_accesslog.patch
+60_bind_address.patch
+70_usage.patch
+80_sigint_sigterm.patch
+90_search_engine.patch
diff --git a/debian/rules b/debian/rules
index 4995e01..df2a090 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ DEB_DH_INSTALLINIT_ARGS := -R
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 install/didiwiki::
 	dh_install debian/styles.css etc/didiwiki/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
-- 
1.7.9.1

