[Pkg-ocaml-maint-commits] [SCM] OCaml bindings for the PAM library branch, master, updated. debian/1.1-3-3-g8c6c6f9

Stephane Glondu steph at glondu.net
Tue Oct 20 07:39:16 UTC 2009


The following commit has been merged in the master branch:
commit 1fa9638cc3a5eac8ee57e714490ca56fa454a5c8
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Oct 20 09:30:06 2009 +0200

    Switch patches to quilt

diff --git a/Makefile b/Makefile
index e8aa80d..976ce9b 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ opt: $(LIBNAME) $(SOURCES)
 
 install:
 	install -d $(DESTDIR)/pam
-	install -m 644 -t $(DESTDIR)/pam META $(wildcard *.mli *.cmi *.cmx *.cma *.cmxa *.a)
+	install -m 644 -t $(DESTDIR)/pam META *.mli *.cmi *.cmx *.cma *.cmxa *.a
 	install -d $(DESTDIR)/stublibs
 	install -m 644 -t $(DESTDIR)/stublibs dll$(BASENAME).so
 
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8d6fdae
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+ocamlpam Debian source package
+==============================
+
+Patching upstream sources
+-------------------------
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.5) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stéphane Glondu <glondu at debian.org>, Tue, 20 Oct 2009 09:29:51 +0200
diff --git a/debian/control b/debian/control
index 616008e..d6ada18 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
  cdbs,
+ quilt (>= 0.46-7~),
  debhelper (>= 7),
  dh-ocaml (>= 0.9),
  libpam-dev,
diff --git a/debian/patches/0001-Fix-FTBFS-when-native-objects-are-not-compiled.patch b/debian/patches/0001-Fix-FTBFS-when-native-objects-are-not-compiled.patch
new file mode 100644
index 0000000..4ce2daf
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-when-native-objects-are-not-compiled.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 5 Jul 2008 09:06:36 +0200
+Subject: [PATCH] Fix FTBFS when native objects are not compiled
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 976ce9b..e8aa80d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,7 @@ opt: $(LIBNAME) $(SOURCES)
+ 
+ install:
+ 	install -d $(DESTDIR)/pam
+-	install -m 644 -t $(DESTDIR)/pam META *.mli *.cmi *.cmx *.cma *.cmxa *.a
++	install -m 644 -t $(DESTDIR)/pam META $(wildcard *.mli *.cmi *.cmx *.cma *.cmxa *.a)
+ 	install -d $(DESTDIR)/stublibs
+ 	install -m 644 -t $(DESTDIR)/stublibs dll$(BASENAME).so
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0813239
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-FTBFS-when-native-objects-are-not-compiled.patch
diff --git a/debian/rules b/debian/rules
index 7b6bc47..4a031fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk

-- 
OCaml bindings for the PAM library



More information about the Pkg-ocaml-maint-commits mailing list