klone (2.1.0~rc1-1) debian-dir only changes

--- klone-2.1.0~rc1.orig/debian/klone.install
+++ klone-2.1.0~rc1/debian/klone.install
@@ -0,0 +1,2 @@
+debian/klone-source.tar.bz2	usr/src/
+build/dist/klone-core-*.tar.gz	usr/src/
--- klone-2.1.0~rc1.orig/debian/klone.manpages
+++ klone-2.1.0~rc1/debian/klone.manpages
@@ -0,0 +1,3 @@
+klone-core-*/doc/man/klone.1
+klone-core-*/doc/man/kloned.8
+klone-core-*/doc/man/kloned.conf.5
--- klone-2.1.0~rc1.orig/debian/compat
+++ klone-2.1.0~rc1/debian/compat
@@ -0,0 +1 @@
+5
--- klone-2.1.0~rc1.orig/debian/rules
+++ klone-2.1.0~rc1/debian/rules
@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+VER := $(shell dh_testdir && ls build/dist/klone-core-*.tar* | head -n 1 | perl -ne 'print $$1 if /klone-core-(.*)\.tar\.gz/;')
+
+build: build-stamp
+
+build-stamp:
+	dh_testdir
+	tar zxf "build/dist/klone-core-$(VER).tar.gz"
+	test -e "klone-source" || ln -s . klone-source
+	test -e "build/dist/klone-core-$(VER).tar.gz.orig" || mv "build/dist/klone-core-$(VER).tar.gz" "build/dist/klone-core-$(VER).tar.gz.orig"
+	test -L "build/dist/klone-core-$(VER).tar.gz" || ln -s "/usr/src/klone-core-$(VER).tar.gz" "build/dist/klone-core-$(VER).tar.gz"
+	tar cf debian/klone-source.tar.bz2 --bzip2 --exclude=klone-source/klone-source --exclude=klone-source/debian --exclude=klone-source/build/dist/klone-*orig --exclude="klone-core-$(VER)" klone-source/*
+	test ! -L "build/dist/klone-core-$(VER).tar.gz" || rm "build/dist/klone-core-$(VER).tar.gz"
+	test ! -e "build/dist/klone-core-$(VER).tar.gz.orig" || mv "build/dist/klone-core-$(VER).tar.gz.orig" "build/dist/klone-core-$(VER).tar.gz"
+	rm -f klone-source
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f debian/klone-source.tar.bz2 klone-source
+	rm -f build-stamp
+	rm -rf klone-core-*
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs -XMakefile -XCVS
+	dh_installexamples
+	dh_install
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install unapply-patches
--- klone-2.1.0~rc1.orig/debian/changelog
+++ klone-2.1.0~rc1/debian/changelog
@@ -0,0 +1,50 @@
+klone (2.1.0~rc1-1) unstable; urgency=high
+
+  * New upstream release
+  * Urgency high due to a fix to a remote buffer overflow vulnerability.
+  * Merged the klone and klone-doc packages since there was almost
+    nothing left in the latter.
+
+ -- Kari Pahula <kaol@debian.org>  Tue, 29 Apr 2008 09:43:02 +0300
+
+klone (2.0.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Kari Pahula <kaol@debian.org>  Tue, 18 Mar 2008 19:22:29 +0200
+
+klone (2.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Kari Pahula <kaol@debian.org>  Wed, 27 Feb 2008 13:00:42 +0200
+
+klone (2.0.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Kari Pahula <kaol@debian.org>  Sun, 11 Nov 2007 16:30:47 +0200
+
+klone (2.0.0~rc10-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed klone package and replaced it with klone-source (which was
+    renamed as klone).
+  * klone package now installs two tarballs in /usr/src, one which has the
+    webapp build framework and the other klone's core files.
+
+ -- Kari Pahula <kaol@debian.org>  Sun, 16 Sep 2007 18:16:31 +0300
+
+klone (1.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * klone-doc changed to section: doc
+
+ -- Kari Pahula <kaol@debian.org>  Wed,  7 Feb 2007 19:25:44 +0200
+
+klone (1.1.1.dfsg1-1) unstable; urgency=low
+
+  * Initial release Closes: #366984
+
+ -- Kari Pahula <kaol@debian.org>  Sat, 13 May 2006 01:16:00 +0300
+
--- klone-2.1.0~rc1.orig/debian/klone.dirs
+++ klone-2.1.0~rc1/debian/klone.dirs
@@ -0,0 +1 @@
+usr/src
--- klone-2.1.0~rc1.orig/debian/klone.examples
+++ klone-2.1.0~rc1/debian/klone.examples
@@ -0,0 +1,2 @@
+klone-core-*/doc/var/*.klone
+klone-core-*/etc/*
--- klone-2.1.0~rc1.orig/debian/control
+++ klone-2.1.0~rc1/debian/control
@@ -0,0 +1,45 @@
+Source: klone
+Section: web
+Priority: extra
+Maintainer: Kari Pahula <kaol@debian.org>
+Build-Depends: debhelper (>= 5), bzip2
+Standards-Version: 3.7.3
+Homepage: http://www.koanlogic.com/klone/
+
+Package: klone
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: klone-package
+Replaces: klone-source
+Conflicts: klone-source, klone-package (<= 0.2)
+Suggests: klone-doc
+Description: embedded web application development framework
+ This package contains KLone's source code, to be used to build custom
+ kloned servers.
+ .
+ KLone is a fully-featured, multiplatform, web application development
+ framework, targeted especially for embedded systems and appliances.
+ .
+ It is a self-contained solution which includes a web server and an SDK
+ for creating WWW sites with both static and dynamic content. When
+ using KLone, there's absolutely no need for any additional component:
+ neither the HTTP/S server (e.g. Apache, Netscape, Roxen), nor the
+ typical active pages engine (PHP, Perl, ASP, Python).
+ .
+ KLone does everything, and does it fast and small.
+ .
+ KLone blends the HTTP/S server application together with its content
+ and configuration into a single executable file. The site developer
+ writes his/her dynamic pages in C/C++ (in usual scripting style: <% /*
+ code */ %>) and uses KLone to transform them into embeddable,
+ compressed native code with the native C/C++ compiler. The result is
+ then linked to the HTTP/S server skeleton to obtain one single,
+ ROM-able, binary file. This means that he/she can get:
+  - easy, complete and unfiltered interaction with the host operating
+      system
+  - dynamic pages in native compiled code, which in turn implies
+  - fast execution and
+  - small overall application footprint
+  - all of this without giving up the common functionality of web
+      application frameworks such as sessions, parsing of form
+      variables, cookies, etc
--- klone-2.1.0~rc1.orig/debian/klone.docs
+++ klone-2.1.0~rc1/debian/klone.docs
@@ -0,0 +1 @@
+klone-core-*/doc/example-site/
--- klone-2.1.0~rc1.orig/debian/klone-doc.debhelper.log
+++ klone-2.1.0~rc1/debian/klone-doc.debhelper.log
@@ -0,0 +1,20 @@
+dh_testdir
+dh_testdir
+dh_testdir
+dh_testdir
+dh_installdirs
+dh_testdir
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_install
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
--- klone-2.1.0~rc1.orig/debian/copyright
+++ klone-2.1.0~rc1/debian/copyright
@@ -0,0 +1,102 @@
+This package was debianized by Kari Pahula <kaol@debian.org> on
+Wed, 10 May 2006 17:29:00 +0300.
+
+It was downloaded from http://www.koanlogic.com/klone/
+
+Copyright 2005-2008 KoanLogic srl
+
+License:
+
+   This package 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 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+   In addition, as a special exception, the copyright holders give
+   permission to link the code of portions of this program with the
+   OpenSSL library under certain conditions as described in each
+   individual source file, and distribute linked combinations
+   including the two.
+   You must obey the GNU General Public License in all respects
+   for all of the code used other than OpenSSL.  If you modify
+   file(s) with this exception, you may extend this exception to your
+   version of the file(s), but you are not obligated to do so.  If you
+   do not wish to do so, delete this exception statement from your
+   version.  If you delete this exception statement from all source
+   files in the program, then also delete it here.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+This package incorporates libu and MaKL, whose license is:
+
+  Copyright (c) 2005-2007 by KoanLogic srl
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this 
+  list of conditions and the following disclaimer.  
+
+  Redistributions in binary form must reproduce the above copyright notice, 
+  this list of conditions and the following disclaimer in the documentation 
+  and/or other materials provided with the distribution.
+
+  Neither the name of the KoanLogic srl nor the names of its contributors may 
+  be used to endorse or promote products derived from this software without 
+  specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+  POSSIBILITY OF SUCH DAMAGE.
+
+MaKL includes scripts lorder and mkdep.gcc.sh.
+
+Copyright (c) 1990, 1991, 1993
+       The Regents of the University of California.  All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+       This product includes software developed by the University of
+       California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
--- klone-2.1.0~rc1.orig/debian/patches/libssl_disabled
+++ klone-2.1.0~rc1/debian/patches/libssl_disabled
@@ -0,0 +1,13 @@
+Index: klone-1.1.0.dfsg1/configure
+===================================================================
+--- klone-1.1.0.dfsg1.orig/configure	2006-05-21 14:27:51.000000000 +0300
++++ klone-1.1.0.dfsg1/configure	2006-05-21 14:28:13.000000000 +0300
+@@ -91,7 +91,7 @@
+ makl_checkheader        0   "unistd"    "<unistd.h>"
+ 
+ # Library dependencies
+-makl_optional           1   "lib"   "openssl"   ""  "-lssl -lcrypto"
++#makl_optional           1   "lib"   "openssl"   ""  "-lssl -lcrypto"
+ makl_optional           1   "lib"   "z"
+ 
+ # Function dependencies
--- klone-2.1.0~rc1.orig/debian/patches/series
+++ klone-2.1.0~rc1/debian/patches/series
@@ -0,0 +1 @@
+contrib_deleted
--- klone-2.1.0~rc1.orig/debian/patches/contrib_deleted
+++ klone-2.1.0~rc1/debian/patches/contrib_deleted
@@ -0,0 +1,11 @@
+Index: klone-1.1.0.dfsg1/Makefile.subdir
+===================================================================
+--- klone-1.1.0.dfsg1.orig/Makefile.subdir	2006-05-21 14:25:41.000000000 +0300
++++ klone-1.1.0.dfsg1/Makefile.subdir	2006-05-21 14:26:12.000000000 +0300
+@@ -1,5 +1,5 @@
+ # $Id: Makefile.subdir,v 1.1 2006/01/23 10:03:16 tho Exp $
+ 
+-SUBDIR = build/libu webapp site src klone contrib doc
++SUBDIR = build/libu webapp site src klone doc
+ 
+ include subdir.mk