[Pkg-ocaml-maint-commits] r5763 - /trunk/packages/lablgtksourceview/

2008-06-10 Thread zack
Author: zack
Date: Tue Jun 10 07:25:18 2008
New Revision: 5763

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=5763
Log:
removing old dir for lablgtksourceview

(it has been part of lablgtk2 for more than a year now)

Removed:
trunk/packages/lablgtksourceview/


___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, master, updated. b01dbbf626b0f8f589827a38066c3edbeef7c323

2008-06-10 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 4ef4eff5618af006886fee1e6921b268054adfe2
Author: Stephane Glondu [EMAIL PROTECTED]
Date:   Tue Jun 10 14:55:30 2008 +0200

Set up build system

diff --git a/debian/libpam-ocaml-dev.docs b/debian/libpam-ocaml-dev.docs
new file mode 100644
index 000..e845566
--- /dev/null
+++ b/debian/libpam-ocaml-dev.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/libpam-ocaml-dev.install.in 
b/debian/libpam-ocaml-dev.install.in
new file mode 100644
index 000..7a357a0
--- /dev/null
+++ b/debian/libpam-ocaml-dev.install.in
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/pam/*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..7204ae6
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,64 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+OCAMLABI := $(shell ocamlc -version)
+BYTECODE := $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+OPTTARGET := $(if $(BYTECODE),,opt)
+
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
+ocamlinit:
+   for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in  
$$f; done
+
+configure: configure-stamp
+configure-stamp: ocamlinit
+   dh_testdir
+   touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp
+   dh_testdir
+   $(MAKE) META byte $(OPTTARGET)
+   touch $@
+
+clean:
+   dh_testdir
+   dh_testroot
+   rm -f build-stamp configure-stamp $(OFILES)
+   $(MAKE) clean
+   dh_clean
+
+install: build
+   dh_testdir
+   dh_testroot
+   dh_clean -k
+   dh_installdirs
+   $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAMLABI)/pam 
install
+
+
+binary-indep: build install
+
+binary-arch: build install
+   dh_testdir
+   dh_testroot
+   dh_installchangelogs
+   dh_installdocs
+   dh_installexamples
+   dh_install --sourcedir=debian/tmp
+   dh_installman
+   dh_link
+   dh_strip
+   dh_compress
+   dh_fixperms
+   dh_installdeb
+   dh_shlibdeps
+   dh_gencontrol
+   dh_md5sums
+   dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure ocamlinit

-- 
ocamlpam packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, master, updated. b01dbbf626b0f8f589827a38066c3edbeef7c323

2008-06-10 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 85e8865a036ec90e5c5ca928f6acf73383f48c60
Author: Stephane Glondu [EMAIL PROTECTED]
Date:   Tue Jun 10 14:32:26 2008 +0200

Improve the Makefile

 * Provide a META file
 * Add install target
 * Use ocamlmklib so that a shared lib with the bindings is generated

diff --git a/META.in b/META.in
new file mode 100644
index 000..d1ecc58
--- /dev/null
+++ b/META.in
@@ -0,0 +1,4 @@
+description = OCaml bindings for the PAM library
+version = _VERSION_
+archive(byte) = pam.cma
+archive(native) = pam.cmxa
diff --git a/Makefile b/Makefile
index c8ab659..84b2de4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-AR=ar
 OCAMLC=ocamlc
 OCAMLOPT=ocamlopt
+OCAMLMKLIB=ocamlmklib
+OCAMLMKLIB_OPTS=-oc pam_stubs -lpam
 
 VERSION=1.0
 DISTNAME=ocamlpam-$(VERSION)
@@ -9,23 +10,34 @@ SOURCES=pam.mli pam.ml
 BASENAME=pam_stubs
 LIBNAME=lib$(BASENAME).a
 
-.PHONY: all dist clean
+DESTDIR=$(shell ocamlc -where)
 
-all: byte opt
+.PHONY: all dist clean install
+
+all: META byte opt
+
+META: META.in
+   sed 's/_VERSION_/$(VERSION)/' META.in  META
 
 $(LIBNAME): pam_stubs.c
$(OCAMLC) -c pam_stubs.c
-   $(AR) rc $(LIBNAME) pam_stubs.o
+   $(OCAMLMKLIB) $(OCAMLMKLIB_OPTS) pam_stubs.o
 
 byte: $(LIBNAME) $(SOURCES)
$(OCAMLC) -c pam.mli
$(OCAMLC) -c pam.ml
-   $(OCAMLC) -a -o pam.cma -custom pam.cmo -cclib -lpam -cclib 
-l$(BASENAME)
+   $(OCAMLMKLIB) $(OCAMLMKLIB_OPTS) -o pam pam.cmo
 
 opt: $(LIBNAME) $(SOURCES)
$(OCAMLOPT) -c pam.mli
$(OCAMLOPT) -c pam.ml
-   $(OCAMLOPT) -a -o pam.cmxa pam.cmx -cclib -lpam -cclib -l$(BASENAME)
+   $(OCAMLMKLIB) $(OCAMLMKLIB_OPTS) -o pam pam.cmx
+
+install:
+   install -d $(DESTDIR)/pam
+   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
 
 dist: clean
mkdir -p $(DISTNAME)
@@ -35,4 +47,4 @@ dist: clean
rm -fr $(DISTNAME)
 
 clean:
-   -rm -fr *.cm* *.a *.o $(DISTNAME).tar.gz $(DISTNAME).zip $(DISTNAME)
+   -rm -fr *.cm* *.a *.o *.so *~ $(DISTNAME).tar.gz $(DISTNAME).zip 
$(DISTNAME) META

-- 
ocamlpam packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, master, updated. b01dbbf626b0f8f589827a38066c3edbeef7c323

2008-06-10 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 8d7d4b4607309b41ebae6a319f4954d96bfb525c
Author: Stephane Glondu [EMAIL PROTECTED]
Date:   Tue Jun 10 15:05:24 2008 +0200

Install shared stubs

diff --git a/debian/libpam-ocaml.install.in b/debian/libpam-ocaml.install.in
new file mode 100644
index 000..dbfc764
--- /dev/null
+++ b/debian/libpam-ocaml.install.in
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/stublibs/*
diff --git a/debian/rules b/debian/rules
index 7204ae6..a78065b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
-   $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAMLABI)/pam 
install
+   $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr/lib/ocaml/$(OCAMLABI) install
 
 
 binary-indep: build install

-- 
ocamlpam packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, upstream+patches, created. 1232f7d1f064b374bda7d2347842da3e846dae1a

2008-06-10 Thread Stephane Glondu
The branch, upstream+patches has been created
at  1232f7d1f064b374bda7d2347842da3e846dae1a (commit)

- Shortlog 
commit 1232f7d1f064b374bda7d2347842da3e846dae1a
Author: Stephane Glondu [EMAIL PROTECTED]
Date:   Tue Jun 10 14:32:26 2008 +0200

Improve the Makefile

 * Provide a META file
 * Add install target
 * Use ocamlmklib so that a shared lib with the bindings is generated

---

-- 
ocamlpam packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, master, updated. b1bbbd8095f4ccdf2bfacf1fe6d58892038eebe9

2008-06-10 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit ab724c329a7f966bf0ea4a15bfb3fc5c27853be5
Merge: b01dbbf626b0f8f589827a38066c3edbeef7c323 
5dbaf12cacf0508061ca2f1496b354868185f81e
Author: Stephane Glondu [EMAIL PROTECTED]
Date:   Tue Jun 10 21:44:29 2008 +0200

Merge branch 'upstream+patches'


-- 
ocamlpam packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits