------------------------------------------------------------
revno: 1354
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 22:05:49 +0100
message:
  merge
modified:
  rules
    ------------------------------------------------------------
    revno: 1022.3.1
    committer: Chris Halls <ch...@thehalls.de>
    branch nick: debian
    timestamp: Mon 2008-12-22 16:50:41 +0000
    message:
      ooo-build branch is ooo-build-3-0-1
    modified:
      rules
    ------------------------------------------------------------
    revno: 1022.3.2
    committer: Chris Halls <ch...@thehalls.de>
    branch nick: debian
    timestamp: Mon 2008-12-22 17:06:33 +0000
    message:
      Revert previous commit - this was on the wrong branch. Thanks Rene
    modified:
      rules
    ------------------------------------------------------------
    revno: 1022.3.3
    committer: Rene Engelhard <r...@debian.org>
    branch nick: unstable
    timestamp: Tue 2008-12-23 19:53:09 +0100
    message:
      add missing Depends: on runtime-depends
    modified:
      changelog
      control
      control.reportdesign.in
    ------------------------------------------------------------
    revno: 1022.3.4
    committer: Rene Engelhard <r...@debian.org>
    branch nick: debian
    timestamp: Tue 2008-12-23 22:03:07 +0100
    message:
      actually set java-runtime-depends for -report-builder
    modified:
      control.reportdesign.in
      rules
=== modified file 'rules'
--- a/rules     2008-12-23 18:37:56 +0000
+++ b/rules     2008-12-23 21:05:49 +0000
@@ -3332,6 +3332,7 @@
        dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
                -V'base-version=$(BASE_VERSION)' \
                -V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
+               -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
                -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep 
"<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e 
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut 
-d: -f2`
 endif
 ifeq "$(PACKAGE_PCVSLIB)" "y"

Reply via email to