one package to rule them all

debian/control

@@ -4,7 +4,7 @@
 Maintainer: Logilab Packaging Team <contact@logilab.fr>
 Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr> 
 Build-Depends: debhelper (>= 5.0.37.1), python (>=2.4), python-dev (>=2.4)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: cubicweb-email
 Architecture: all
@@ -8,27 +8,11 @@
 
 Package: cubicweb-email
 Architecture: all
-Depends: cubicweb-email-server (>= ${source:Version}), cubicweb-email-client (>= ${source:Version})
-Description: Email support for the CubicWeb framework
- CubicWeb is a entities / relations based knowledge management system
- developed at Logilab.
- .
- This package provides schema and views to store emails in cubicweb
- applications.
- .
- This package will install all the components you need to use the
- email component on a single machine. You can also deploy cubicweb by
- running the different process on different computers, in which case
- you need to install the corresponding packages on the different
- hosts.
-
-
-Package: cubicweb-email-server
-Architecture: all
-Depends: cubicweb-server (>= 2.50.0), cubicweb-file-server, cubicweb-email-comp (>= ${source:Version})
-Description: Email support for the CubicWeb framework (repository)
- CubicWeb is a entities / relations bases knowledge management system
- developed at Logilab.
+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.0.0), cubicweb-file
+Description: email support for the CubicWeb framework
+ CubicWeb is a semantic web application framework.
  .
  This package provides schema and views to store emails in cubicweb
  applications.
@@ -32,37 +16,3 @@
  .
  This package provides schema and views to store emails in cubicweb
  applications.
- .
- This package is a virtual package providing necessary package for the
- repository server part of the email component for CubicWeb.
-
-
-Package: cubicweb-email-client
-Architecture: all
-Depends: cubicweb-twisted (>= 2.50.0) | cubicweb-web-frontend, cubicweb-file-client, cubicweb-email-comp (>= ${source:Version})
-Description: Email support for the CubicWeb framework (web)
- CubicWeb is a entities / relations bases knowledge management system
- developed at Logilab.
- .
- This package provides schema and views to store emails in cubicweb
- applications.
- .
- This package is a virtual package providing necessary package for the
- web client part of the email component for CubicWeb. 
-
- 
-Package: cubicweb-email-comp
-Architecture: all
-Depends: python2.4
-Description: Email support for the CubicWeb framework
- CubicWeb is a entities / relations based knowledge management system
- developed at Logilab.
- .
- This package provides schema and views to store emails in cubicweb
- applications.
- .
- This package will install all the components you need to use the
- email component on a single machine. You can also deploy cubicweb by
- running the different process on different computers, in which case
- you need to install the corresponding packages on the different
- hosts.

debian/rules

@@ -24,8 +24,8 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -i
-	python setup.py -q install --no-compile --prefix=debian/cubicweb-email-comp/usr/
-	cp doc/*.html doc/*.txt debian/cubicweb-email-comp/usr/share/doc/cubicweb-email-comp/
+	python setup.py -q install --no-compile --prefix=debian/cubicweb-email/usr/
+	cp doc/*.html doc/*.txt debian/cubicweb-email/usr/share/doc/cubicweb-email/
 
 
 # Build architecture-independent files here.