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

./packages/openofficeorg/3.1.1/unstable r1712: + - move one missed place from bc to expr and fix expr statement, thanks



------------------------------------------------------------
revno: 1712
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-10-17 14:11:01 +0200
message:
  +    - move one missed place from bc to expr and fix expr statement, thanks
  +      Chris Cheney again
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-10-16 21:35:07 +0000
+++ b/changelog	2009-10-17 12:11:01 +0000
@@ -21,8 +21,10 @@
   * debian/rules:
     - install extension shell lib for use by extensions not from here
     - enable el help (thanks Fotis Tsamis for telling it is enough translated)
+    - move one missed place from bc to expr and fix expr statement, thanks
+      Chris Cheney again
 
- -- Rene Engelhard <rene@debian.org>  Fri, 16 Oct 2009 21:29:41 +0200
+ -- Rene Engelhard <rene@debian.org>  Sat, 17 Oct 2009 14:10:04 +0200
 
 openoffice.org (1:3.1.1-4) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2009-10-16 21:35:07 +0000
+++ b/rules	2009-10-17 12:11:01 +0000
@@ -943,17 +943,17 @@
 	CONFIGURE_FLAGS += --disable-kde4
 	KDE_ICONSET_DEP=openoffice.org$(VER)-style-crystal
   endif
-	BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev $(KDELIBS_MINVER)
+	BUILD_DEPS += , kdelibs$(shell expr $(KDE_VER) + 1)-dev $(KDELIBS_MINVER)
   ifeq "$(KDE_VER)" "4"
 	BUILD_DEPS += , libqt$(KDE_VER)-dev $(QT_MINVER)
-	DBG_DBG_SUGGESTS+= , kdelibs$(shell expr "$(KDE_VER)+1")-dbg, libqt$(KDE_VER)-dbg
+	DBG_DBG_SUGGESTS+= , kdelibs$(shell expr $(KDE_VER) + 1)-dbg, libqt$(KDE_VER)-dbg
   else
 	DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
   endif
   ifeq "$(ENABLE_KDEAB)" "y"
     ifeq "$(KDE_VER)" "4"
 	ADDITIONAL_SECTIONS += KDE4Experimental
-	BUILD_DEPS += , kdepimlibs$(shell expr "$(KDE_VER)+1")-dev
+	BUILD_DEPS += , kdepimlibs$(shell expr $(KDE_VER) + 1)-dev
     endif
   else
 	CONFIGURE_FLAGS+= --disable-kdeab


Reply to: