[Pkg-ocaml-maint-commits] [SCM] camlidl packaging branch, master, updated. debian/1.05-12-3-gf9d64a7
Stephane Glondu
steph at glondu.net
Sat Jul 3 16:44:57 UTC 2010
The following commit has been merged in the master branch:
commit f9d64a7ad15675c26a2117bd3642a4e99443c8f1
Author: Stephane Glondu <steph at glondu.net>
Date: Sat Jul 3 18:40:42 2010 +0200
Switch source package format to 3.0 (quilt)
diff --git a/debian/changelog b/debian/changelog
index ef38142..c852100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ camlidl (1.05-13) UNRELEASED; urgency=low
- remove Conflicts to camlidl-doc (older than oldstable)
- update Standards-Version to 3.9.0
* debian/rules: fix order of CDBS includes
+ * Switch source package format to 3.0 (quilt)
-- Stephane Glondu <steph at glondu.net> Sun, 26 Jul 2009 03:30:59 +0200
diff --git a/debian/control b/debian/control
index 1d106fb..09c02f1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Uploaders:
Sylvain Le Gall <gildor at debian.org>
Build-Depends:
cdbs (>= 0.4.23-1.1),
- dpatch,
ocaml-nox (>= 3.11),
po4a,
docbook-xml (>= 4.4),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..6c7ed3b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,3 @@
[DEFAULT]
pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
diff --git a/debian/patches/37_make.dpatch b/debian/patches/0001-Makefiles-fixes.patch
old mode 100755
new mode 100644
similarity index 55%
rename from debian/patches/37_make.dpatch
rename to debian/patches/0001-Makefiles-fixes.patch
index be43ddc..541c4a8
--- a/debian/patches/37_make.dpatch
+++ b/debian/patches/0001-Makefiles-fixes.patch
@@ -1,33 +1,39 @@
-#! /bin/sh -e
-## 37_make.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch upstream Makefiles in order to:
-## DP: - install stuff properly in debian/ subdirs
-## DP: - built native code stuff only if ocamlopt is available
-## DP: - install camlidlruntime.h header in /usr/include/ocaml/<version>/
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Sat, 3 Jul 2010 18:35:28 +0200
+Subject: [PATCH] Makefiles fixes
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+Patch upstream Makefiles in order to:
+ - install stuff properly in debian/ subdirs
+ - built native code stuff only if ocamlopt is available
+ - install camlidlruntime.h header in /usr/include/ocaml/<version>/
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
+Author: Stefano Zacchiroli <zack at debian.org>
+---
+ Makefile | 3 +++
+ config/Makefile.unix | 22 ++++++++++++----------
+ lib/Makefile | 17 +++++++++++++----
+ runtime/Makefile.unix | 2 +-
+ 4 files changed, 29 insertions(+), 15 deletions(-)
-exit 0
- at DPATCH@
-diff -urNad camlidl-1.05~/config/Makefile.unix camlidl-1.05/config/Makefile.unix
---- camlidl-1.05~/config/Makefile.unix 2002-04-22 13:50:46.000000000 +0200
-+++ camlidl-1.05/config/Makefile.unix 2005-12-02 00:46:33.000000000 +0100
-@@ -19,7 +19,7 @@
+diff --git a/Makefile b/Makefile
+index 45c18d2..b1e6d17 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,6 +20,9 @@ all:
+ cd lib; $(MAKE) all
+ cd tools; $(MAKE) all
+
++opt:
++ cd lib; $(MAKE) opt
++
+ install:
+ cd compiler; $(MAKE) install
+ cd runtime; $(MAKE) install
+diff --git a/config/Makefile.unix b/config/Makefile.unix
+index cf4549c..8e1eae4 100644
+--- a/config/Makefile.unix
++++ b/config/Makefile.unix
+@@ -19,7 +19,7 @@ OSTYPE=unix
# How to invoke the C preprocessor
# Works on most Unix systems:
@@ -36,7 +42,7 @@ diff -urNad camlidl-1.05~/config/Makefile.unix camlidl-1.05/config/Makefile.unix
# Alternatives:
# CPP=cpp
# CPP=/usr/ccs/lib/cpp
-@@ -30,23 +30,25 @@
+@@ -30,23 +30,25 @@ RANLIB=ranlib
# If ranlib is not needed:
#RANLIB=:
@@ -71,10 +77,11 @@ diff -urNad camlidl-1.05~/config/Makefile.unix camlidl-1.05/config/Makefile.unix
-OBJEXT=o
+# Extension for lib files (do not change)
+LIB=.a
-diff -urNad camlidl-1.05~/lib/Makefile camlidl-1.05/lib/Makefile
---- camlidl-1.05~/lib/Makefile 2005-12-02 00:44:03.000000000 +0100
-+++ camlidl-1.05/lib/Makefile 2005-12-02 00:45:11.000000000 +0100
-@@ -19,8 +19,11 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index 7ce04da..43c77fe 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -19,8 +19,11 @@ BYTELIB=com.cma
NATIVEOBJS=$(BYTEOBJS:.cmo=.cmx)
NATIVELIB=$(BYTELIB:.cma=.cmxa)
INTERFACES=$(BYTEOBJS:.cmo=.cmi)
@@ -87,7 +94,7 @@ diff -urNad camlidl-1.05~/lib/Makefile camlidl-1.05/lib/Makefile
$(BYTELIB): $(BYTEOBJS)
$(OCAMLC) -a -o $(BYTELIB) $(BYTEOBJS)
-@@ -29,8 +32,14 @@
+@@ -29,8 +32,14 @@ $(NATIVELIB): $(NATIVEOBJS)
$(OCAMLOPT) -a -o $(NATIVELIB) $(NATIVEOBJS)
install:
@@ -104,7 +111,7 @@ diff -urNad camlidl-1.05~/lib/Makefile camlidl-1.05/lib/Makefile
.SUFFIXES: .mli .ml .cmi .cmo .cmx
-@@ -43,7 +52,7 @@
+@@ -43,7 +52,7 @@ install:
# Clean up
clean::
@@ -113,23 +120,11 @@ diff -urNad camlidl-1.05~/lib/Makefile camlidl-1.05/lib/Makefile
# Dependencies
depend:
-diff -urNad camlidl-1.05~/Makefile camlidl-1.05/Makefile
---- camlidl-1.05~/Makefile 2005-12-02 00:44:03.000000000 +0100
-+++ camlidl-1.05/Makefile 2005-12-02 00:45:11.000000000 +0100
-@@ -20,6 +20,9 @@
- cd lib; $(MAKE) all
- cd tools; $(MAKE) all
-
-+opt:
-+ cd lib; $(MAKE) opt
-+
- install:
- cd compiler; $(MAKE) install
- cd runtime; $(MAKE) install
-diff -urNad camlidl-1.05~/runtime/Makefile.unix camlidl-1.05/runtime/Makefile.unix
---- camlidl-1.05~/runtime/Makefile.unix 2005-12-02 00:44:03.000000000 +0100
-+++ camlidl-1.05/runtime/Makefile.unix 2005-12-02 00:45:11.000000000 +0100
-@@ -22,7 +22,7 @@
+diff --git a/runtime/Makefile.unix b/runtime/Makefile.unix
+index 5617349..737b048 100644
+--- a/runtime/Makefile.unix
++++ b/runtime/Makefile.unix
+@@ -22,7 +22,7 @@ libcamlidl.a: $(OBJS)
$(RANLIB) $@
install:
@@ -138,3 +133,4 @@ diff -urNad camlidl-1.05~/runtime/Makefile.unix camlidl-1.05/runtime/Makefile.un
cp libcamlidl.a $(OCAMLLIB)/libcamlidl.a
cd $(OCAMLLIB); $(RANLIB) libcamlidl.a
+--
diff --git a/debian/patches/0002-Fix-implicit-pointer-conversion.patch b/debian/patches/0002-Fix-implicit-pointer-conversion.patch
new file mode 100644
index 0000000..b60dbfe
--- /dev/null
+++ b/debian/patches/0002-Fix-implicit-pointer-conversion.patch
@@ -0,0 +1,27 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Sat, 3 Jul 2010 18:36:39 +0200
+Subject: [PATCH] Fix implicit pointer conversion
+
+Avoid segfault on archs where size of pointer is greater than
+the size of an integer (patch provided by Dann Frazier).
+
+Author: dann frazier <dannf at hp.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=323221
+Signed-off-by: Sylvain Le Gall <gildor at debian.org>
+---
+ runtime/comerror.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/runtime/comerror.c b/runtime/comerror.c
+index 1e68542..a137b29 100644
+--- a/runtime/comerror.c
++++ b/runtime/comerror.c
+@@ -22,6 +22,7 @@
+ #include <caml/callback.h>
+ #include <caml/fail.h>
+ #include <caml/alloc.h>
++#include <caml/printexc.h>
+ #include "camlidlruntime.h"
+ #include "comstuff.h"
+
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8ad1665..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-37_make
-38_implicit_pointer_conversion
diff --git a/debian/patches/38_implicit_pointer_conversion.dpatch b/debian/patches/38_implicit_pointer_conversion.dpatch
deleted file mode 100755
index d6d4a41..0000000
--- a/debian/patches/38_implicit_pointer_conversion.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: avoid segfault on archs where size of pointer is greater than
-## DP: the size of an integer (patch provided by Damn Frazier).
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./runtime/comerror.c /tmp/dpep-work.p5ssjX/camlidl-1.05/runtime/comerror.c
---- ./runtime/comerror.c 2001-06-17 12:51:24.000000000 +0200
-+++ /tmp/dpep-work.p5ssjX/camlidl-1.05/runtime/comerror.c 2005-08-15 17:33:01.000000000 +0200
-@@ -22,6 +22,7 @@
- #include <caml/callback.h>
- #include <caml/fail.h>
- #include <caml/alloc.h>
-+#include <caml/printexc.h>
- #include "camlidlruntime.h"
- #include "comstuff.h"
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..49cb4bf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Makefiles-fixes.patch
+0002-Fix-implicit-pointer-conversion.patch
diff --git a/debian/rules b/debian/rules
index 796cd18..0d09be3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@
# Generate debian/control using
# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/ocaml.mk
include /usr/share/cdbs/1/class/makefile.mk
--
camlidl packaging
More information about the Pkg-ocaml-maint-commits
mailing list