The following commit has been merged in the master branch:
commit 13535d96de637efc5f1aa7ba5e43da5e2bc25184
Author: Stephane Glondu
Date: Thu Jul 21 20:49:34 2011 +0200
Switch source package format to 3.0 (quilt)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/control b/debian/control
index 7702c87..4cfdc1d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
libocamlnet-ocaml-dev (>= 2.2.9-6),
ocaml-ulex,
camlp4,
- dpatch,
cdbs
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pxp.git
diff --git
a/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
b/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
new file mode 100644
index 000..84a3f6c
--- /dev/null
+++
b/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
@@ -0,0 +1,134 @@
+From: Stefano Zacchiroli
+Date: Thu, 21 Jul 2011 20:46:33 +0200
+Subject: Patch Makefiles so that stuff is installed under $(DESTDIR)
+
+---
+ Makefile |2 +-
+ Makefile.rules |2 +-
+ gensrc/pxp-lex-pattern/Makefile.in |2 +-
+ gensrc/pxp-ulex-utf8/Makefile |2 +-
+ gensrc/pxp-wlex-utf8/Makefile |2 +-
+ gensrc/pxp-wlex/Makefile |2 +-
+ src/pxp-engine/Makefile|2 +-
+ src/pxp-pp/Makefile|2 +-
+ src/pxp/Makefile |2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 86cef90..e2ae4b3 100644
+--- a/Makefile
b/Makefile
+@@ -59,7 +59,7 @@ clean:
+ CLEAN: clean
+
+ .PHONY: distclean
+-distclean:
++distclean: clean
+ rm -f *~ Makefile.conf
+ $(MAKE) -C tools distclean
+ $(MAKE) -C src distclean
+diff --git a/Makefile.rules b/Makefile.rules
+index c90e054..829227a 100644
+--- a/Makefile.rules
b/Makefile.rules
+@@ -4,7 +4,7 @@
+
+ # How to invoke compilers and tools:
+
+-OCAMLC= $(OCAMLFIND) ocamlc -g $(OCAMLC_OPTIONS) -package "$(PACKAGES)"
++OCAMLC= $(OCAMLFIND) ocamlc $(OCAMLC_OPTIONS) -package "$(PACKAGES)"
+ OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPT_OPTIONS) -package "$(PACKAGES)"
+ OCAMLDEP = ocamldep $(OCAMLDEP_OPTIONS)
+ OCAMLFIND = ocamlfind
+diff --git a/gensrc/pxp-lex-pattern/Makefile.in
b/gensrc/pxp-lex-pattern/Makefile.in
+index 5408e3f..d1e1074 100644
+--- a/gensrc/pxp-lex-pattern/Makefile.in
b/gensrc/pxp-lex-pattern/Makefile.in
+@@ -45,7 +45,7 @@ distclean: clean
+
+ install:
+ files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a pxp_lex_link_*.cmo
pxp_lex_link_*.cmx pxp_lex_link_*.o META` && \
+-$(OCAMLFIND) install pxp-lex-$(ENC) $$files
++$(OCAMLFIND) install -destdir $(DESTDIR) pxp-lex-$(ENC) $$files
+
+ uninstall:
+ $(OCAMLFIND) remove pxp-lex-$(ENC)
+diff --git a/gensrc/pxp-ulex-utf8/Makefile b/gensrc/pxp-ulex-utf8/Makefile
+index 1e2b290..e110e87 100644
+--- a/gensrc/pxp-ulex-utf8/Makefile
b/gensrc/pxp-ulex-utf8/Makefile
+@@ -51,7 +51,7 @@ distclean:
+
+ install:
+ files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a
pxp_ulex_link_*.cmo pxp_ulex_link_*.cmx pxp_ulex_link_*.o META` && \
+-$(OCAMLFIND) install pxp-ulex-$(ENC) $$files
++$(OCAMLFIND) install -destdir $(DESTDIR) pxp-ulex-$(ENC) $$files
+
+ uninstall:
+ $(OCAMLFIND) remove pxp-ulex-$(ENC)
+diff --git a/gensrc/pxp-wlex-utf8/Makefile b/gensrc/pxp-wlex-utf8/Makefile
+index 6df4b03..9ea561a 100644
+--- a/gensrc/pxp-wlex-utf8/Makefile
b/gensrc/pxp-wlex-utf8/Makefile
+@@ -48,7 +48,7 @@ distclean:
+
+ install:
+ files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a
pxp_wlex_link_*.cmo pxp_wlex_link_*.cmx pxp_wlex_link_*.o META` && \
+-$(OCAMLFIND) install pxp-wlex-$(ENC) $$files
++$(OCAMLFIND) install -destdir $(DESTDIR) pxp-wlex-$(ENC) $$files
+
+ uninstall:
+ $(OCAMLFIND) remove pxp-wlex-$(ENC)
+diff --git a/gensrc/pxp-wlex/Makefile b/gensrc/pxp-wlex/Makefile
+index b9ab244..8284709 100644
+--- a/gensrc/pxp-wlex/Makefile
b/gensrc/pxp-wlex/Makefile
+@@ -19,7 +19,7 @@ distclean: clean
+ rm -f META
+
+ install:
+- $(OCAMLFIND) install pxp-wlex META
++ $(OCAMLFIND) install -destdir $(DESTDIR) pxp-wlex META
+
+ uninstall:
+ $(OCAMLFIND) remove pxp-wlex
+diff --git a/src/pxp-engine/Makefile b/src/pxp-engine/Makefile
+index fb07eea..7136333 100644
+--- a/src/pxp-engine/Makefile
b/src/pxp-engine/Makefile
+@@ -33,7 +33,7 @@ distclean: clean
+
+ install:
+ files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a pxp_top.cmo META`
&& \
+- $(OCAMLFIND) install pxp-engine $$files
++ $(OCAMLFIND) install -destdir $(DESTDIR) pxp-engine $$files
+
+ uninstall:
+ $(OCAMLFIND) remove pxp-engine
+diff --git a/src/pxp-pp/Makefile b/src/pxp-pp/Makefile
+index b33386d..412d816 10
