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

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



------------------------------------------------------------
revno: 1513
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-04-27 15:34:49 +0200
message:
  merge
modified:
  changelog
    ------------------------------------------------------------
    revno: 1332.3.1
    committer: Ben Finney <ben+debian@benfinney.id.au>
    branch nick: debian.devel
    timestamp: Tue 2009-03-24 15:26:41 +1100
    message:
      Re-work each package synopsis to avoid self-reference.
    modified:
      changelog
      control.debug.in
      control.fonts.in
      control.gcj.in
      control.help.in
      control.in
      control.lang.in
      control.mediawiki.in
      control.minimizer.in
      control.mono.in
      control.mozilla.in
      control.ogltrans.in
      control.pdfimport.in
      control.postgresql.in
      control.presenter.in
      control.reportdesign.in
      control.sdk.in
      control.ure.in
    ------------------------------------------------------------
    revno: 1332.3.2
    committer: Ben Finney <ben+debian@benfinney.id.au>
    branch nick: descriptive-synopsis
    timestamp: Tue 2009-03-24 19:20:32 +1100
    message:
      Refine package synopses with feedback from Rene.
    modified:
      control.in
      control.mono.in
      control.ure.in
    ------------------------------------------------------------
    revno: 1332.3.3
    committer: Ben Finney <ben+debian@benfinney.id.au>
    branch nick: copyright-reference
    timestamp: Thu 2009-04-23 20:43:05 +1000
    message:
      Merge from ‘thread:descriptive-synopsis’.
    modified:
      broffice.org.postrm.in
      changelog
      control
      control.debug.in
      control.fonts.in
      control.in
      control.lang.in
      control.mono.in
      control.reportdesign.in
      control.sdk.in
      control.ure.in
      rules
      shell-lib.sh
        ------------------------------------------------------------
        revno: 1332.4.1
        committer: Ben Finney <ben+debian@benfinney.id.au>
        branch nick: descriptive-synopsis
        timestamp: Thu 2009-04-23 20:41:26 +1000
        message:
          Merge from ‘thread:unstable’.
        modified:
          broffice.org.postrm.in
          changelog
          control
          control.debug.in
          control.fonts.in
          control.in
          control.lang.in
          control.mono.in
          control.reportdesign.in
          control.sdk.in
          control.ure.in
          rules
          shell-lib.sh
    ------------------------------------------------------------
    revno: 1332.3.4
    committer: Ben Finney <ben+debian@benfinney.id.au>
    branch nick: copyright-reference
    timestamp: Thu 2009-04-23 20:48:24 +1000
    message:
      Remove obsolete reference to old FSF address.
    modified:
      changelog
      copyright
    ------------------------------------------------------------
    revno: 1332.3.5
    committer: Ben Finney <ben+debian@benfinney.id.au>
    branch nick: copyright-reference
    timestamp: Fri 2009-04-24 10:11:09 +1000
    message:
      debian/copyright: Remove references to old FSF address.
    modified:
      changelog
      copyright
    ------------------------------------------------------------
    revno: 1332.1.132
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Fri 2009-04-24 09:55:55 +0200
    message:
      Remove obsolete references to old FSF address. (Ben Finney)
    modified:
      changelog
      copyright
    ------------------------------------------------------------
    revno: 1332.1.133
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Sat 2009-04-25 15:30:20 +0200
    message:
      hrm, fix BUILD_KDE setting again, add missed control.kde.in, regenerate control, remove missing ,
    added:
      control.kde.in
    modified:
      control
      control.debug.in
      control.in
      rules
    ------------------------------------------------------------
    revno: 1332.1.134
    committer: Rene Engelhard <rene@debian.org>
    branch nick: unstable
    timestamp: Mon 2009-04-27 15:03:16 +0200
    message:
      fix typo; -11
    modified:
      changelog
=== modified file 'changelog'
--- a/changelog	2009-04-27 06:15:17 +0000
+++ b/changelog	2009-04-27 13:34:49 +0000
@@ -7,7 +7,7 @@
         (closes: #523314)
 
   * debian/control.in, debian/control.kde.in, debian/rules:
-    - disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve
+    - disable -kde and -kab as they're for KDE3 (closes: #523899). Improve
       BUILD_KDE conditional
   * debian/control.in, debian/broffice.org.postrm.in, debian/rules:
     - Standards-Version: 3.8.1. Fix DEB_BUILD_OPTIONS lang= parsing to actually


Reply to: