[Pkg-ocaml-maint-commits] r4567 - in /trunk/packages/unison/trunk/debian: changelog rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Sun Sep 23 21:57:23 2007
New Revision: 4567

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4567
Log:
* Correct FTBFS, "test &&" -> "if test" for testing value in debian/rules

Modified:
    trunk/packages/unison/trunk/debian/changelog
    trunk/packages/unison/trunk/debian/rules

Modified: trunk/packages/unison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/changelog?rev=4567&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/changelog (original)
+++ trunk/packages/unison/trunk/debian/changelog Sun Sep 23 21:57:23 2007
@@ -1,8 +1,8 @@
-unison (2.13.16-9) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 20 Sep 2007 20:42:02 +0200
+unison (2.13.16-9) unstable; urgency=low
+
+  * Use a correct way to test thing in shell (Closes: #443715)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 23 Sep 2007 23:54:42 +0200
 
 unison (2.13.16-8) unstable; urgency=low
 

Modified: trunk/packages/unison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/rules?rev=4567&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/rules (original)
+++ trunk/packages/unison/trunk/debian/rules Sun Sep 23 21:57:23 2007
@@ -72,7 +72,7 @@
 RENAME += debian/unison.links.in
 RENAME += debian/unison-gtk.desktop.in
 
-MY_MAKE_FLAGS += $(shell test -x /usr/bin/ocamlopt.opt && echo "OCAMLOPT=ocamlopt.opt")
+MY_MAKE_FLAGS += $(shell if test -x /usr/bin/ocamlopt.opt; then echo "OCAMLOPT=ocamlopt.opt"; fi )
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
   NATIVE := true
@@ -106,7 +106,7 @@
 build/$(UNISON_GTK_PACKAGE):: debian/$(UNISON_GTK_PACKAGE).xpm
 	$(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE) $(MY_MAKE_FLAGS)
 	mv '$(CURDIR)/unison' '$(CURDIR)/$(UNISON_GTK)'
-	test 'x$(OCAML_HAVE_OCAMLOPT)' = 'xyes' && /usr/bin/chrpath -d '$(CURDIR)/$(UNISON_GTK)'
+	if test 'x$(OCAML_HAVE_OCAMLOPT)' = 'xyes'; then /usr/bin/chrpath -d '$(CURDIR)/$(UNISON_GTK)'; fi
 
 clean::
 	-$(RM) '$(CURDIR)/unison-manual.txt'