[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r862 ./packages/openofficeorg/2.3/experimental: fix JAWT_DEPENDS for new gcj-4.2; typos



------------------------------------------------------------
revno: 862
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-08-22 10:24:49 +0200
message:
  fix JAWT_DEPENDS for new gcj-4.2; typos
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2007-08-22 08:11:45 +0000
+++ b/changelog	2007-08-22 08:24:49 +0000
@@ -8,7 +8,7 @@
       - ooo59127.vcl.honourcairofont.diff: fix for gdk hang. [CC]
         (closes: #433870)
       - cairo-canvas-ppc-fix.diff: fix endianness to fix yellow color in
-        prsentation mode under cairo (closes: #339439(
+        presentation mode under cairo (closes: #339439)
     - src: update GSIs from ftp.linux.cz: bg cs et fi gl sl vi
   * debian/control.in:
     - fix libpq-dev builddep, thanks calc
@@ -23,8 +23,10 @@
     - remove RID_STR_EXTENSION_NOT_PRESENT translation from the GSIs so that
       it is not merged (we changed the string)
     - bump HELP_L10N_VIRTUAL_VERSION to 2.3
+  * merge from Ubuntu:
+    - fix JAWT_DEPENDS for new gcj-4.2
 
- -- Rene Engelhard <rene@debian.org>  Tue, 21 Aug 2007 19:34:35 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 22 Aug 2007 10:21:34 +0200
 
 openoffice.org (1:2.3.0~oog680m1-1) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2007-08-21 18:14:08 +0000
+++ b/rules	2007-08-22 08:24:49 +0000
@@ -389,7 +389,7 @@
 	JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
   else
     ifeq "$(GCJ_VERSION)" "4.2"
-	JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-0-awt
+	JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
     else
 	JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-awt
     endif


Reply to: