[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. upstream/0.20081011-229-ge5b9b45

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 4d37786c7a4276cbc2b549b9e936e8b7a9b6b0d3
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Nov 11 15:59:28 2008 +0100

    debian/patches: new patch fixes/consistent-docroot to look for *.idex in the appropriate dir

diff --git a/debian/changelog b/debian/changelog
index 2eb1b67..f66113d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ocaml-batteries (0.20081111-1) UNRELEASED; urgency=low
   * symlink more doc files from /usr/share/doc/*-dev/ to *-doc/
   * ship /usr/bin/ocaml-batteries (fancier top-level wrapper)
   * debian/rules: do not compress myocamlbuild.ml, to ease its usage
+  * debian/patches: new patch fixes/consistent-docroot to look for *.idex
+    in the appropriate dir
 
  -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Oct 2008 22:11:31 +0200
 
diff --git a/debian/rules b/debian/rules
index 7ea1553..0a33202 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,7 @@ build/$(DOC_PKG_NAME)::
 	mv debian/$(DEV_PKG_NAME).doc-base.ocamldoc-apiref \
 		debian/$(DOC_PKG_NAME).doc-base.ocamldoc-apiref
 
-# TG_BRANCHES = features/flexi-build
-TG_BRANCHES = 
+TG_BRANCHES = fixes/consistent-docroot
 SAVED_BRANCH := $(shell git branch 2> /dev/null | grep '^*' | cut -f 2 -d' ')
 tg-export:
 	tg create stage-debian $(TG_BRANCHES)

-- 
ocaml-batteries packaging