The following commit has been merged in the master branch:
commit aaee6f3ce8137c6354a5067b2fe258aae963e60d
Author: Romain Beauxis <to...@rastageeks.org>
Date:   Wed Oct 12 01:38:28 2011 +0200

    * Remove configure.ml mangling in debian/rules
    * Move ttf-liberation from Depends to Recommends.

diff --git a/debian/control b/debian/control
index 285acba..18b89a6 100644
--- a/debian/control
+++ b/debian/control
@@ -282,8 +282,8 @@ Depends:
  ${shlibs:Depends},
  ${ocaml:Depends},
  ${misc:Depends},
- ttf-liberation,
  liquidsoap (= ${binary:Version})
+Recommends: ttf-liberation
 Description: audio streaming language -- libgd plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
  typically targeting internet radios (e.g. icecast streams).
@@ -566,8 +566,8 @@ Depends:
  ${shlibs:Depends},
  ${ocaml:Depends},
  ${misc:Depends},
- ttf-liberation,
  liquidsoap (= ${binary:Version})
+Recommends: ttf-liberation
 Description: audio streaming language -- SDL plugin
  Liquidsoap is a powerful tool for building complex audio streaming systems,
  typically targeting internet radios (e.g. icecast streams).
diff --git a/debian/rules b/debian/rules
index aee4d89..a910986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,8 +47,6 @@ else
 endif
 
 makebuilddir/liquidsoap::
-       [ ! -f src/configure.ml ] || [ -f src/configure.ml.cdbs-backup ] || \
-       cp -f src/configure.ml src/configure.ml.cdbs-backup
        mkdir -p $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 install/liquidsoap::
@@ -74,13 +72,8 @@ binary-install/liguidsoap::
        sed -e 
s#/usr/lib/python.*/site-packages/liquidsoap#/var/lib/liguidsoap#g -i 
$(CURDIR)/debian/liguidsoap/usr/bin/liguidsoap
        dh_pysupport /var/lib/liguidsoap
 
-cleanbuilddir/liquidsoap::
-       [ -f src/configure.ml.cdbs-backup ] || [ ! -f src/configure.ml ] || \
-       cp -f src/configure.ml src/configure.ml.cdbs-backup
-
 clean::
        rm -rf src/liquidsoap src/META radio.liq.example \
               src/SVN.ml src/io/liquidsoap_depend autodoc \
               doc/manual debian/liquidsoap.init src/dllliquidsoap.so \
               src/libliquidsoap.a debian/*.onodefined
-       [ ! -f src/configure.ml.cdbs-backup ] || mv -f 
src/configure.ml.cdbs-backup src/configure.ml

-- 
liquidsoap packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to