CVS:oo-deb/debian changelog,1.374,1.375 control,1.188,1.189 control.in,1.155,1.156

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

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

Modified Files:
	changelog control control.in 
Log Message:
fix -java conflicts to cope with .dfsg.1
call it -1


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- changelog	28 Oct 2004 23:02:56 -0000	1.374
+++ changelog	29 Oct 2004 18:35:06 -0000	1.375
@@ -1,4 +1,4 @@
-openoffice.org (1.1.2.dfsg.1-0.1pre) unstable; urgency=medium
+openoffice.org (1.1.2.dfsg.1-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,6 +16,7 @@
       (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]
@@ -31,7 +32,7 @@
      and rm /usr/share/fonts/truetype/openoffice/fonts.cache* on purge to
      get ttf-opensymbol purged cleanly (closes: #270729)
 
- -- Rene Engelhard <rene@debian.org>  Thu, 28 Oct 2004 11:48:29 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri, 29 Oct 2004 20:28:06 +0200
 
 openoffice.org (1.1.2-5) unstable; urgency=high
 

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- control.in	16 Oct 2004 16:16:36 -0000	1.155
+++ control.in	29 Oct 2004 18:35:06 -0000	1.156
@@ -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.2+1.1.3)
+Conflicts: openoffice.org (>> 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.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- control	16 Oct 2004 16:16:36 -0000	1.188
+++ control	29 Oct 2004 18:35:06 -0000	1.189
@@ -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.2+1.1.3)
+Conflicts: openoffice.org (>> 1.1.3)
 Recommends: j2re1.4 | j2re1.3
 Replaces: openoffice.org (<= 1.1.0-3)
 Section: contrib/misc