diff --git a/__pkginfo__.py b/__pkginfo__.py
index 9d683132468a340f87945ecbd6311e5367b911a7_X19wa2dpbmZvX18ucHk=..4fd38067d6d6419819bed3252e329a5ccbe3504c_X19wa2dpbmZvX18ucHk= 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -4,7 +4,7 @@
distname = "cubicweb-blog"
modname = distname.split('-', 1)[1]
-numversion = (1, 5, 1)
+numversion = (1, 6, 0)
version = '.'.join(str(num) for num in numversion)
license = 'LGPL'
diff --git a/debian/changelog b/debian/changelog
index 9d683132468a340f87945ecbd6311e5367b911a7_ZGViaWFuL2NoYW5nZWxvZw==..4fd38067d6d6419819bed3252e329a5ccbe3504c_ZGViaWFuL2NoYW5nZWxvZw== 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cubicweb-blog (1.6.0-1) unstable; urgency=low
+
+ * new upstream release depending on cubicweb 3.2
+ * rules: remove pythonX.Y/site-packages junk
+
+ --
+
cubicweb-blog (1.5.1-1) unstable; urgency=low
* new upstream release
@@ -33,7 +40,7 @@
* new upstream release
-- Laure Bourgois <Laure.Bourgois@logilab.fr> Mon, 01 Dec 2008 16:44:08 +0100
-
+
cubicweb-blog (1.3.0-1) DISTRIBUTION; urgency=low
* new upstream release
@@ -81,7 +88,7 @@
* add debian/compat and debian/pycompat files, remove DH_COMPAT from rules
* update standards version, fixed uploaders/maintainer/section in debian/control
* new upstream release
-
+
-- Sylvain Thénault <Sylvain.Thenault@logilab.fr> Wed, 26 Mar 2008 11:10:15 +0100
cubicweb-blog (1.0.0-1) DISTRIBUTION; urgency=low
diff --git a/debian/control b/debian/control
index 9d683132468a340f87945ecbd6311e5367b911a7_ZGViaWFuL2NvbnRyb2w=..4fd38067d6d6419819bed3252e329a5ccbe3504c_ZGViaWFuL2NvbnRyb2w= 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@
Architecture: all
Conflicts: erudi-blog, erudi-blog-server, erudi-blog-client, erudi-blog-comp
Replaces: erudi-blog, erudi-blog-server, erudi-blog-client, erudi-blog-comp
-Depends: cubicweb-common (>= 3.1.2)
+Depends: cubicweb-common (>= 3.2.0)
Description: blog support for the CubicWeb framework
CubicWeb is a semantic web application framework.
.
diff --git a/debian/rules b/debian/rules
index 9d683132468a340f87945ecbd6311e5367b911a7_ZGViaWFuL3J1bGVz..4fd38067d6d6419819bed3252e329a5ccbe3504c_ZGViaWFuL3J1bGVz 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
build: build-stamp
-build-stamp:
+build-stamp:
dh_testdir
python setup.py -q build
touch build-stamp
@@ -9,8 +9,8 @@
dh_testdir
python setup.py -q build
touch build-stamp
-clean:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -25,6 +25,7 @@
dh_clean -k
dh_installdirs -i
python setup.py -q install --no-compile --prefix=debian/cubicweb-blog/usr/
+ rm -rf debian/cubicweb-blog/usr/lib/python*
# Build architecture-independent files here.
@@ -32,9 +33,6 @@
dh_testdir
dh_testroot
dh_install -i
-# dh_pycentral -i
-# dh_python -i
-# gzip -9 -c ChangeLog > changelog.gz
dh_installchangelogs -i
dh_installexamples -i
dh_installdocs -i
@@ -43,9 +41,9 @@
dh_compress -i -X.py -X.ini -X.xml -Xtest
dh_fixperms -i
dh_installdeb -i
- dh_gencontrol -i
+ dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
# Build architecture-dependent files here.
@@ -47,7 +45,7 @@
dh_md5sums -i
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch:
+binary-arch:
@@ -53,3 +51,3 @@
-binary: binary-indep
+binary: binary-indep
.PHONY: build clean binary-arch binary-indep binary
diff --git a/setup.py b/setup.py
index 9d683132468a340f87945ecbd6311e5367b911a7_c2V0dXAucHk=..4fd38067d6d6419819bed3252e329a5ccbe3504c_c2V0dXAucHk= 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,4 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
""" Generic Setup script, takes package info from __pkginfo__.py file """
-import os
-import sys
-import shutil
from distutils.core import setup
@@ -23,10 +20,7 @@
from distutils.core import setup
-from distutils import command
-from distutils.command import install_lib
-from os.path import isdir, exists, join, walk
# import required features
from __pkginfo__ import distname, version, license, short_desc, long_desc, \
web, author, author_email
# import optional features
try:
@@ -27,17 +21,9 @@
# import required features
from __pkginfo__ import distname, version, license, short_desc, long_desc, \
web, author, author_email
# import optional features
try:
- from __pkginfo__ import distname
-except ImportError:
- distname = distname
-try:
- from __pkginfo__ import scripts
-except ImportError:
- scripts = []
-try:
from __pkginfo__ import data_files
except ImportError:
data_files = None
@@ -46,25 +32,8 @@
except ImportError:
include_dirs = []
-BASE_BLACKLIST = ('CVS', 'debian', 'dist', 'build', '__buildlog')
-IGNORED_EXTENSIONS = ('.pyc', '.pyo', '.elc')
-
-
-def ensure_scripts(linux_scripts):
- """creates the proper script names required for each platform
- (taken from 4Suite)
- """
- from distutils import util
- if util.get_platform()[:3] == 'win':
- scripts_ = [script + '.bat' for script in linux_scripts]
- else:
- scripts_ = linux_scripts
- return scripts_
-
-
-
def install(**kwargs):
"""setup entry point"""
#kwargs['distname'] = modname
return setup(name=distname,
version=version,
@@ -66,11 +35,11 @@
def install(**kwargs):
"""setup entry point"""
#kwargs['distname'] = modname
return setup(name=distname,
version=version,
- license =license,
+ license=license,
description=short_desc,
long_description=long_desc,
author=author,
author_email=author_email,
url=web,
@@ -72,9 +41,8 @@
description=short_desc,
long_description=long_desc,
author=author,
author_email=author_email,
url=web,
- scripts=ensure_scripts(scripts),
data_files=data_files,
**kwargs)