release JMC 0.3 beta2

11 files changed, 83 insertions, 98 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2b0a5c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.coverage
+*flymake.py
+.ropeproject
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..bfe797e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,32 @@
+PYTHON=`which python`
+DESTDIR=/
+BUILDIR=$(CURDIR)/debian/jcl
+PROJECT=jcl
+VERSION=0.1b2
+
+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:
+	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../
+	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
+	dpkg-buildpackage -i -I -rfakeroot
+
+clean:
+	$(PYTHON) setup.py clean
+	fakeroot $(MAKE) -f $(CURDIR)/debian/rules clean
+	rm -rf build/ MANIFEST
+	find . -name '*.pyc' -delete
diff --git a/debian/changelog b/debian/changelog
index c394a3e..50b5334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jmc (0.3b2) unstable; urgency=low
+
+  * JMC version 0.3 beta 2
+
+ -- David Rousselie <dax@happycoders.org>  Tue, 11 May 2010 19:56:41 +0200
+
 jmc (0.3b1) unstable; urgency=low
 
   * JMC version 0.3 beta 1
@@ -26,4 +32,3 @@ jmc (0.2.2-1) unstable; urgency=low
   * Initial Debian release
 
  -- David Rousselie <dax@happycoders.org>  Wed, 26 Jul 2006 23:07:24 +0200
-
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 51573f0..89fd0f8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,14 @@ Source: jmc
 Section: python
 Priority: optional
 Maintainer: David Rousselie <dax@happycoders.org>
-Build-Depends: python-setuptools (>= 0.6b3-1), python-all-dev (>= 2.3.5-11), debhelper (>= 5.0.38), python-central (>= 0.5.6)
-Standards-Version: 3.7.2
-XS-Python-Version: all
+Build-Depends: debhelper (>=7.0.50~), python-support (>= 0.6), cdbs (>= 0.4.49), python-all-dev
+Standards-Version: 3.8.4
 
 Package: python-jmc
 Architecture: all
-Depends: ${python:Depends}, python-jcl (>= 0.1)
-Recommends: 
-Suggests: 
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, python-jcl (= 0.1b2)
 Provides: ${python:Provides}
 Description: JMC is an email gateway for Jabber
- JMC is a jabber service to check email from POP3 and IMAP4 server and 
- retrieve them or just a notification of new emails. Jabber users can 
+ JMC is a jabber service to check email from POP3 and IMAP4 server and
+ retrieve them or just a notification of new emails. Jabber users can
  register multiple email accounts.
diff --git a/debian/init.d b/debian/init.d
index 70a32e3..23c65ab 100755
--- a/debian/init.d
+++ b/debian/init.d
@@ -1,7 +1,11 @@
 #! /bin/sh
-#
-# Jabber Mail Component startup script
-#
+### BEGIN INIT INFO
+# Provides:          jmc
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Jabber Mail Component
+# Description:       Start Jabber Mail Component daemon.
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/jmc
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..219112b
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.4-2.6
diff --git a/debian/rules b/debian/rules
index 2a31bc1..126c4fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,79 +1,10 @@
 #!/usr/bin/make -f
 
-# This file was automatically generated by stdeb 0.2.a1 at
-# Tue, 13 Nov 2007 19:00:04 +0100
+DEB_PYTHON_SYSTEM := pysupport
 
-PACKAGE_NAME=python-jmc
-MODULE_NAME=jmc
-DEB_UPSTREAM_VERSION=0.3b1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 
-PYVERS=$(shell pyversions -vr)
-
-build: build-stamp
-build-stamp: $(PYVERS:%=build-python%)
-	touch $@
-build-python%:
-# Force setuptools, but reset sys.argv[0] to 'setup.py' because setup.py files expect that.
-	python$* -c "import setuptools,sys;f='setup.py';sys.argv[0]=f;execfile(f,{'__file__':f,'__name__':'__main__'})" build
-	touch $@
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f *-stamp
-	rm -rf dist build
-	-find -name '*.py[co]' | xargs rm -f
-#	find . -name *.pyc -exec rm {} \;
+clean::
+	rm -rf build build-stamp configure-stamp MANIFEST
 	dh_clean
-
-install: build install-prereq $(PYVERS:%=install-python%)
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-install-python%:
-# Force setuptools, but reset sys.argv[0] to 'setup.py' because setup.py files expect that.
-	python$* -c "import setuptools,sys;f='setup.py';sys.argv[0]=f;execfile(f,{'__file__':f,'__name__':'__main__'})" install		 --no-compile --single-version-externally-managed		 --root $(CURDIR)/debian/${PACKAGE_NAME}
-	mv debian/${PACKAGE_NAME}/usr/lib/python$*/site-packages/${MODULE_NAME}-${DEB_UPSTREAM_VERSION}-py$*.egg-info		 debian/${PACKAGE_NAME}/usr/lib/python$*/site-packages/${MODULE_NAME}.egg-info
-
-binary-arch:
-	
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_pycentral -i
-	dh_install -i
-	dh_installinit -i
-	dh_install
-	dh_installdocs -i
-	dh_installdirs -i
-	dh_installexamples  -i
-	dh_strip -i
-	dh_compress -i -X.py
-	dh_fixperms -i
-	: # Replace all '#!' calls to python with $(PYTHON)
-	: # and make them executable
-	for i in \
-	  `find debian/python-jmc/usr/bin -type f` \
-	  `find debian/python-jmc/usr/lib -type f`; \
-	do \
-	  case "$$i" in *-[0-9].[0-9]) continue; esac; \
-	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
-		$$i > $$i.temp; \
-	  if cmp --quiet $$i $$i.temp; then \
-	    rm -f $$i.temp; \
-	  else \
-	    mv -f $$i.temp $$i; \
-	    chmod 755 $$i; \
-	    echo "fixed interpreter: $$i"; \
-	  fi; \
-	done
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep binary-arch
-
-
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/setup.py b/setup.py
index 3420846..e7eedd3 100644
--- a/setup.py
+++ b/setup.py
@@ -28,18 +28,25 @@ import shutil
 import os
 
 prefix = "/usr"
+root = "/"
 for arg in sys.argv:
     if arg[0:9] == "--prefix=":
         prefix = arg[9:]
         break
+for arg in sys.argv:
+    if arg[0:7] == "--root=":
+        root = arg[7:]
+        break
 
 if prefix == "/usr":
-    config_dir = "/etc/jabber/"
+    prefix_config_dir = "/etc/jabber/"
 else:
-    config_dir = prefix + "/etc/jabber/"
+    prefix_config_dir = prefix + "/etc/jabber/"
+config_dir = root + "/" + prefix_config_dir
+full_prefix = root + "/" + prefix
 
 setup(name='jmc',
-      version='0.3b1',
+      version='0.3b2',
       description='Jabber Mail Component',
       long_description="""\
 JMC is a jabber service to check email from POP3 and IMAP4 server and retrieve
@@ -68,19 +75,25 @@ email accounts.""",
                                              "tests"]),
       entry_points={'console_scripts': ['jmc=jmc.runner:main']},
       test_suite='jmc.tests.suite',
-      install_requires=["jcl==0.1b1"])
+      install_requires=["jcl==0.1b2"])
 
 if len(sys.argv) >= 2 and sys.argv[1] == "install" \
         and not "--single-version-externally-managed" in sys.argv:
-    os.makedirs(config_dir)
+    if not os.path.exists(config_dir):
+        os.makedirs(config_dir)
     shutil.copy("conf/jmc.conf", config_dir)
-    runner_file = open("src/jmc/runner.py")
-    dest_runner_file = open("build/lib/jmc/runner.py", "w")
+    runner_file_name = full_prefix + "/lib/python2.6/site-packages/jmc/runner.py"
+    runner_file = open(runner_file_name)
+    dest_runner_file_name = runner_file_name + ".tmp"
+    dest_runner_file = open(dest_runner_file_name, "w")
     config_file_re = re.compile("(.*self\.config_file = \")(jmc.conf\")")
     for line in runner_file:
         match = config_file_re.match(line)
         if match is not None:
-            dest_runner_file.write(match.group(1) + config_dir
+            dest_runner_file.write(match.group(1) + prefix_config_dir
                                    + match.group(2) + "\n")
         else:
             dest_runner_file.write(line)
+    dest_runner_file.close()
+    runner_file.close()
+    shutil.move(dest_runner_file_name, runner_file_name)
diff --git a/src/jmc.egg-info/PKG-INFO b/src/jmc.egg-info/PKG-INFO
index f76037e..ae173ed 100644
--- a/src/jmc.egg-info/PKG-INFO
+++ b/src/jmc.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: jmc
-Version: 0.3b1
+Version: 0.3b2
 Summary: Jabber Mail Component
 Home-page: http://people.happycoders.org/dax/projects/jmc
 Author: David Rousselie
diff --git a/src/jmc.egg-info/requires.txt b/src/jmc.egg-info/requires.txt
index 2579857..83dc97c 100644
--- a/src/jmc.egg-info/requires.txt
+++ b/src/jmc.egg-info/requires.txt
@@ -1 +1 @@
-jcl==0.1b1
\ No newline at end of file
+jcl==0.1b2
\ No newline at end of file