--- pen-0.18.0.orig/debian/changelog
+++ pen-0.18.0/debian/changelog
@@ -0,0 +1,70 @@
+pen (0.18.0-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Drop patch about penctl.cgi since it has been applied upstream
+
+ -- Vincent Bernat <bernat@debian.org>  Sun, 18 May 2008 08:32:58 +0200
+
+pen (0.17.3-2) unstable; urgency=low
+
+  * Fix Gürkan email address
+  * Add a patch to fix some issues in penctl.cgi and ship it in
+    /usr/share/doc. Thanks to Reinhold Trocker for providing the patch
+    (Closes: #432565)
+
+ -- Vincent Bernat <bernat@debian.org>  Sat, 17 May 2008 09:47:56 +0200
+
+pen (0.17.3-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Adopt the package (Closes: #474577)
+  * Acknowledge NMU, thanks to Gürkan Sengün (Closes: #364807)
+  * debian/control:
+    + Adding Gürkan as an uploader
+    + Bump Standards-Version to 3.7.3
+    + Switch to debhelper 7
+    + Add Homepage field
+    + Add Vcs-* fields
+  * Clean up debian/rules
+  * Remove /usr/sbin from debian/dirs
+  * Remove ChangeLog from debian/docs (added automatically by
+    dh_installchangelogs)
+  * Add debian/compat
+  * Add debian/watch
+  * Turn debian/copyright into machine-readable format
+  * Fix manpages
+
+ -- Vincent Bernat <bernat@debian.org>  Sat, 10 May 2008 21:43:30 +0200
+
+pen (0.17.1-1) unstable; urgency=low
+
+  * QA upload.
+  * Changed maintainer to Debian QA Group, since Dominik Bittl's address is
+    bouncing.
+
+ -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Mon, 05 May 2008 09:31:11 +0200
+
+pen (0.17.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream version available. (Closes: #364807)
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu>  Mon, 16 Jul 2007 15:11:50 +0200
+
+pen (0.15.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #212317)
+
+ -- Dominik Bittl <umount@blackhat.umount.org>  Fri, 30 Jul 2004 10:25:48 +0200
+
+pen (0.10.1-2) unstable; urgency=low
+
+  * Fixed description (closes: #195127)
+
+ -- Dominik Bittl <db@umount.org>  Mon,  2 Jun 2003 10:55:17 +0200
+
+pen (0.10.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Dominik Bittl <db@umount.org>  Wed, 30 Apr 2003 10:56:54 +0200
--- pen-0.18.0.orig/debian/rules
+++ pen-0.18.0/debian/rules
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+build: patch build-stamp
+build-stamp:
+	dh build --before configure
+	dh_auto_configure -- --with-docdir=/usr/share/doc/pen
+	dh build --after configure
+	touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+	rm -f build-stamp
+	dh clean
+
+install: build
+	dh install --before docs
+	# Remove useless doc files
+	rm debian/pen/usr/share/doc/pen/COPYING
+	rm debian/pen/usr/share/doc/pen/ChangeLog
+	rm debian/pen/usr/share/doc/pen/AUTHORS
+	# Fix manual pages for hyphen problems
+	sed -i 's/\B-/\\-/g' debian/pen/usr/share/man/man1/*
+	dh install --before compress
+	dh_compress -Xpenctl.cgi
+	dh install --remaining
+
+binary-arch: install
+	dh binary-arch
+
+binary-indep: install
+	dh binary-indep
+
+binary: binary-arch binary-indep
--- pen-0.18.0.orig/debian/dirs
+++ pen-0.18.0/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- pen-0.18.0.orig/debian/compat
+++ pen-0.18.0/debian/compat
@@ -0,0 +1 @@
+7
--- pen-0.18.0.orig/debian/watch
+++ pen-0.18.0/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://siag.nu/pub/pen/pen-([\d\.]+)\.tar\.gz
--- pen-0.18.0.orig/debian/copyright
+++ pen-0.18.0/debian/copyright
@@ -0,0 +1,17 @@
+This package was downloaded from http://siag.nu/pen/ 
+
+Files: *
+Copyright: © 2000-2006 Ulric Eriksson <ulric@siag.nu>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+Files: debian/*
+Copyright: © 2002 Dominik Bittl <db@umount.org>
+           © 2008 Vincent Bernat <bernat@debian.org>
+License: GPL-2+
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'.
--- pen-0.18.0.orig/debian/control
+++ pen-0.18.0/debian/control
@@ -0,0 +1,19 @@
+Source: pen
+Section: net
+Priority: optional
+Maintainer: Vincent Bernat <bernat@debian.org>
+Uploaders: Gürkan Sengün <gurkan@phys.ethz.ch>
+Build-Depends: debhelper (>= 7), quilt
+Standards-Version: 3.7.3
+Homepage: http://siag.nu/pen/
+Vcs-Browser: http://git.debian.org/?p=collab-maint/pen.git
+Vcs-Git: git://git.debian.org/git/collab-maint/pen.git
+
+Package: pen
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Load balancer for "simple" tcp based protocols
+ pen works for tcp based protocols such as http or smtp.
+ It allows several servers to appear as one to the outside and automatically
+ detects servers that are down and distributes clients among the available
+ servers. This gives high availability and scalable performance.
--- pen-0.18.0.orig/debian/docs
+++ pen-0.18.0/debian/docs
@@ -0,0 +1,3 @@
+README
+HOWTO
+penctl.cgi
--- pen-0.18.0.orig/debian/patches/fix-manpages.patch
+++ pen-0.18.0/debian/patches/fix-manpages.patch
@@ -0,0 +1,71 @@
+diff --git a/mergelogs.1 b/mergelogs.1
+index bed8c29..4116adb 100644
+--- a/mergelogs.1
++++ b/mergelogs.1
+@@ -1,7 +1,7 @@
+ .TH MERGELOGS 1 LOCAL
+ 
+ .SH NAME
+-mergelogs
++mergelogs - merge and consolidate web server logs
+ 
+ .SH SYNOPSIS
+ .B mergelogs
+diff --git a/pen.1 b/pen.1
+index c0c8196..fa9813f 100644
+--- a/pen.1
++++ b/pen.1
+@@ -1,11 +1,13 @@
+ .TH PEN 1 LOCAL
+ 
+ .SH NAME
+-pen
++pen - Load balancer for "simple" tcp based protocols
+ 
+ .SH SYNOPSIS
+ .B pen
++.na
+ [-b sec] [-S N] [-c N] [-e host:port] [-t sec] [-x N] [-j dir] [-u user] [-F cfgfile] [-l logfile] [-p file ] [-w file] [-C port] [-T sec] [-HWXadfhnrs] [-o option] [-E certfile] [-K keyfile] [-G cacertfile] [-A cacertdir] [-Z] [-R] [-L protocol] [host:]port h1[:p1[:maxc1[:hard1[:weight1[:prio1]]]]] [h2[:p2[:maxc2[:hard2[:weight2[:prio2]]]]]] ...
++.ad
+ 
+ .SH EXAMPLE
+ pen 80 www1:8000:10 www2:80:10 www3
+diff --git a/penctl.1 b/penctl.1
+index 5b74f20..1ec1089 100644
+--- a/penctl.1
++++ b/penctl.1
+@@ -1,7 +1,7 @@
+ .TH PENCTL 1 LOCAL
+ 
+ .SH NAME
+-penctl
++penctl - control a running pen load balancer
+ 
+ .SH SYNOPSIS
+ .B penctl
+diff --git a/penlog.1 b/penlog.1
+index b24fcd0..7666a2b 100644
+--- a/penlog.1
++++ b/penlog.1
+@@ -1,7 +1,7 @@
+ .TH PENLOG 1 LOCAL
+ 
+ .SH NAME
+-penlog
++penlog - pipe Apache logs to penlogd
+ 
+ .SH SYNOPSIS
+ .B penlog
+diff --git a/penlogd.1 b/penlogd.1
+index 67787f2..b15b3d5 100644
+--- a/penlogd.1
++++ b/penlogd.1
+@@ -1,7 +1,7 @@
+ .TH PENLOGD 1 LOCAL
+ 
+ .SH NAME
+-penlogd
++penlogd - consolidate web server logs
+ 
+ .SH SYNOPSIS
+ .B penlogd
--- pen-0.18.0.orig/debian/patches/series
+++ pen-0.18.0/debian/patches/series
@@ -0,0 +1 @@
+fix-manpages.patch
