[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-44-g6b5bedb

[Ralf Treinen]

The following commit has been merged in the experimental branch:
commit 6b5bedb8e137dcf14a6cf3f4c3e681949da86f43
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Mar 1 22:33:51 2010 +0100

    migrate patches 004 and 005

diff --git a/debian/changelog b/debian/changelog
index 0b49c2d..9acf250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,13 +15,17 @@ advi (1.8-1) UNRELEASED; urgency=low
   * Standards-Version 3.8.4 (no change)
   * Source format 3.0 (quilt)
   * The directories examples/ and test/ are gone from upstream. We put
-    these directories from advi-1.6 into debian/examples-source.
+    these directories from advi-1.6 into debian/examples-source. This
+    directory has the relevant debian patches from 1.6.0 applied.
   * Old patches:
     - 0001-Pull-CVS-HEAD-as-of-20060103: now integrated in upstream
     - 0002-Makefile-.depend-workaround-for-buggy-make-behavior: no longer
       relevant
+    - 0003-Don-t-call-advi-on-example-build-generation: concerns only
+      examples, moved into examples-source/patches/
     - 0004-Japanese-fonts: jpfonts.config is no longer in upstream, put it
       into debian/. Patch renamed to japanese-fonts
+    - 0005-Cache-dir.patch: renamed to cache-dir-tilde-expansion
 
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
diff --git a/debian/patches/0003-Don-t-call-advi-on-example-build-generation.patch b/debian/examples-source/patches/0003-Don-t-call-advi-on-example-build-generation.patch
similarity index 100%
rename from debian/patches/0003-Don-t-call-advi-on-example-build-generation.patch
rename to debian/examples-source/patches/0003-Don-t-call-advi-on-example-build-generation.patch
diff --git a/debian/patches/0005-Cache-dir.patch b/debian/patches/cache-dir-tilde-expansion
similarity index 94%
rename from debian/patches/0005-Cache-dir.patch
rename to debian/patches/cache-dir-tilde-expansion
index 61253d3..ee24512 100644
--- a/debian/patches/0005-Cache-dir.patch
+++ b/debian/patches/cache-dir-tilde-expansion
@@ -9,8 +9,8 @@ Subject: [PATCH] Cache dir
 
 diff --git a/userfile.ml b/userfile.ml
 index 7701d84..d4521dd 100644
---- a/userfile.ml
-+++ b/userfile.ml
+--- a/src/userfile.ml
++++ b/src/userfile.ml
 @@ -224,6 +224,12 @@ let get_user_advi_cache_dir () =
  let advi_cache_dir = ref None;;
  
diff --git a/debian/patches/series b/debian/patches/series
index e6a7f94..4925614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 japanese-fonts
+cache-dir-tilde-expansion

-- 
advi packaging