ooo-build r11680 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Feb 22 10:22:59 2008
New Revision: 11680
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11680&view=rev

Log:
2009-02-22  Rene Engelhard  <rene debian org>

        * patches/src680/desktop-issue-i86268.patch: move ..
        * patches/src680/ desktop-db-exception-visibility.diff: .. to here.
          .patch doesn't work.
        * patches/src680/apply: update, mention issue nr
        * configure.in: rc2..


Added:
   trunk/patches/src680/desktop-db-exception-visibility.diff
      - copied unchanged from r11679, /trunk/patches/src680/desktop-issue-i86268.patch
Removed:
   trunk/patches/src680/desktop-issue-i86268.patch
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/src680/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb 22 10:22:59 2008
@@ -5,7 +5,7 @@
 
 DEFAULT_TAG=ooh680-m7
 # For the upstream packages it is like:
-# DEFAULT_TAG=OOH680_m7
+# DEFAULT_TAG=OOH680_m8
 
 # The option tar-ustar is necessary because of some patches have too long
 # names so that they cannot be archived using the old V7 format
@@ -1089,7 +1089,7 @@
    UPSTREAM_VERSION=2.3.0
 elif test "$with_tag" = "OOG680_m9" ; then
    UPSTREAM_VERSION=2.3.1
-elif test "$with_tag" = "OOH680_m7" ; then
+elif test "$with_tag" = "OOH680_m8" ; then
    UPSTREAM_VERSION=2.4.0
 fi
 if test -n "$UPSTREAM_VERSION"; then

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Feb 22 10:22:59 2008
@@ -388,7 +388,7 @@
 sd-accept-uri-list-drop.diff, n#183719, rodo
 
 # berkeley db exception handling
-desktop-issue-i86268.patch
+desktop-db-exception-visibility.diff, i#86268
 
 [ Fixes < ooh680-m4 ]
 # default formatting PPT export bug n#285959