CVS:oo-deb/debian changelog,1.375,1.376 control,1.189,1.190 control.in,1.156,1.157

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

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

Modified Files:
	changelog control control.in 
Log Message:
1.1.2.dfsg.1 is > 1.1.2+1.1.3, breaks exsisting -java for 1.1.2 installs,
rename to 1.1.2dfsg1 and restore old control[.in] entries for -java


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- changelog	29 Oct 2004 18:35:06 -0000	1.375
+++ changelog	30 Oct 2004 14:35:16 -0000	1.376
@@ -1,4 +1,4 @@
-openoffice.org (1.1.2.dfsg.1-1) unstable; urgency=medium
+openoffice.org (1.1.2dfsg1-1) unstable; urgency=medium
 
    * Remove non-free stuff from the .orig.tar.gz: [RE]
      - neon/download/neon-0.23.5.tar.gz: contains FDL docs...
@@ -16,7 +16,6 @@
       (closes: #275968)
    * debian/control.in:
      - remove Jan-Hendrik Palic from Uploaders: [RE]
-     - fix -java conflicts to cope with 1.1.2.dfsg.1 [RE]
    * debian/rules:
      - add LIBSUFFIX as defined in debian/scripts/vars.$(ARCH) to the
        maintainer scripts [RE]

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- control.in	29 Oct 2004 18:35:06 -0000	1.156
+++ control.in	30 Oct 2004 14:35:17 -0000	1.157
@@ -83,7 +83,7 @@
 Architecture: i386 powerpc s390 sparc
 Enhances: openoffice.org
 Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.1+1.1.2)${java-additional-depends}
-Conflicts: openoffice.org (>> 1.1.3)
+Conflicts: openoffice.org (>> 1.1.2+1.1.3)
 Recommends: j2re1.4 | j2re1.3
 Replaces: openoffice.org (<= 1.1.0-3)
 Section: contrib/misc

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- control	29 Oct 2004 18:35:06 -0000	1.189
+++ control	30 Oct 2004 14:35:16 -0000	1.190
@@ -83,7 +83,7 @@
 Architecture: i386 powerpc s390 sparc
 Enhances: openoffice.org
 Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.1+1.1.2)${java-additional-depends}
-Conflicts: openoffice.org (>> 1.1.3)
+Conflicts: openoffice.org (>> 1.1.2+1.1.3)
 Recommends: j2re1.4 | j2re1.3
 Replaces: openoffice.org (<= 1.1.0-3)
 Section: contrib/misc