Merge branch 'debian' into testing

Conflicts:
	setup.py

.gitignore

@@ -10,6 +10,9 @@ docs/plugins
 *.swo
 *~
 *.mo
+debian/limnoria*
+debian/python-module-stampdir/
+dist/
 push.sh
 merge.sh
 src/version.py

Makefile

@@ -0,0 +1,36 @@
+PYTHON=`which python`
+DESTDIR=/
+BUILDIR=$(CURDIR)/debian/limnoria
+PROJECT=limnoria
+VERSION=0.83.4.1+limnoria1
+
+all:
+	@echo "make source - Create source package"
+	@echo "make install - Install on local system"
+	@echo "make buildrpm - Generate a rpm package"
+	@echo "make builddeb - Generate a deb package"
+	@echo "make clean - Get rid of scratch and byte files"
+
+source:
+	$(PYTHON) setup.py sdist $(COMPILE)
+
+install:
+	$(PYTHON) setup.py install --root $(DESTDIR) $(COMPILE)
+
+buildrpm:
+	$(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall
+
+builddeb:
+	# build the source package in the parent directory
+	# then rename it to project_version.orig.tar.gz
+	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../ --prune
+	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
+	# build the package
+	dpkg-buildpackage -i -I -rfakeroot
+
+clean:
+	$(PYTHON) setup.py clean
+	$(MAKE) -f $(CURDIR)/debian/rules clean
+	rm -rf build/ MANIFEST
+	find . -name '*.pyc' -delete
+	

debian/changelog

@@ -0,0 +1,11 @@
+limnoria (0.83.4.1+limnoria2) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Valentin Lorentz <progval@progval.net>  Sun, 23 Jun 2012 17:47:00 +0200
+
+limnoria (0.83.4.1+limnoria1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Valentin Lorentz <progval@gmail.com>  Sun, 21 Aug 2011 20:58:51 +0200

debian/control

@@ -0,0 +1,23 @@
+Source: limnoria
+Section: net
+Priority: optional
+Maintainer: Valentin Lorentz <progval@progval.net>
+Build-Depends: debhelper (>=3.9.2), python-support (>= 0.6), cdbs (>= 0.4.49), python (>=2.6), python-setuptools
+XS-Python-Version: >=2.6
+Standards-Version: 3.9.2
+
+Package: limnoria
+Architecture: all
+Depends: python (>= 2.6), python-support (>= 0.90.0), ${misc:Depends}
+Recommends: python-simplejson, python-feedparser, python-sqlite3
+Suggests: python-twisted-core, python-twisted-names, python-dictclient, python-dateutil
+Conflicts: supybot
+Provides: supybot
+Section: net
+Priority: optional
+Homepage: https://github.com/ProgVal/Limnoria
+Description: Fork of the robust and user-friendly Python IRC bot Supybot.
+ It provides several enhancements, such as internationalization and
+ embedded HTTP server available to plugins. All plugins written for
+ Supybot are still compatible with Limnoria.
+

debian/copyright

@@ -0,0 +1,45 @@
+Upstream Author:
+
+	Jeremiah Fincher and others
+
+Files: *
+Copyright:
+	2002-2011 Jeremiah Fincher and others
+License: BSD
+
+Files: debian/*
+Copyright:
+	2002-2009, James Vega
+	2011, Valentin Lorentz
+License: BSD
+
+License: BSD
+
+Copyright (c) 2002-2009 Jeremiah Fincher and others
+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 author of this software nor the name of
+      contributors to this software 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.
+
+Portions of the included source code are copyright by its original author(s)
+and remain subject to its associated license.

debian/postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+#DEBHELPER#

debian/prerm

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+#DEBHELPER#

debian/rules

@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+DEB_PYTHON_SYSTEM := pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+clean::
+	rm -rf build build-stamp configure-stamp build/ MANIFEST
+	dh_clean

setup.py

@@ -191,7 +191,15 @@ setup(
              'scripts/supybot-adduser',
              'scripts/supybot-plugin-doc',
              'scripts/supybot-plugin-create',
-             ]
+             ],
+    data_files=[('share/man/man1', ['docs/man/supybot.1']),
+                ('share/man/man1', ['docs/man/supybot-test.1']),
+                ('share/man/man1', ['docs/man/supybot-botchk.1']),
+                ('share/man/man1', ['docs/man/supybot-wizard.1']),
+                ('share/man/man1', ['docs/man/supybot-adduser.1']),
+                ('share/man/man1', ['docs/man/supybot-plugin-doc.1']),
+                ('share/man/man1', ['docs/man/supybot-plugin-create.1']),
+        ]
     )