[Pkg-ocaml-maint-commits] r5015 - in /trunk/packages/xstr/trunk/debian: changelog expand_stars.sh rules

[zack at users.alioth.debian.org]

Author: zack
Date: Mon Dec 31 17:09:57 2007
New Revision: 5015

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5015
Log:
* move expansion of upstream comments to ocamldoc-like comments to a
  separate shell script, to avoid Makefile escaping issues

Added:
    trunk/packages/xstr/trunk/debian/expand_stars.sh
Modified:
    trunk/packages/xstr/trunk/debian/changelog
    trunk/packages/xstr/trunk/debian/rules

Modified: trunk/packages/xstr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xstr/trunk/debian/changelog?rev=5015&op=diff
==============================================================================
--- trunk/packages/xstr/trunk/debian/changelog (original)
+++ trunk/packages/xstr/trunk/debian/changelog Mon Dec 31 17:09:57 2007
@@ -6,8 +6,10 @@
   * set me as an uploader, d-o-m as the maintainer
   * debian/patches: rename 01_build.dpatch - (00list is enough for ordering)
   * debian/patches: add missing description to patch build.dpatch
-
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 31 Dec 2007 18:07:15 +0100
+  * move expansion of upstream comments to ocamldoc-like comments to a
+    separate shell script, to avoid Makefile escaping issues
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 31 Dec 2007 18:09:32 +0100
 
 xstr (0.2.1-18) unstable; urgency=low
 

Added: trunk/packages/xstr/trunk/debian/expand_stars.sh
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xstr/trunk/debian/expand_stars.sh?rev=5015&op=file
==============================================================================
--- trunk/packages/xstr/trunk/debian/expand_stars.sh (added)
+++ trunk/packages/xstr/trunk/debian/expand_stars.sh Mon Dec 31 17:09:57 2007
@@ -1,0 +1,3 @@
+#!/bin/bash
+# expand '(*' to '(**'
+sed 's/^\( *\)(\*\( [^\$=]\)/\1(**\2/' "$@"

Modified: trunk/packages/xstr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xstr/trunk/debian/rules?rev=5015&op=diff
==============================================================================
--- trunk/packages/xstr/trunk/debian/rules (original)
+++ trunk/packages/xstr/trunk/debian/rules Mon Dec 31 17:09:57 2007
@@ -6,10 +6,12 @@
 
 PKGNAME = libxstr-ocaml-dev
 OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
-OCAML_OCAMLDOC_FLAGS += -pp "sed 's/^\( *\)(\*\( [^\$$=]\)/\1(**\2/'"	# expand '(*' to '(**'
+OCAML_OCAMLDOC_FLAGS += -pp $(CURDIR)/debian/expand_stars.sh
 DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/$(PKGNAME)/$(OCAML_STDLIB_DIR)
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 build/$(PKGNAME)::
 	$(MAKE) opt
 endif
+build/$(PKGNAME)::
+	chmod +x $(CURDIR)/debian/expand_stars.sh