The following commit has been merged in the master branch:
commit 13535d96de637efc5f1aa7ba5e43da5e2bc25184
Author: Stephane Glondu <st...@glondu.net>
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 0000000..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 0000000..84a3f6c
--- /dev/null
+++
b/debian/patches/0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
@@ -0,0 +1,134 @@
+From: Stefano Zacchiroli <z...@debian.org>
+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 100644
+--- a/src/pxp-pp/Makefile
++++ b/src/pxp-pp/Makefile
+@@ -27,7 +27,7 @@ distclean: clean
+ rm -f META depend
+
+ install:
+- $(OCAMLFIND) install pxp-pp pxp_pp.cma META
++ $(OCAMLFIND) install -destdir $(DESTDIR) pxp-pp pxp_pp.cma META
+
+ uninstall:
+ $(OCAMLFIND) remove pxp-pp
+diff --git a/src/pxp/Makefile b/src/pxp/Makefile
+index 8c1a57b..0c00474 100644
+--- a/src/pxp/Makefile
++++ b/src/pxp/Makefile
+@@ -13,7 +13,7 @@ distclean: clean
+ rm -f META
+
+ install:
+- $(OCAMLFIND) install pxp META
++ $(OCAMLFIND) install -destdir $(DESTDIR) pxp META
+
+ uninstall:
+ $(OCAMLFIND) remove pxp
+--
diff --git
a/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch
b/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch
new file mode 100644
index 0000000..eb270b0
--- /dev/null
+++ b/debian/patches/0002-Avoid-dependending-on-a-missing-.txt-document.patch
@@ -0,0 +1,23 @@
+From: Stefano Zacchiroli <z...@debian.org>
+Date: Thu, 21 Jul 2011 20:47:05 +0200
+Subject: Avoid dependending on a missing .txt document
+
+---
+ src/pxp-engine/Makefile.code | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/pxp-engine/Makefile.code b/src/pxp-engine/Makefile.code
+index ea34c23..81386ea 100644
+--- a/src/pxp-engine/Makefile.code
++++ b/src/pxp-engine/Makefile.code
+@@ -21,8 +21,7 @@ DOC = pxp_types.mli pxp_document.mli pxp_dtd.mli
pxp_tree_parser.mli \
+ pxp_marshal.mli pxp_yacc.mli pxp_reader.mli \
+ intro_trees.txt intro_extensions.txt intro_namespaces.txt \
+ intro_events.txt intro_resolution.txt intro_getting_started.txt \
+- intro_advanced.txt intro_preprocessor.txt \
+- example_readme.txt
++ intro_advanced.txt intro_preprocessor.txt
+
+ XOBJ = $(OBJ:.cmo=.cmx)
+
+--
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index dceac02..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-install_destdir.dpatch
-ocamldoc_missing_txt.dpatch
diff --git a/debian/patches/install_destdir.dpatch
b/debian/patches/install_destdir.dpatch
deleted file mode 100755
index 94eda1a..0000000
--- a/debian/patches/install_destdir.dpatch
+++ /dev/null
@@ -1,133 +0,0 @@
-#! /bin/sh -e
-## 01_build.dpatch by <z...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch Makefiles so that stuff is installed under $(DESTDIR)
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-lex-pattern/Makefile.in
pxp-1.1.95/gensrc/pxp-lex-pattern/Makefile.in
----
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-lex-pattern/Makefile.in
2004-09-04 19:48:32.000000000 +0200
-+++ pxp-1.1.95/gensrc/pxp-lex-pattern/Makefile.in 2004-09-09
15:47:04.590588296 +0200
-@@ -45,7 +45,7 @@
-
- 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 -urNad
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-ulex-utf8/Makefile
pxp-1.1.95/gensrc/pxp-ulex-utf8/Makefile
----
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-ulex-utf8/Makefile
2004-09-04 19:48:32.000000000 +0200
-+++ pxp-1.1.95/gensrc/pxp-ulex-utf8/Makefile 2004-09-09 15:47:26.088320144
+0200
-@@ -51,7 +51,7 @@
-
- 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 -urNad
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-wlex/Makefile
pxp-1.1.95/gensrc/pxp-wlex/Makefile
---- /home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-wlex/Makefile
2004-09-04 19:48:32.000000000 +0200
-+++ pxp-1.1.95/gensrc/pxp-wlex/Makefile 2004-09-09 15:47:34.124098520
+0200
-@@ -19,7 +19,7 @@
- rm -f META
-
- install:
-- $(OCAMLFIND) install pxp-wlex META
-+ $(OCAMLFIND) install -destdir $(DESTDIR) pxp-wlex META
-
- uninstall:
- $(OCAMLFIND) remove pxp-wlex
-diff -urNad
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-wlex-utf8/Makefile
pxp-1.1.95/gensrc/pxp-wlex-utf8/Makefile
----
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/gensrc/pxp-wlex-utf8/Makefile
2004-09-04 19:48:32.000000000 +0200
-+++ pxp-1.1.95/gensrc/pxp-wlex-utf8/Makefile 2004-09-09 15:47:44.872464520
+0200
-@@ -48,7 +48,7 @@
-
- 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 -urNad /home/zack/dati/debian/packages/pxp/pxp-1.1.95/Makefile
pxp-1.1.95/Makefile
---- /home/zack/dati/debian/packages/pxp/pxp-1.1.95/Makefile 2004-09-04
19:48:30.000000000 +0200
-+++ pxp-1.1.95/Makefile 2004-09-09 15:44:23.180126416 +0200
-@@ -59,7 +59,7 @@
- CLEAN: clean
-
- .PHONY: distclean
--distclean:
-+distclean: clean
- rm -f *~ Makefile.conf
- $(MAKE) -C tools distclean
- $(MAKE) -C src distclean
-diff -urNad /home/zack/dati/debian/packages/pxp/pxp-1.1.95/Makefile.rules
pxp-1.1.95/Makefile.rules
---- /home/zack/dati/debian/packages/pxp/pxp-1.1.95/Makefile.rules
2004-09-04 19:48:30.000000000 +0200
-+++ pxp-1.1.95/Makefile.rules 2004-09-09 15:43:59.373745536 +0200
-@@ -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 -urNad /home/zack/dati/debian/packages/pxp/pxp-1.1.95/src/pxp/Makefile
pxp-1.1.95/src/pxp/Makefile
---- /home/zack/dati/debian/packages/pxp/pxp-1.1.95/src/pxp/Makefile
2004-09-04 19:48:31.000000000 +0200
-+++ pxp-1.1.95/src/pxp/Makefile 2004-09-09 15:44:44.889826040 +0200
-@@ -13,7 +13,7 @@
- rm -f META
-
- install:
-- $(OCAMLFIND) install pxp META
-+ $(OCAMLFIND) install -destdir $(DESTDIR) pxp META
-
- uninstall:
- $(OCAMLFIND) remove pxp
-diff -urNad
/home/zack/dati/debian/packages/pxp/pxp-1.1.95/src/pxp-engine/Makefile
pxp-1.1.95/src/pxp-engine/Makefile
---- /home/zack/dati/debian/packages/pxp/pxp-1.1.95/src/pxp-engine/Makefile
2004-09-04 19:48:31.000000000 +0200
-+++ pxp-1.1.95/src/pxp-engine/Makefile 2004-09-09 15:45:04.383862496 +0200
-@@ -29,7 +29,7 @@
-
- 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 -urNad /home/zack/dati/debian/packages/pxp/pxp-1.1.95/src/pxp-pp/Makefile
pxp-1.1.95/src/pxp-pp/Makefile
---- /home/zack/dati/debian/packages/pxp/pxp-1.1.95/src/pxp-pp/Makefile
2004-09-04 19:48:32.000000000 +0200
-+++ pxp-1.1.95/src/pxp-pp/Makefile 2004-09-09 15:45:31.891680672 +0200
-@@ -24,7 +24,7 @@
- rm -f META depend
-
- install:
-- $(OCAMLFIND) install pxp-pp pxp_pp.cma META
-+ $(OCAMLFIND) install -destdir $(DESTDIR) pxp-pp pxp_pp.cma META
-
- uninstall:
- $(OCAMLFIND) remove pxp-pp
diff --git a/debian/patches/ocamldoc_missing_txt.dpatch
b/debian/patches/ocamldoc_missing_txt.dpatch
deleted file mode 100755
index 12bb480..0000000
--- a/debian/patches/ocamldoc_missing_txt.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocamldoc_missing_txt.dpatch by Stefano Zacchiroli <z...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid dependending on a missing .txt document
-
-@DPATCH@
-diff -urNad pxp~/src/pxp-engine/Makefile.code pxp/src/pxp-engine/Makefile.code
---- pxp~/src/pxp-engine/Makefile.code 2009-03-16 17:36:26.000000000 +0100
-+++ pxp/src/pxp-engine/Makefile.code 2009-03-16 17:37:30.743013465 +0100
-@@ -21,8 +21,7 @@
- pxp_marshal.mli pxp_yacc.mli pxp_reader.mli \
- intro_trees.txt intro_extensions.txt intro_namespaces.txt \
- intro_events.txt intro_resolution.txt intro_getting_started.txt \
-- intro_advanced.txt intro_preprocessor.txt \
-- example_readme.txt
-+ intro_advanced.txt intro_preprocessor.txt
-
- XOBJ = $(OBJ:.cmo=.cmx)
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1f0f2e6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
+0002-Avoid-dependending-on-a-missing-.txt-document.patch
diff --git a/debian/rules b/debian/rules
index de11be4..48c8788 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/ocaml.mk
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches
--
pxp 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
