The following commit has been merged in the master branch:
commit 1c49f4cf9965a90136a45a5a2400400a0121fc7f
Author: Eugeniy Meshcheryakov <eu...@debian.org>
Date:   Tue Dec 6 01:04:40 2011 +0100

    Use -arch and -indep targets

diff --git a/debian/control b/debian/control
index a46cab9..be4ecb0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
 Uploaders: Євгеній Мещеряков <eu...@debian.org>
 Build-Depends:
- debhelper (>= 8.1.0~),
+ debhelper (>= 8.9.7~),
  dh-ocaml (>= 0.9.4~),
  ocaml-nox (>= 3.11.1-3~),
  libpycaml-ocaml-dev (>= 0.82-13~),
@@ -14,12 +14,13 @@ Build-Depends:
  ocaml-findlib,
  ocaml-best-compilers,
  libsexplib-camlp4-dev,
+ libpcre-ocaml-dev
+Build-Depends-Indep:
+ texlive-fonts-extra,
+ texlive-fonts-recommended,
  texlive-latex-base,
- texlive-latex-recommended,
  texlive-latex-extra,
- texlive-fonts-recommended,
- texlive-fonts-extra,
- libpcre-ocaml-dev
+ texlive-latex-recommended
 Standards-Version: 3.9.2
 Homepage: http://coccinelle.lip6.fr
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.git
diff --git a/debian/patches/pdf-docs-build.diff 
b/debian/patches/pdf-docs-build.diff
new file mode 100644
index 0000000..64236bf
--- /dev/null
+++ b/debian/patches/pdf-docs-build.diff
@@ -0,0 +1,17 @@
+--- a/docs/manual/Makefile
++++ b/docs/manual/Makefile
+@@ -15,10 +15,12 @@
+ ##############################################################################
+ # Top rules
+ ##############################################################################
+-.PHONY: all clean distclean
++.PHONY: all all-pdf clean distclean
+ .SUFFIXES: .pdf .tex
+ 
+-all: manual.pdf main_grammar.pdf options.pdf
++all:
++
++all-pdf: manual.pdf main_grammar.pdf options.pdf
+ 
+ manual.pdf: $(SRC)
+       pdflatex main.tex
diff --git a/debian/patches/series b/debian/patches/series
index 9475bed..a1ae6a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pycaml-build-check.diff
+pdf-docs-build.diff
diff --git a/debian/rules b/debian/rules
index 568fd58..66d6e7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,18 +26,21 @@ build build-arch build-indep clean binary binary-arch 
binary-indep install:
 override_dh_auto_configure:
        ./configure $(CONFIG_FLAGS)
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
        $(MAKE) $(COCCI_FLAGS) depend
        # make all.opt does not build documentation
+       $(MAKE) $(COCCI_FLAGS) -C docs all
+       $(MAKE) $(COCCI_FLAGS) $(MAKE_TGT)
+
+override_dh_auto_build-indep:
        mkdir texmf-var
        mkdir texmf-config
-       TEXMFVAR="$(CURDIR)/texmf-var" TEXMFCONFIG="$(CURDIR)/texmf-config" 
$(MAKE) $(COCCI_FLAGS) -C docs all
-       $(MAKE) $(COCCI_FLAGS) $(MAKE_TGT)
+       TEXMFVAR="$(CURDIR)/texmf-var" TEXMFCONFIG="$(CURDIR)/texmf-config" 
$(MAKE) $(COCCI_FLAGS) -C docs/manual all-pdf
 
 override_dh_auto_test:
        # Nothing
 
-override_dh_auto_install:
+override_dh_auto_install-arch:
        $(MAKE) DESTDIR=$(CURDIR)/debian/coccinelle $(COCCI_FLAGS) install 
install-bash
        # install the wrapper script, i dont like upstreams one
        rm $(CURDIR)/debian/coccinelle/usr/bin/spatch*
@@ -56,6 +59,9 @@ override_dh_auto_install:
        # Emacs files
        cp $(CURDIR)/editors/emacs/cocci.el 
$(CURDIR)/debian/coccinelle/usr/share/emacs/site-lisp/
 
+override_dh_auto_install-indep:
+       # Nothing
+
 override_dh_auto_clean:
        $(MAKE) CLEANSUBDIRS=\$$\(MAKESUBDIRS\) distclean
        rm -rf texmf-var texmf-config
@@ -64,5 +70,6 @@ override_dh_compress:
        dh_compress -X.pdf -X.cocci -X.c
 
 .PHONY: build build-arch build-indep clean binary-indep binary-arch binary 
install
-.PHONY: override_dh_auto_configure override_dh_auto_build 
override_dh_auto_test override_dh_auto_install
-.PHONY: override_dh_auto_clean override_dh_compress
+.PHONY: override_dh_auto_configure override_dh_auto_test 
override_dh_auto_clean override_dh_compress
+.PHONY: override_dh_auto_build-arch override_dh_auto_install-arch
+.PHONY: override_dh_auto_build-indep override_dh_auto_install-indep

-- 
Debian packaging for coccinelle

_______________________________________________
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