CVS:oo-deb/debian changelog,1.362.2.29,1.362.2.30 control,1.186.2.17,1.186.2.18 control.in,1.153.2.15,1.153.2.16

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

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

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_3
	changelog control control.in 
Log Message:
add 1.1.2dfsg1-1 changelog
restore old -java Depends...


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.29
retrieving revision 1.362.2.30
diff -u -d -r1.362.2.29 -r1.362.2.30
--- changelog	28 Oct 2004 23:56:30 -0000	1.362.2.29
+++ changelog	30 Oct 2004 21:36:57 -0000	1.362.2.30
@@ -1,4 +1,4 @@
-openoffice.org (1.1.3-0.pre1) experimental; urgency=low
+openoffice.org (1.1.3-0.1pre) experimental; urgency=low
 
   * New upstream release.
     - fixes KDE clipboard exchange (closes: #237232)
@@ -96,6 +96,41 @@
   * debian/po/*: update for plain po-debconf usage [RE]
 
  -- Rene Engelhard <rene@debian.org>  Fri, 29 Oct 2004 01:53:41 +0200
+
+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...
+     - external/common/*: propriatary sun Jars
+   * New patches:
+    - l10n-YTL.diff: backport tr_TR localedata patch from
+      cws_srx645_trcurrency to add YTL (.tr currency as of 2005-01-01)
+      support; make it default [RE]
+    - sysui-mimetypes.diff: add MimeType entries to the
+      .desktop files (closes: #272638) [RE]
+    - fix-jars.patch: patch to be able to use free jars, thanks
+      Marco Pratesi [RE]
+   * Modified patches:
+    - sysui-translations.diff: fix ca encoding, thanks Jordi Mallach
+      (closes: #275968)
+   * debian/control.in:
+     - remove Jan-Hendrik Palic from Uploaders: [RE]
+   * debian/rules:
+     - add LIBSUFFIX as defined in debian/scripts/vars.$(ARCH) to the
+       maintainer scripts [RE]
+     - add the libxerces2-java, libxp-java, and libxt-java .jars to
+       XCLASSPATH. Check for them at the appropriate place and symlink to
+       them from external/common since for xt and xp the addition to the
+       classpath doesn't work in readlicense_oo and officecfg :/ [RE]
+   * debian/java-lib.sh: use ${LIBSUFFIX} instead of hardcoded li to
+     make it work on !i386
+   * debian/desktop-lib.sh: add, run update-desktop-database -q in
+     postinst and postrm [RE]
+   * debian/ttf-opensymbol.postrm: fix (we need to test for $1 = remove)
+     and rm /usr/share/fonts/truetype/openoffice/fonts.cache* on purge to
+     get ttf-opensymbol purged cleanly (closes: #270729)
+
+ -- 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.153.2.15
retrieving revision 1.153.2.16
diff -u -d -r1.153.2.15 -r1.153.2.16
--- control.in	29 Oct 2004 18:42:47 -0000	1.153.2.15
+++ control.in	30 Oct 2004 21:36:57 -0000	1.153.2.16
@@ -143,7 +143,7 @@
 Package: openoffice.org-java
 Architecture: i386 powerpc s390 sparc
 Enhances: openoffice.org
-Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.3)${java-additional-depends}
+Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.2+1.1.3)${java-additional-depends}
 Conflicts: openoffice.org (>> 1.1.3+1.1.4)
 Recommends: j2re1.4 | j2re1.3
 Replaces: openoffice.org (<= 1.1.0-3)

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186.2.17
retrieving revision 1.186.2.18
diff -u -d -r1.186.2.17 -r1.186.2.18
--- control	29 Oct 2004 18:42:47 -0000	1.186.2.17
+++ control	30 Oct 2004 21:36:57 -0000	1.186.2.18
@@ -143,7 +143,7 @@
 Package: openoffice.org-java
 Architecture: i386 powerpc s390 sparc
 Enhances: openoffice.org
-Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.3)${java-additional-depends}
+Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.2+1.1.3)${java-additional-depends}
 Conflicts: openoffice.org (>> 1.1.3+1.1.4)
 Recommends: j2re1.4 | j2re1.3
 Replaces: openoffice.org (<= 1.1.0-3)