Renaming tinyerp-server to new upstream openerp-server name.

bzr revid: p_christ@hol.gr-20090421090637-jb0iig58x7vtqjdo

4 files changed, 25 insertions, 14 deletions

diff --git a/debian/control b/debian/control
index cb17a747d9f..21997877b8c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: tinyerp-server
+Source: openerp-server
 Section: net
 Priority: optional
 Maintainer: Daniel Baumann <daniel@debian.org>
@@ -9,13 +9,14 @@ Homepage: http://www.openerp.com/
 Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git
 Vcs-Git: git://git.debian.net/git/debian/openerp-server.git
 
-Package: tinyerp-server
+Package: openerp-server
 Section: net
 Architecture: all
 Depends: ${misc:Depends}, adduser, python, python-libxml2, python-libxslt1, python-psycopg, python-reportlab, python-tz
+Conflicts: tinyerp-server (<< 5.0.0~alpha-2)
+Replaces: tinyerp-server
 Recommends: graphviz, postgresql, postgresql-client, python-imaging, python-pyparsing
-Provides: openerp-server
-Suggests: tinyerp-client
+Suggests: openerp-client
 Description: Enterprise Resource Management (server)
  OpenERP is a complete ERP and CRM. The main features are accounting (analytic
  and financial), stock management, sales and purchases management, tasks
@@ -23,5 +24,15 @@ Description: Enterprise Resource Management (server)
  include a distributed server, flexible workflows, an object database, a dynamic
  GUI, customizable reports, and NET-RPC and XML-RPC interfaces.
  .
- This package contains the OpenERP server, install tinyerp-client package for
+ This package contains the OpenERP server, install openerp-client package for
  the client.
+
+Package: tinyerp-server
+Architecture: all
+Depends: openerp-server
+Description: Enterprise Resource Management (server; transitional package)
+ Package to ease upgrading from older tinyerp-server packages to the new
+ openerp-server package.
+ .
+ This package can be purged at anytime once the openerp-server package has been
+ installed.
diff --git a/debian/openerp-server.init b/debian/init
index 5a0946e002d..5a0946e002d 100644
--- a/debian/openerp-server.init
+++ b/debian/init
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 0586695f2e9..b99e0ccf133 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,3 +1,3 @@
 # Add-on directories needs data directories, and sometimes they are
 # (intentionally) empty, hence overriting the lintian warning.
-tinyerp-server: package-contains-empty-directory
+openerp-server: package-contains-empty-directory
diff --git a/debian/rules b/debian/rules
index b06842e76bb..d56e2ad3c0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,21 +23,21 @@ install: build
 	dh_prep
 	dh_installdirs
 
-	python setup.py install --no-compile --prefix=$(CURDIR)/debian/tinyerp-server/usr
+	python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
 
 	# Adjusting program location
-	sed -i -e 's|python.*/site-packages/||' debian/tinyerp-server/usr/bin/openerp-server
-	mv debian/tinyerp-server/usr/lib/python*/site-packages/openerp-server debian/tinyerp-server/usr/lib
-	rm -rf debian/tinyerp-server/usr/lib/python*
+	sed -i -e 's|python.*/site-packages/||' debian/openerp-server/usr/bin/openerp-server
+	mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib
+	rm -rf debian/openerp-server/usr/lib/python*
 
 	# Workaround for bug in setup.py
-	mv debian/tinyerp-server/usr/import_xml.rng debian/tinyerp-server/usr/lib/openerp-server
+	mv debian/openerp-server/usr/import_xml.rng debian/openerp-server/usr/lib/openerp-server
 
 	# Fixing permissions
-	find debian/tinyerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
+	find debian/openerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
 
 	# Removing double files
-	rm -rf debian/tinyerp-server/usr/share/doc/openerp-server-*
+	rm -rf debian/openerp-server/usr/share/doc/openerp-server-*
 
 binary: binary-indep
 
@@ -49,7 +49,7 @@ binary-indep: build install
 	dh_installchangelogs doc/Changelog
 	dh_installdocs
 	dh_install
-	dh_installinit --name=openerp-server --update-rcd-params='defaults 21'
+	dh_installinit --update-rcd-params='defaults 21'
 	dh_lintian
 	dh_link
 	dh_compress