[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-1-11-gd8f6ad4

[Rene Engelhard]

The following commit has been merged in the debian-experimental-3.5 branch:
commit d8f6ad47086298c5fc7bb2c760a12c51a8615e72
Author: Rene Engelhard <r...@debian.org>
Date:   Fri Dec 30 00:13:57 2011 +0100

    make smoketest-disable-db-insert-delete-seek-tests.diff apply again

diff --git a/changelog b/changelog
index b7ca14f..7fabfd4 100644
--- a/changelog
+++ b/changelog
@@ -3,12 +3,15 @@ libreoffice (1:3.5.0~beta2-2) UNRELEASED; urgency=low
   * debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
   * debian/patches/make-package-modules-not-suck.diff: add missing , so
     that kde4be1.uno.so correctly ends up in -kde
+
+  * 
debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff,
+    debian/rules: make patch apply again
  
   * debian/rules:
     - force boost to 1.46 due to ICE with 1.48  
     - prevent creating bogus gcc- build-dependency on gcj archs
 
- -- Rene Engelhard <r...@debian.org>  Thu, 29 Dec 2011 17:50:42 +0000
+ -- Rene Engelhard <r...@debian.org>  Fri, 30 Dec 2011 00:11:06 +0100
 
 libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
 
diff --git a/rules b/rules
index ebfee17..517fb89 100755
--- a/rules
+++ b/rules
@@ -1585,7 +1585,7 @@ endif
 check: 
 ifeq "$(RUN_MAKE_CHECK)" "y"
 ifeq "$(DEB_HOST_ARCH)" "armel"
-       cd $(SOURCE_TREE)/smoketestoo_native && \
+       cd $(SOURCE_TREE)/smoketest && \
                patch -p1 < 
$(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
 endif
 
@@ -1600,7 +1600,7 @@ endif
        find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf 
{} \;
 
 ifeq "$(DEB_HOST_ARCH)" "armel"
-       cd $(SOURCE_TREE)/smoketestoo_native && \
+       cd $(SOURCE_TREE)/smoketest && \
                patch -p1 -R < 
$(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
 endif
 endif
diff --git 
a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff 
b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
index 655668d..92ae575 100644
--- a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
+++ b/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
@@ -1,5 +1,6 @@
---- smoketestoo_native/data/Test_DB.xml
-+++ smoketestoo_native/data/Test_DB.xml
+diff -urN smoketest-old/data/Test_DB.xml smoketest/data/Test_DB.xml
+--- smoketest-old/data/Test_DB.xml     2011-12-20 16:05:52.000000000 +0000
++++ smoketest/data/Test_DB.xml 2011-12-29 23:09:08.000000000 +0000
 @@ -30,9 +30,6 @@
  
  const cMessageDatabaseService = &quot;Database Service&quot;
@@ -9,14 +10,14 @@
 -const cMessageDatabaseSeek = &quot;Read other record from Database&quot;
  const cMessageDatabaseClose = &quot;Close Database&quot;
  
- Sub TestDB (FilterType as Integer)
-@@ -87,54 +84,6 @@ Const sTestString = &quot;Automatical Test&quot;
-         SetStatus (FilterType, cDBService, not IsNull (oRowSet))
+ Sub TestDB
+@@ -81,48 +78,6 @@
+         LogTestResult( &quot;Database &quot;+ cMessageDatabaseService, TRUE )
      End If
-     
--    nCurrentAction = cDBInsert
+ 
+-    gCurrentTestCase = cDBInsert
 -    sCurrentMessage = cMessageDatabaseInsert
--    
+-
 -    oRowSet.ActiveConnection = oDBConnection
 -
 -    oRowSet.CommandType = com.sun.star.sdb.CommandType.COMMAND
@@ -28,18 +29,16 @@
 -
 -    oRowSet.insertRow()
 -    nRowCount=oRowSet.RowCount
--    
+-
 -    oRowSet.moveToCurrentRow()
--    
+-
 -    bResult = (oRowSet.getString(5) = sTestString)
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
FileChannel)
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseInsert, 
MainFileChannel)
--    SetStatus (FilterType, cDBInsert, bResult)
--    
+-    LogTestResult( &quot;Database &quot;+ cMessageDatabaseInsert, bResult )
+-
 -    &apos;delete only if insert passed
--    
+-
 -    if (bResult) Then
--        nCurrentAction = cDBDelete
+-        gCurrentTestCase = cDBDelete
 -        sCurrentMessage = cMessageDatabaseDelete
 -        oRowSet.deleteRow()
 -        bResult = (nRowCount - oRowSet.RowCount = 0)
@@ -47,21 +46,17 @@
 -            oRowSet.next()
 -            bResult = (nRowCount - oRowSet.RowCount = 1)
 -        End If
--        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
FileChannel)
--        LogState (bResult, &quot;Database &quot;+ cMessageDatabaseDelete, 
MainFileChannel)
--        SetStatus (FilterType, cDBDelete, bResult)
--    End If    
+-        LogTestResult( &quot;Database &quot;+ cMessageDatabaseDelete, bResult 
)
+-    End If
 -
 -    &apos; read other record
--    
--    nCurrentAction = cDBSeek
+-
+-    gCurrentTestCase = cDBSeek
 -    sCurrentMessage = cMessageDatabaseSeek
 -    oRowSet.first()
 -    bResult = not (oRowSet.getString(5) = sTestString)
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
FileChannel)
--    LogState (bResult, &quot;Database &quot;+ cMessageDatabaseSeek, 
MainFileChannel)
--    SetStatus (FilterType, cDBSeek, bResult)
--    
-     nCurrentAction = cDBClose
+-    LogTestResult( &quot;Database &quot;+ cMessageDatabaseSeek, bResult )
+-
+     gCurrentTestCase = cDBClose
      sCurrentMessage = cMessageDatabaseClose
      oDBConnection.Dispose()

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rgpdg-0005fx...@vasks.debian.org