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

./packages/openofficeorg/3.1/experimental r1358: merge



------------------------------------------------------------
revno: 1358
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-12-22 09:29:49 +0100
message:
  merge
modified:
  changelog
  shell-lib.sh
    ------------------------------------------------------------
    revno: 1332.1.17
    committer: Rene Engelhard <rene@debian.org>
    branch nick: experimental
    timestamp: Fri 2008-12-19 23:00:31 +0100
    message:
      debian/shell-lib.sh: remove long obsolete "trap {...}". bashism anyway.
    modified:
      changelog
      shell-lib.sh
    ------------------------------------------------------------
    revno: 1332.1.18
    committer: Rene Engelhard <rene@debian.org>
    branch nick: debian
    timestamp: Mon 2008-12-22 09:29:13 +0100
    message:
      -1
    modified:
      changelog
=== modified file 'changelog'
--- a/changelog	2008-12-22 02:06:12 +0000
+++ b/changelog	2008-12-22 08:29:49 +0000
@@ -24,7 +24,7 @@
 
  -- Rene Engelhard <rene@debian.org>  Mon, 22 Dec 2008 03:03:41 +0100
 
-openoffice.org (1:3.0.1~rc1-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.1~rc1-1) experimental; urgency=low
 
   * OpenOffice.org 3.0.1 rc1 (OOO300_m14)
     - fixes usage of flash v9 plugin (closes: #434510)
@@ -50,8 +50,10 @@
     dictionary.lst anymore
   * debian//openoffice.org-common.preinst: remove
     /etc/openoffice/dictionary.lst*
+  * debian/shell-lib.sh: remove long obsolete "trap {...}". bashism anyway.
+    Thanks lintian.
 
- -- Rene Engelhard <rene@debian.org>  Fri, 19 Dec 2008 17:36:54 +0100
+ -- Rene Engelhard <rene@debian.org>  Sat, 20 Dec 2008 01:28:26 +0100
 
 openoffice.org (1:3.0.0-6) experimental; urgency=low
 

=== modified file 'shell-lib.sh'
--- a/shell-lib.sh	2008-06-07 10:40:11 +0000
+++ b/shell-lib.sh	2008-12-19 22:00:31 +0000
@@ -81,10 +81,5 @@
   echo " done."
 }
 
-trap "message;\
-      message \"Received signal.  Aborting script $0.\";\
-      message;\
-      exit 1" 1 2 3 15
-
 VER=
 


Reply to: