CVS:oo-deb/debian changelog,1.338.2.25.2.25,1.338.2.25.2.26 control,1.175.2.8.2.15,1.175.2.8.2.16 control.in,1.142.2.6.2.16,1.142.2.6.2.17 rules,1.214.2.14.2.22,1.214.2.14.2.23

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv30235

Modified Files:
      Tag: OPENOFFICE_ORG680
	changelog control control.in rules 
Log Message:
use dh_python

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.14.2.22
retrieving revision 1.214.2.14.2.23
diff -u -d -r1.214.2.14.2.22 -r1.214.2.14.2.23
--- rules	16 Mar 2005 06:03:51 -0000	1.214.2.14.2.22
+++ rules	16 Mar 2005 12:01:42 -0000	1.214.2.14.2.23
@@ -72,7 +72,6 @@
 PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
 PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
 PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1")
-PYTHON_DEPENDS=python (>= $(PYMAJOR).$(PYMINOR)), python (<< $(PYMAJOR).$(PYMINORPLUS1))
 PYTHON_SITE:=debian/python-uno/usr/lib/python$(PYMAJOR).$(PYMINOR)/site-packages
 
 CURDIR ?= $(shell pwd)
@@ -546,6 +545,7 @@
 	dh_installdebconf
 	dh_installmime
 	dh_installmenu
+	dh_python
 	debian/scripts/installoverrides
 	dh_link
 	dh_strip
@@ -566,7 +566,6 @@
 # causes ldd crashes sometimes when used with fakeroot:
 #          -l $(PKGDIR)-bin/$(OPENOFFICEDIR)/program 
 	dh_gencontrol -- \
-		-V'python-depends=$(PYTHON_DEPENDS)' \
 		-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)' \
 		-V'base-version=$(UPSTREAM_VERSION)'
 #		-v1.1.1+1.1.2rc3-`dpkg-parsechangelog  | grep urgency \

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.16
retrieving revision 1.142.2.6.2.17
diff -u -d -r1.142.2.6.2.16 -r1.142.2.6.2.17
--- control.in	16 Mar 2005 10:43:50 -0000	1.142.2.6.2.16
+++ control.in	16 Mar 2005 12:01:42 -0000	1.142.2.6.2.17
@@ -196,7 +196,7 @@
 Section: python
 Architecture: i386 powerpc s390 sparc arm
 Enhances: openoffice.orgVER
-Depends: ${python-depends}, ${shlibs:Depends}, openoffice.orgVER-core (>> ${base-version})
+Depends: ${python:Depends}, ${shlibs:Depends}, openoffice.orgVER-core (>> ${base-version})
 Replaces: openoffice.orgVER-common (<< 1.9.82)
 Description: Python interface for OpenOffice.org
  The Python-UNO bridge allows to use the standard OpenOffice.org API 

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.25
retrieving revision 1.338.2.25.2.26
diff -u -d -r1.338.2.25.2.25 -r1.338.2.25.2.26
--- changelog	16 Mar 2005 05:17:08 -0000	1.338.2.25.2.25
+++ changelog	16 Mar 2005 12:01:41 -0000	1.338.2.25.2.26
@@ -48,6 +48,8 @@
    - work around the fact that dh_shlibdeps doesn't report anything on
      TLS/NPTL-enabled systems by setting LD_ASSUME_KERNEL="2.4.27" before
      executing it... [RE]
+   - use dh_python instead of setting the dependencies manually. And we miss
+     the postinst snippets without it anyway... [RE]
   * debian/usr/lib/*: add content (wrapper scripts) of java-gcj-compat
     1.0.14-0.0ubuntu4 except ../lib/tools.jar until we can build-depend on it
     in Debian (in NEW...).
@@ -55,7 +57,7 @@
     and fails if the javac alternative is set to gcj-wrapper-4.0, thanks again
     Matthias Klose [RE]
 
- -- Rene Engelhard <rene@debian.org>  Wed, 16 Mar 2005 05:40:10 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 16 Mar 2005 12:57:08 +0100
 
 openoffice.org2 (1.9.76-0pre) experimental; urgency=low
 

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.15
retrieving revision 1.175.2.8.2.16
diff -u -d -r1.175.2.8.2.15 -r1.175.2.8.2.16
--- control	16 Mar 2005 10:43:50 -0000	1.175.2.8.2.15
+++ control	16 Mar 2005 12:01:42 -0000	1.175.2.8.2.16
@@ -196,7 +196,7 @@
 Section: python
 Architecture: i386 powerpc s390 sparc arm
 Enhances: openoffice.org2
-Depends: ${python-depends}, ${shlibs:Depends}, openoffice.org2-core (>> ${base-version})
+Depends: ${python:Depends}, ${shlibs:Depends}, openoffice.org2-core (>> ${base-version})
 Replaces: openoffice.org2-common (<< 1.9.82)
 Description: Python interface for OpenOffice.org
  The Python-UNO bridge allows to use the standard OpenOffice.org API