r1053 - in zope3/trunk/debian (control rules)

[Fabio Tranchitella]

    Date: Friday, November 30, 2007 @ 11:52:44
  Author: kobold
Revision: 1053

Fixed a few lintian warnings.

Modified:
  zope3/trunk/debian/control
  zope3/trunk/debian/rules

Modified: zope3/trunk/debian/control
===================================================================
--- zope3/trunk/debian/control	2007-11-30 11:43:57 UTC (rev 1052)
+++ zope3/trunk/debian/control	2007-11-30 11:52:44 UTC (rev 1053)
@@ -12,7 +12,7 @@
 Section: python
 Architecture: any
 Pre-Depends: zope-common
-Depends: python2.4 (>= 2.4.2), python-zopeinterface (= ${Source-Version}), ${shlibs:Depends}, python-docutils (>= 0.3.7) | python2.4-docutils (>= 0.3.7), python-tz (>= 2006g-1), python-mechanize (>= 0.1.2b-1), python-clientform (>= 0.2.2-2), python-twisted-conch (>= 1:0.8), python-twisted-web2 (>= 0.2.0+svn20070403), python-xml (>= 0.8.4-5), lsb-base
+Depends: python2.4 (>= 2.4.2), python-zopeinterface (= ${source:Version}), ${shlibs:Depends}, python-docutils (>= 0.3.7) | python2.4-docutils (>= 0.3.7), python-tz (>= 2006g-1), python-mechanize (>= 0.1.2b-1), python-clientform (>= 0.2.2-2), python-twisted-conch (>= 1:0.8), python-twisted-web2 (>= 0.2.0+svn20070403), python-xml (>= 0.8.4-5), lsb-base
 Conflicts: zopex3-lib, zope3-lib
 Replaces: zopex3-lib, zope3-lib
 Provides: zope3-lib
@@ -40,7 +40,7 @@
 Section: python
 Architecture: any
 Pre-Depends: zope-common
-Depends: zope3 (= ${Source-Version}), python-dbg, python-zopeinterface-dbg, python-xml-dbg, python-crypto-dbg, python-twisted-bin-dbg, ${shlibs:Depends}
+Depends: zope3 (= ${source:Version}), python-dbg, python-zopeinterface-dbg, python-xml-dbg, python-crypto-dbg, python-twisted-bin-dbg, ${shlibs:Depends}
 Description: Open Source Web Application Server (debug extensions)
  Zope is an open source web application server primarily written in
  the Python programming language. It features a transactional object
@@ -62,7 +62,7 @@
 Section: web
 Architecture: all
 Depends: ${zope:Depends}, ${misc:Depends}
-Recommends: zope3-doc (>= ${Source-Version})
+Recommends: zope3-doc (>= ${source:Version})
 Description: sandbox instance for the zope3 web application server
  Package which creates a "sandbox" instance, getting all Zope
  products and packages available which are installed as Debian packages.
@@ -87,7 +87,7 @@
 Priority: extra
 Section: python
 Architecture: any
-Depends: python-zopeinterface (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Depends: python-zopeinterface (= ${source:Version}), python-dbg, ${shlibs:Depends}
 Description: The implementation of interface definitions for Zope 3 (debug extension)
  Zope interfaces are objects that specify (document) the external behavior
  of objects that "provide" them.

Modified: zope3/trunk/debian/rules
===================================================================
--- zope3/trunk/debian/rules	2007-11-30 11:43:57 UTC (rev 1052)
+++ zope3/trunk/debian/rules	2007-11-30 11:52:44 UTC (rev 1053)
@@ -15,7 +15,6 @@
 
 zbase	 = Zope-3.3.1
 
-PWD		 := $(shell pwd)
 PV		 := 2.4
 ZVER     := 3
 PYVER	 := python$(PV)
@@ -151,7 +150,7 @@
 	dh_installdirs
 	dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
 	cd z && $(PYTHON) install.py install \
-	    --skip-build --no-compile --root $(PWD)/$(d)
+	    --skip-build --no-compile --root $(CURDIR)/$(d)
 	-find $(d) -name '*.py[co]' | xargs -n 100 rm -f
 	rm -rf $(d)/$(pylibdir)/twisted
 
@@ -193,7 +192,7 @@
 
 install-zope-dbg:
 	cd zdbg && $(PYTHON)-dbg install.py install \
-	    --skip-build --no-compile --root $(PWD)/$(d_libdbg)
+	    --skip-build --no-compile --root $(CURDIR)/$(d_libdbg)
 	find $(d_libdbg) ! -type d ! -name '*.so' | xargs rm -f
 	find $(d_libdbg) -depth -empty -exec rmdir {} \;
 	rm -rf debian/zope3-dbg/usr/lib/python*/site-packages/zope/interface
@@ -201,7 +200,7 @@
 install-zif-python%:
 	# install zopeinterface packages
 	cd z/Dependencies/zope.interface-$(zbase) \
-	    && /usr/bin/python$* setup.py install --root=$(PWD)/$(d_zif)
+	    && /usr/bin/python$* setup.py install --root=$(CURDIR)/$(d_zif)
 	-find debian/python-zopeinterface -name '*.py[co]' | xargs rm -f
 
 	# Copy README.txt to the right place
@@ -216,7 +215,7 @@
 
 	# debug extension
 	cd z/Dependencies/zope.interface-$(zbase) \
-	    && /usr/bin/python$*-dbg setup.py install --root=$(PWD)/$(d_zifdbg)
+	    && /usr/bin/python$*-dbg setup.py install --root=$(CURDIR)/$(d_zifdbg)
 	find $(d_zifdbg) ! -type d ! -name '*_d.so' | xargs rm -f
 	find $(d_zifdbg) -depth -empty -exec rmdir {} \;
 
@@ -273,6 +272,9 @@
 	   debian/zope3/usr/share/doc/zope3/README.Ubuntu
 	mv debian/zope3/usr/share/doc/zope3/NEWS.Debian \
 	   debian/zope3/usr/share/doc/zope3/NEWS.Ubuntu
+	gzip -9 debian/zope3/usr/share/doc/zope3/NEWS.Ubuntu
+else
+	gzip -9 debian/zope3/usr/share/doc/zope3/NEWS.Debian
 endif
 	rm -rf $(d_zifdbg)/usr/share/doc/$(p_zifdbg)
 	ln -s $(p_zif) $(d_zifdbg)/usr/share/doc/$(p_zifdbg)