[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, master, created. 7d12286143751b7e6ff947ba8407fb86f43e95a9
The branch, master has been created at 7d12286143751b7e6ff947ba8407fb86f43e95a9 (commit) - Shortlog commit 7d12286143751b7e6ff947ba8407fb86f43e95a9 Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu May 8 18:52:16 2008 +0200 Imported Upstream version 1.0 --- -- 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, pristine-tar, created. 495c0da0229574849d65c884919ebaad4a726894
The branch, pristine-tar has been created at 495c0da0229574849d65c884919ebaad4a726894 (commit) - Shortlog commit 495c0da0229574849d65c884919ebaad4a726894 Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu May 8 18:52:17 2008 +0200 pristine-tar data for ocamlpam-1.0.tar.gz --- -- 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
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
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
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
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
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
[Pkg-ocaml-maint-commits] [SCM] ocamlpam packaging branch, master, updated. a9aa9fc884fa33f365817fa541a7a40f75465694
The following commit has been merged in the master branch: commit eac5b3c7eabfa5bb83258c4f4dee8e04e4619104 Merge: b1bbbd8095f4ccdf2bfacf1fe6d58892038eebe9 4590ca9ffc11df3b1e5402784b49b78b6ce35591 Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Jun 15 01:24:52 2008 +0200 Merge branch 'upstream' -- 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. a9aa9fc884fa33f365817fa541a7a40f75465694
The following commit has been merged in the master branch: commit a9aa9fc884fa33f365817fa541a7a40f75465694 Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Jun 15 01:33:23 2008 +0200 New upstream release The two patches have been included upstream. diff --git a/debian/changelog b/debian/changelog index 4ceaccb..20b0df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ -ocamlpam (1.0-1) UNRELEASED; urgency=low +ocamlpam (1.1-1) UNRELEASED; urgency=low * Initial release (Closes: #476482) - * Patch Makefile: add META, install targets and use ocamlmklib - * Patch pam_stubs.c (bugfix): remove excessive free() - -- Stephane Glondu [EMAIL PROTECTED] Tue, 10 Jun 2008 21:46:21 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Sun, 15 Jun 2008 01:29:14 +0200 -- 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, pristine-tar, updated. 6c6c5cfdafc18df1a04514c1d0938abc4c83716d
The following commit has been merged in the pristine-tar branch: commit 6c6c5cfdafc18df1a04514c1d0938abc4c83716d Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Jun 15 01:40:32 2008 +0200 pristine-tar data for ocamlpam_1.1.orig.tar.gz diff --git a/ocamlpam_1.1.orig.tar.gz.delta b/ocamlpam_1.1.orig.tar.gz.delta new file mode 100644 index 000..c8a8303 Binary files /dev/null and b/ocamlpam_1.1.orig.tar.gz.delta differ diff --git a/ocamlpam_1.1.orig.tar.gz.id b/ocamlpam_1.1.orig.tar.gz.id new file mode 100644 index 000..98b418d --- /dev/null +++ b/ocamlpam_1.1.orig.tar.gz.id @@ -0,0 +1 @@ +4590ca9ffc11df3b1e5402784b49b78b6ce35591 -- 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] OCaml bindings for the PAM library branch, master, updated. upstream/1.1-17-g6931998
The following commit has been merged in the master branch: commit 4c6148a41eae76b40a1d496ac737f94b3490f2a6 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jun 16 17:21:17 2008 +0200 Switch to machine-parsable copyright file format See http://wiki.debian.org/Proposals/CopyrightFormat diff --git a/debian/copyright b/debian/copyright index 02fa308..29cc189 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,37 +1,35 @@ -This package was debianized by Stéphane Glondu [EMAIL PROTECTED] on -Fri, 09 May 2008 00:53:23 +0200. - -It was downloaded from http://sharvil.nanavati.net/projects/ocamlpam/ - -Upstream Author: - -Sharvil Nanavati [EMAIL PROTECTED] - -Copyright: - -Copyright © 2008 Sharvil Nanavati - -License: - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the Software), to deal in the Software without -restriction, including without limitation the rights to use, copy, -modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -The Debian packaging is © 2008, Stéphane Glondu [EMAIL PROTECTED] and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +Packaged-By: Stéphane Glondu [EMAIL PROTECTED] +Packaged-Date: Fri, 09 May 2008 00:53:23 +0200 +Original-Source-Location: http://sharvil.nanavati.net/projects/ocamlpam/ + +Files: * +Copyright: © 2008 Sharvil Nanavati [EMAIL PROTECTED] +License: MIT + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the Software), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +Files: debian/* +Copyright: © 2008 Stéphane Glondu [EMAIL PROTECTED] +License: GPL-3+ + + The Debian packaging is copyright Stéphane Glondu, and licensed + under the GNU General Public License, see + `/usr/share/common-licenses/GPL' for the full text. -- OCaml bindings for the PAM library ___ 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] OCaml bindings for the PAM library tag, upstream/1.0, created. 7d12286143751b7e6ff947ba8407fb86f43e95a9
The tag, upstream/1.0 has been created at 7d12286143751b7e6ff947ba8407fb86f43e95a9 (commit) - Shortlog commit 7d12286143751b7e6ff947ba8407fb86f43e95a9 Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu May 8 18:52:16 2008 +0200 Imported Upstream version 1.0 --- -- OCaml bindings for the PAM library ___ 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] lwt packaging branch, master, created. 56da407aafa2254c2b4f47213dc5011960b3ee6f
The branch, master has been created at 56da407aafa2254c2b4f47213dc5011960b3ee6f (commit) - Shortlog commit 56da407aafa2254c2b4f47213dc5011960b3ee6f Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Jun 27 00:34:50 2008 +0200 Imported Upstream version 1.1.0 --- -- lwt 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] lwt packaging branch, pristine-tar, created. 50e4a4c3e0b7a8dad50c875411ecc52e55eacf63
The branch, pristine-tar has been created at 50e4a4c3e0b7a8dad50c875411ecc52e55eacf63 (commit) - Shortlog commit 50e4a4c3e0b7a8dad50c875411ecc52e55eacf63 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Jun 27 00:34:51 2008 +0200 pristine-tar data for lwt_1.1.0.orig.tar.gz --- -- lwt 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] OCaml bindings for the PAM library branch, master, updated. debian/1.1-1-4-gd0f6f55
The following commit has been merged in the master branch: commit d0f6f5522c948060270a86db30fe3830e45e47ba Author: Stephane Glondu [EMAIL PROTECTED] Date: Sat Jul 5 09:20:08 2008 +0200 Document patch and prepare for new release diff --git a/debian/changelog b/debian/changelog index 869de71..d72c599 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamlpam (1.1-2) unstable; urgency=low + + * Patch upstream Makefile (install target) to fix FTBFS on non- +native architectures + + -- Stephane Glondu [EMAIL PROTECTED] Sat, 05 Jul 2008 09:15:36 +0200 + ocamlpam (1.1-1) unstable; urgency=low * Initial release (Closes: #476482) -- OCaml bindings for the PAM library ___ 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] OCaml bindings for the PAM library branch, upstream+patches, created. upstream/1.1-1-g17d1ace
The branch, upstream+patches has been created at 17d1acec8a6429e8d5b0573055c6b95702ca0741 (commit) - Shortlog --- -- OCaml bindings for the PAM library ___ 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] OCaml bindings for the PAM library annotated tag, debian/1.1-2, created. debian/1.1-2
The annotated tag, debian/1.1-2 has been created at 9bc7085697713b35998e64ca4aba89f9a983e3b9 (tag) tagging d0f6f5522c948060270a86db30fe3830e45e47ba (commit) replaces debian/1.1-1 tagged by Stephane Glondu on Sat Jul 5 11:21:53 2008 +0200 - Shortlog Debian release 1.1-2 Stephane Glondu (3): Fix FTBFS when native objects are not compiled Merge branch 'upstream+patches' Document patch and prepare for new release --- -- OCaml bindings for the PAM library ___ 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] OCaml packaging branch, master, updated. debian/3.10.2-3-1-g215dc29
The following commit has been merged in the master branch: commit 215dc297a719e0a18cc895b5ca94855b00388c2f Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Jul 8 11:25:51 2008 +0200 First steps to switching packaging to git diff --git a/debian/changelog b/debian/changelog index 27009b2..9b56356 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (3.10.2-4) UNRELEASED; urgency=low + + * Switching packaging to git (from svn) + + -- Stephane Glondu [EMAIL PROTECTED] Tue, 08 Jul 2008 11:15:35 +0200 + ocaml (3.10.2-3) unstable; urgency=low [ Stefano Zacchiroli ] @@ -1548,4 +1554,3 @@ ocaml (1.02-1) non-free; urgency=low * Added Debian GNU/Linux Linux package maintenance system files -- Christophe Le Bars [EMAIL PROTECTED] Fri, 11 Oct 1996 22:25:01 +0200 - diff --git a/debian/control b/debian/control index 22d0533..4d803c0 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Sven Luther [EMAIL PROTECTED], Stefano Zacchiroli [EMAIL PROTECTED], Julien Cristau [EMAIL PROTECTED], Samuel Mimram [EMAIL PROTECTED], Sylvain Le Gall [EMAIL PROTECTED], Ralf Treinen [EMAIL PROTECTED] Build-Depends: debhelper ( 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm] Standards-Version: 3.7.3 -Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/ +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git Homepage: http://caml.inria.fr/ Package: ocaml-nox diff --git a/debian/policy/appendix-cdbs.xml b/debian/policy/appendix-cdbs.xml index 91536e4..044aac2 100644 --- a/debian/policy/appendix-cdbs.xml +++ b/debian/policy/appendix-cdbs.xml @@ -37,7 +37,7 @@ include /usr/share/cdbs/1/rules/dpatch.mk variablelist varlistentry - termfilenameulink url=http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?op=fileamp;rev=0amp;sc=0;ocaml-vars.mk/ulink/filename/term + termfilenameulink url=http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git;a=blob;f=debian/cdbs/ocaml-vars.mk;hb=HEAD;ocaml-vars.mk/ulink/filename/term listitem para contains (Makefile) convenience variables which can be used in @@ -47,7 +47,7 @@ include /usr/share/cdbs/1/rules/dpatch.mk /varlistentry varlistentry - termfilenameulink url=http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?op=fileamp;rev=0amp;sc=0;ocaml.mk/ulink/filename/term + termfilenameulink url=http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git;a=blob;f=debian/cdbs/ocaml.mk;hb=HEAD;ocaml.mk/ulink/filename/term listitem para implements the class logic diff --git a/debian/svn-deblayout b/debian/svn-deblayout deleted file mode 100644 index f7696e3..000 --- a/debian/svn-deblayout +++ /dev/null @@ -1,3 +0,0 @@ -origDir=../upstream -origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml/upstream -tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml -- OCaml 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] OCaml packaging branch, master, updated. debian/3.10.2-3-7-gfef0417
The following commit has been merged in the master branch:
commit c8bdd9e0fc12634749a2d0c7c5f678c49f7747dc
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Tue Jul 8 13:56:53 2008 +0200
Copy config.{sub,guess} in pre-config phase instead of clean
diff --git a/debian/rules b/debian/rules
index 98c334b..07e0a76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,14 @@ debian/control:
sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in $@
pre-config: debian/$(SRCTARBALL)
+ for ext in sub guess; do \
+ if [ -f /usr/share/misc/config.$$ext ] ! [ -f
debian/config.orig.$$ext ] ; then \
+ mv config/gnu/config.$$ext debian/config.orig.$$ext; \
+ cp -f /usr/share/misc/config.$$ext config/gnu/config.$$ext; \
+ fi; \
+ done
touch $@
+
debian/$(SRCTARBALL):
ln -fs . $(DISTDIR) # beware of the symlink recursion!
tar --anchored -chjf $@ \
@@ -134,12 +141,11 @@ clean: abi-sed unpatch
$(MAKE) -C debian/ocaml-md5sums clean
$(MAKE) -C debian/dh-ocaml clean
$(MAKE) -C debian/policy clean
-ifneq $(wildcard /usr/share/misc/config.sub)
- -cp -f /usr/share/misc/config.sub config/gnu/config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess)
- -cp -f /usr/share/misc/config.guess config/gnu/config.guess
-endif
+ for ext in sub guess; do \
+ if [ -f debian/config.orig.$$ext ] ; then \
+ mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \
+ fi; \
+ done
# File not cleaned by upstream
-$(RM) _boot_log1
-$(RM) _boot_log2
--
OCaml 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] OCaml packaging branch, master, updated. debian/3.10.2-3-7-gfef0417
The following commit has been merged in the master branch: commit 18ff77549b29e1de14a3bff88ce536ce5b848b5f Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Jul 8 14:14:56 2008 +0200 Remove stray script remaining from svn2git conversion diff --git a/ocaml-tags-svn2git.sh b/ocaml-tags-svn2git.sh deleted file mode 100644 index 720b9db..000 --- a/ocaml-tags-svn2git.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/zsh -e -export GIT_AUTHOR_NAME -export GIT_AUTHOR_EMAIL -export GIT_AUTHOR_DATE -export GIT_COMMITTER_NAME -export GIT_COMMITTER_EMAIL -export GIT_COMMITTER_DATE - -- OCaml 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] OCaml packaging branch, master, updated. debian/3.10.2-3-7-gfef0417
The following commit has been merged in the master branch: commit 910fc7f880da1d419a3fb6be18998a21199c268f Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Jul 8 14:33:09 2008 +0200 Bump debhelper compatibility level to 7 * use debian/clean for cleaning upstream files * make explicit sourcedir in dh_install calls * dh_clean -k - dh_prep diff --git a/debian/changelog b/debian/changelog index 9b56356..be38b65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ ocaml (3.10.2-4) UNRELEASED; urgency=low * Switching packaging to git (from svn) + * Bump debhelper compatibility level to 7, and use debian/clean feature +of dh_clean - -- Stephane Glondu [EMAIL PROTECTED] Tue, 08 Jul 2008 11:15:35 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Tue, 08 Jul 2008 14:30:11 +0200 ocaml (3.10.2-3) unstable; urgency=low diff --git a/debian/clean b/debian/clean new file mode 100644 index 000..e2d10dd --- /dev/null +++ b/debian/clean @@ -0,0 +1,13 @@ +_boot_log1 +_boot_log2 +_log +byterun/libcamlrun_shared.so +camlp4/config/Makefile +camlp4/config/Makefile.cnf +config/Makefile +config/m.h +config/s.h +debian/README.labltk +driver/ocamlcomp.sh +emacs/ocamltags +myocamlbuild_config.ml diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 4d803c0..fe68c88 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Sven Luther [EMAIL PROTECTED], Stefano Zacchiroli [EMAIL PROTECTED], Julien Cristau [EMAIL PROTECTED], Samuel Mimram [EMAIL PROTECTED], Sylvain Le Gall [EMAIL PROTECTED], Ralf Treinen [EMAIL PROTECTED] -Build-Depends: debhelper ( 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm] +Build-Depends: debhelper (= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm] Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git diff --git a/debian/rules b/debian/rules index 07e0a76..bb60df8 100755 --- a/debian/rules +++ b/debian/rules @@ -146,15 +146,11 @@ clean: abi-sed unpatch mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \ fi; \ done - # File not cleaned by upstream - -$(RM) _boot_log1 - -$(RM) _boot_log2 - -$(RM) _log - -$(RM) myocamlbuild_config.ml + # Files not cleaned by upstream (most of them are cleaned + # using debian/clean feature of dh_clean in debhelper 7) -$(RM) ocaml-$(OCAMLABI) - -$(RM) byterun/libcamlrun_shared.so - dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh + dh_clean debian/rules abi-sed-clean -$(RM) debian/$(SRCTARBALL) @@ -162,7 +158,7 @@ install: install-indep install-arch install-indep: build-indep dh_testdir dh_testroot - dh_clean -k -i + dh_prep -i dh_installdirs -i # Install Emacs files @@ -173,12 +169,12 @@ install-indep: build-indep fi $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags - dh_install -i + dh_install --sourcedir=. -i install-arch: build-arch dh_testdir dh_testroot - dh_clean -k -a + dh_prep -a dh_installdirs -a # Let's install ocaml first. @@ -280,7 +276,7 @@ install-arch: build-arch cp debian/ocaml-nox.override debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox chmod +x debian/cdbs/ocamldoc-api-ref-config - dh_install -a + dh_install --sourcedir=. -a # Must not depend on anything. This is to be called by # binary-arch/binary-multi in another 'make' thread. -- OCaml 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] OCaml packaging branch, master, updated. debian/3.10.2-3-7-gfef0417
The following commit has been merged in the master branch: commit fef041704f0ae52f203fe1de6cac9bde891fbb21 Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Jul 8 14:36:05 2008 +0200 Clean more files diff --git a/debian/clean b/debian/clean index e2d10dd..22a7a76 100644 --- a/debian/clean +++ b/debian/clean @@ -4,6 +4,8 @@ _log byterun/libcamlrun_shared.so camlp4/config/Makefile camlp4/config/Makefile.cnf +config/config.debian.install.sh +config/config.sh config/Makefile config/m.h config/s.h @@ -11,3 +13,4 @@ debian/README.labltk driver/ocamlcomp.sh emacs/ocamltags myocamlbuild_config.ml +tools/myocamlbuild_config.ml -- OCaml 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] Cooperative light-weight thread library for OCaml branch, master, updated. debian/1.1.0-1-2-gb25a42f
The following commit has been merged in the master branch: commit b25a42f4d7fde493ac1bd613aa4716858e637176 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Jul 11 13:25:16 2008 +0200 Upload after erroneous removal from archive (no changes) Request from Ganneff diff --git a/debian/changelog b/debian/changelog index 793c547..f6e0ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,8 @@ -lwt (1.1.0-1.1) UNRELEASED; urgency=low +lwt (1.1.0-2) unstable; urgency=low - * Non-maintainer upload. - * NOT RELEASED YET + * Upload after erroneous removal from archive (no changes) - -- Sylvain Le Gall [EMAIL PROTECTED] Sun, 29 Jun 2008 23:46:31 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Fri, 11 Jul 2008 13:20:06 +0200 lwt (1.1.0-1) unstable; urgency=low -- Cooperative light-weight thread library for OCaml ___ 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] Cooperative light-weight thread library for OCaml annotated tag, debian/1.1.0-2, created. debian/1.1.0-2
The annotated tag, debian/1.1.0-2 has been created at da85ad4fbedc6e01f04d61c1f7eacab69f6491b8 (tag) tagging b25a42f4d7fde493ac1bd613aa4716858e637176 (commit) replaces debian/1.1.0-1 tagged by Stephane Glondu on Fri Jul 11 13:26:11 2008 +0200 - Shortlog Debian release 1.1.0-2 Stephane Glondu (1): Upload after erroneous removal from archive (no changes) Sylvain Le Gall (1): Add UNRELEASED changelog entry --- -- Cooperative light-weight thread library for OCaml ___ 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] OCaml packaging branch, master, updated. debian/3.10.2-3-8-g4a1bcf4
The following commit has been merged in the master branch: commit 4a1bcf4134c9e507170c0cd93342a4dc2852fccc Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Jul 20 01:01:46 2008 +0200 Restore emacs/ocamltags.in in clean diff --git a/debian/rules b/debian/rules index bb60df8..9417872 100755 --- a/debian/rules +++ b/debian/rules @@ -141,11 +141,15 @@ clean: abi-sed unpatch $(MAKE) -C debian/ocaml-md5sums clean $(MAKE) -C debian/dh-ocaml clean $(MAKE) -C debian/policy clean + # Restore files altered by debian/rules for ext in sub guess; do \ if [ -f debian/config.orig.$$ext ] ; then \ mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \ fi; \ done + if head -n 1 emacs/ocamltags.in | grep -q '^#!/bin/sh'; then \ + sed -i 1d emacs/ocamltags.in; \ + fi # Files not cleaned by upstream (most of them are cleaned # using debian/clean feature of dh_clean in debhelper 7) -$(RM) ocaml-$(OCAMLABI) -- OCaml 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] ocsigen packaging branch, master, updated. debian/1.1.0.rc1-1-22-gc1c60c4
The following commit has been merged in the master branch: commit 9b134429154bcf18439f13d39789e0e60592f915 Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Jul 23 14:04:37 2008 +0200 Switching packaging to git diff --git a/debian/changelog b/debian/changelog index b54f1da..db7be49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocsigen (1.1.0~rc1-2) UNRELEASED; urgency=low + + * Switching packaging to git + + -- Stephane Glondu [EMAIL PROTECTED] Wed, 23 Jul 2008 14:03:29 +0200 + ocsigen (1.1.0~rc1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 16d8b34..43236fa 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: debhelper (= 7), libcryptokit-ocaml-dev Standards-Version: 3.8.0 Homepage: http://www.ocsigen.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocsigen/trunk/ +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocsigen.git +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocsigen.git Package: ocsigen Architecture: any diff --git a/debian/svn-deblayout b/debian/svn-deblayout deleted file mode 100644 index 1ecb80c..000 --- a/debian/svn-deblayout +++ /dev/null @@ -1,3 +0,0 @@ -origDir=../upstream -origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocsigen/upstream -tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocsigen -- ocsigen 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] ocsigen packaging branch, master, updated. debian/1.1.0.rc1-1-22-gc1c60c4
The following commit has been merged in the master branch: commit c1c60c4b08a911636e15cb1f1ae3a3a9667eafcd Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Jul 23 14:09:45 2008 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index db7be49..a336f66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -ocsigen (1.1.0~rc1-2) UNRELEASED; urgency=low +ocsigen (1.1.0-1) unstable; urgency=low - * Switching packaging to git + * New upstream release. + * Switching packaging to git. - -- Stephane Glondu [EMAIL PROTECTED] Wed, 23 Jul 2008 14:03:29 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Wed, 23 Jul 2008 14:08:42 +0200 ocsigen (1.1.0~rc1-1) unstable; urgency=low -- ocsigen 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] ocsigen packaging branch, pristine-tar, updated. 3887c099bbb8c5a51a92a5f2c5ac6cb88554b6a5
The following commit has been merged in the pristine-tar branch: commit 3887c099bbb8c5a51a92a5f2c5ac6cb88554b6a5 Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Jul 23 14:08:34 2008 +0200 pristine-tar data for ocsigen_1.1.0.orig.tar.gz diff --git a/ocsigen_1.1.0.orig.tar.gz.delta b/ocsigen_1.1.0.orig.tar.gz.delta new file mode 100644 index 000..f6904b8 Binary files /dev/null and b/ocsigen_1.1.0.orig.tar.gz.delta differ diff --git a/ocsigen_1.1.0.orig.tar.gz.id b/ocsigen_1.1.0.orig.tar.gz.id new file mode 100644 index 000..ef74bdc --- /dev/null +++ b/ocsigen_1.1.0.orig.tar.gz.id @@ -0,0 +1 @@ +0e50ec60508734ad110a9668f5fd35a025c88477 -- ocsigen 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] ocsigen packaging annotated tag, debian/1.1.0-1, created. debian/1.1.0-1
The annotated tag, debian/1.1.0-1 has been created at 82af68c638ebbb073c48164d5dada5d890003e8e (tag) tagging c1c60c4b08a911636e15cb1f1ae3a3a9667eafcd (commit) replaces debian/1.1.0.rc1-1 tagged by Stephane Glondu on Wed Jul 23 15:00:27 2008 +0200 - Shortlog Debian release 1.1.0-1 Stephane Glondu (4): Switching packaging to git Imported Upstream version 1.1.0 Merge commit 'upstream/1.1.0' New upstream release --- -- ocsigen 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] ocsigen packaging annotated tag, upstream/1.1.0, created. upstream/1.1.0
The annotated tag, upstream/1.1.0 has been created at f6c7ccaade81ec6702bb39aadbdd36dcc084379c (tag) tagging 0e50ec60508734ad110a9668f5fd35a025c88477 (commit) replaces upstream/1.1.0.rc1 tagged by Stephane Glondu on Wed Jul 23 14:08:34 2008 +0200 - Shortlog Upstream version 1.1.0 Stephane Glondu (1): Imported Upstream version 1.1.0 --- -- ocsigen 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit dd1436b569216c851c4b341a127a3a7a3bf3b633 Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Jul 27 23:19:00 2008 +0200 Switch packaging to git diff --git a/debian/control b/debian/control index 80f80ec..b4a9920 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] Uploaders: Ralf Treinen [EMAIL PROTECTED], Remi Vanicat [EMAIL PROTECTED], Stefano Zacchiroli [EMAIL PROTECTED], Samuel Mimram [EMAIL PROTECTED] Standards-Version: 3.7.3 Build-Depends: debhelper (= 4.0.0), dpkg-dev (= 1.13.19), dpatch, ocaml-nox (= 3.10), ocaml-best-compilers, camlp5, liblablgtk2-ocaml-dev (= 2.4.0), texlive-latex-extra, hevea -Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/coq/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/trunk/ +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq.git +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq.git Package: coq Architecture: any diff --git a/debian/svn-deblayout b/debian/svn-deblayout deleted file mode 100644 index b849ea0..000 --- a/debian/svn-deblayout +++ /dev/null @@ -1,3 +0,0 @@ -origDir=../upstream -origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/coq/upstream -tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/coq -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit dec29bbc89ac8d0152d8464294fe9d9c131016c9 Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Jul 27 23:20:40 2008 +0200 Add myself to Uploaders, and DM-Upload-Allowed to control diff --git a/debian/control b/debian/control index b4a9920..88f17cf 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,12 @@ Source: coq Section: math Priority: optional Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] -Uploaders: Ralf Treinen [EMAIL PROTECTED], Remi Vanicat [EMAIL PROTECTED], Stefano Zacchiroli [EMAIL PROTECTED], Samuel Mimram [EMAIL PROTECTED] +Uploaders: Ralf Treinen [EMAIL PROTECTED], + Remi Vanicat [EMAIL PROTECTED], + Stefano Zacchiroli [EMAIL PROTECTED], + Samuel Mimram [EMAIL PROTECTED], + Stephane Glondu [EMAIL PROTECTED] +DM-Upload-Allowed: yes Standards-Version: 3.7.3 Build-Depends: debhelper (= 4.0.0), dpkg-dev (= 1.13.19), dpatch, ocaml-nox (= 3.10), ocaml-best-compilers, camlp5, liblablgtk2-ocaml-dev (= 2.4.0), texlive-latex-extra, hevea Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq.git -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit 8dd1802846b1f7a2304c7e63b2cf907d70f14fe1 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 11:44:01 2008 +0200 Fix typo in README.Debian diff --git a/debian/README.Debian b/debian/README.Debian index 685f604..d91bc55 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -28,7 +28,7 @@ Note that all bytecode files in this package need to be left 'unstripped' after compiling. The reason is the following: It is possible to strip the .out corresponding to ocaml code compiled in - native code (and it is done in Coq (coqopt.out) When compiling in + native code (and it is done in Coq (coqopt.out)). When compiling in byte-code, the Coq system uses the -custom option in order to get an autonomous executable (running independently of an ocaml implementation on your computer). The way it works is that the .out file is composed of the -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit db0c2d0f86e7fb2153be13431641a2fad0babf90 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 11:48:45 2008 +0200 patch-stamp and configure-stamp are dependencies of build-stamp This is needed for proper parallel build (-j option of dpkg-buildpackage). However, check target of Coq Makefile doesn't handle well parallel build yet (will be fixed in next version). diff --git a/debian/rules b/debian/rules index 8ae8458..1dc43f9 100755 --- a/debian/rules +++ b/debian/rules @@ -28,8 +28,8 @@ configure-stamp: fi touch configure-stamp -build: patch-stamp configure-stamp build-stamp -build-stamp: +build: build-stamp +build-stamp: patch-stamp configure-stamp dh_testdir if grep -q BEST=opt config/Makefile; \ then \ -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit be8dd49cdf08dbeae0d6f36b717a54793418086b Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 15:55:17 2008 +0200 Install also *.cm[iox] files diff --git a/debian/coq.install b/debian/coq.install index 59bcb59..c0817f7 100644 --- a/debian/coq.install +++ b/debian/coq.install @@ -8,8 +8,7 @@ usr/bin/coq-tex usr/bin/coqtop* usr/bin/coqwc usr/bin/gallina -usr/lib/coq/*.cma -usr/lib/coq/*.cmxa +usr/lib/coq/*.cm* usr/lib/coq/tools/coqdoc/ usr/share/emacs/site-lisp/coq/* usr/share/man/man1/c* -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit 3113f65a3dd4bbe1833dcf78fb21abd958dcdb04 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 16:00:07 2008 +0200 ide/index_urls.txt is not there anymore diff --git a/debian/rules b/debian/rules index 1dc43f9..44dac55 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,6 @@ install: build cp debian/coq.xpm debian/coqide/usr/share/pixmaps/coqide.xpm cp debian/coqide.desktop debian/coqide/usr/share/applications - cp ide/index_urls.txt debian/coqide/usr/lib/coq/ide/index_urls.txt if [ -e opt-stamp ]; then \ cp debian/coq-interface.1 debian/coq/usr/share/man/man1/coq-interface.opt.1; \ cp debian/coqide.1 debian/coqide/usr/share/man/man1/coqide.opt.1; \ -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit 10a7bc14dc87b57b022facbbbf3b31d74a4445e5 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 16:02:00 2008 +0200 Add install-stamp ...so that install is not invoked twice when binary-indep and binary-arch are invoked separately diff --git a/debian/rules b/debian/rules index 44dac55..a9bd3b6 100755 --- a/debian/rules +++ b/debian/rules @@ -57,7 +57,7 @@ build-stamp: patch-stamp configure-stamp clean: unpatch dh_testdir dh_testroot - rm -f build-stamp configure-stamp opt-stamp + rm -f build-stamp configure-stamp opt-stamp install-stamp [ ! -f config/Makefile ] || $(MAKE) clean [ ! -f config/Makefile ] || $(MAKE) archclean @@ -72,7 +72,8 @@ clean: unpatch dh_clean -install: build +install: install-stamp +install-stamp: build-stamp dh_testdir dh_testroot dh_clean -k @@ -115,6 +116,7 @@ install: build rm -f $(COQPREF)/usr/lib/coq/ide/utf8.v $(COQPREF)/usr/lib/coq/ide/FAQ dh_install --sourcedir=$(COQPREF) --list-missing + touch install-stamp binary-common: dh_testdir -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit d6c7661cea5a874663179d806199634b7c4076ed Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 16:02:40 2008 +0200 Fix building of (stdlib) doc diff --git a/debian/rules b/debian/rules index a9bd3b6..5151c91 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ build-stamp: patch-stamp configure-stamp $(MAKE) BEST=byte HASCOQIDE=byte glob.dump; \ fi cp tools/coqdoc/coqdoc.sty doc/stdlib/ - $(MAKE) -C doc stdlib/html/index.html + $(MAKE) -f Makefile.stage3 doc/stdlib/html/index.html COQDOC=bin/coqdoc --coqlib_path `pwd` touch build-stamp clean: unpatch -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-26-gcd46e5d
The following commit has been merged in the master branch: commit cd46e5dd680be14a5f5401cfc00af3a7d2ad8847 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 16:15:16 2008 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index 1ecb0b0..7e71877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ coq (8.2~beta3+dfsg-1) UNRELEASED; urgency=low + [ Samuel Mimram ] * New upstream release. * Updated patches and removed coqdoc_stdlib, makefile, configure and cmxa-install obsolete patches. - -- Samuel Mimram [EMAIL PROTECTED] Fri, 25 Jul 2008 15:37:19 +0200 + [ Stephane Glondu ] + * [8dd1802] Fix typo in README.Debian + * [dec29bb] Add myself to Uploaders, and DM-Upload-Allowed to control + * [dd1436b] Switch packaging to git + * Update debian/rules and debhelper files + + -- Stephane Glondu [EMAIL PROTECTED] Mon, 28 Jul 2008 16:13:39 +0200 coq (8.1.pl3+dfsg-1) unstable; urgency=low @@ -434,5 +441,3 @@ coq (6.3.1-1) unstable; urgency=low * Initial Release. -- Fernando Sanchez [EMAIL PROTECTED] Fri, 3 Dec 1999 22:06:04 +0100 - - -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-27-g284e68a
The following commit has been merged in the master branch: commit 284e68ace18db77fed501d3d64ff3cb54d44c02c Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Jul 28 17:10:05 2008 +0200 Create bin/ in configure instead of clean ...avoiding problems with clean run as root diff --git a/debian/rules b/debian/rules index 5151c91..177270d 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,8 @@ CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man --emacslib / configure: configure-stamp configure-stamp: dh_testdir + # git doesn't handle empty directories, so we create them here + -mkdir bin if [ -e /usr/bin/ocamlc.opt ]; \ then \ ./configure -opt $(CONFIGUREOPTS); \ @@ -67,8 +69,6 @@ clean: unpatch rm -f dev/ocamldebug-v7 rm -f ide/undo.mli glob.dump rm -f test-suite/modules/*.vo - # git doesn't handle empty directories, so we create them here - -mkdir bin dh_clean -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-32-gdb4ea6d
The following commit has been merged in the master branch: commit 2dd9e5d0a163b95453d5dd78e8487bd48f9b220e Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Jul 29 23:08:08 2008 +0200 Set doc-base section to Science/Mathematics diff --git a/debian/coq-libs.doc-base b/debian/coq-libs.doc-base index 1a62a26..8a727b1 100644 --- a/debian/coq-libs.doc-base +++ b/debian/coq-libs.doc-base @@ -2,7 +2,7 @@ Document: coq-library Title: The Coq Standard Library Author: The Coq Development Team Abstract: Standard Library documentation of version 8.0 of the Coq proof assistant which is a system designed to develop mathematical proofs, and especially to write formal specifications, programs and to verify that programs are correct with respect to their specification. -Section: Apps/Math +Section: Science/Mathematics Format: HTML Index: /usr/share/doc/coq-libs/html/index.html -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-32-gdb4ea6d
The following commit has been merged in the master branch: commit c89cb94d7a781f5e4e8a315fc68dcc22b13021ae Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu Jul 31 16:58:47 2008 +0200 Add Homepage field diff --git a/debian/control b/debian/control index 88f17cf..d2550c6 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Uploaders: Ralf Treinen [EMAIL PROTECTED], DM-Upload-Allowed: yes Standards-Version: 3.7.3 Build-Depends: debhelper (= 4.0.0), dpkg-dev (= 1.13.19), dpatch, ocaml-nox (= 3.10), ocaml-best-compilers, camlp5, liblablgtk2-ocaml-dev (= 2.4.0), texlive-latex-extra, hevea +Homepage: http://coq.inria.fr/ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq.git -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-32-gdb4ea6d
The following commit has been merged in the master branch: commit 1c6c7c8ec1e78348cd8d1dd7b730450ab54d106f Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu Jul 31 17:36:36 2008 +0200 Bump Standards-Version to 3.8.0 diff --git a/debian/control b/debian/control index d2550c6..6df245e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Ralf Treinen [EMAIL PROTECTED], Samuel Mimram [EMAIL PROTECTED], Stephane Glondu [EMAIL PROTECTED] DM-Upload-Allowed: yes -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Build-Depends: debhelper (= 4.0.0), dpkg-dev (= 1.13.19), dpatch, ocaml-nox (= 3.10), ocaml-best-compilers, camlp5, liblablgtk2-ocaml-dev (= 2.4.0), texlive-latex-extra, hevea Homepage: http://coq.inria.fr/ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq.git -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-32-gdb4ea6d
The following commit has been merged in the master branch: commit 7dd7c53d365a646aa4e93f944a17fbcb971ff604 Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu Jul 31 17:33:20 2008 +0200 Add debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000..cdd4070 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,40 @@ +-- ++ Coq package for Debian + +-- + + +Packaging a new upstream version + + +Coq documentation may be distributed only subject to the terms and +conditions set forth in the Open Publication License, v1.0 or later, +which is not DFSG-compliant. See: + + http://lists.debian.org/debian-legal/2004/03/msg00226.html + +Only coqdoc-generated documentation of the standard library is shipped +in main. The full documentation is shipped in non-free (as coq-doc +package). + +The script debian/purify_tarball removes non-DFSG content from an +upstream tarball. It should be run first when packaging a new upstream +version. The suffix +dfsg is used to being appended to upstream +version (the script will do it for you). + + +Patch system + + +This package uses dpatch for patching the source. Please consider +reading dpatch manpage to patch the source. + + +Version Control System +-- + +Packaging is versioned with git, using git-import-orig (with +--pristine-tar option) and git-buildpackage (with --git-pristine-tar +option). Debian changelog can be updated based on git changelog using +git-dch. Please consider reading the documentation of these tools. + +It was versioned with subversion until Wed, 23 Jul 2008. -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-32-gdb4ea6d
The following commit has been merged in the master branch: commit db4ea6ddcbeb0dea41267dc87a30b76a01e402af Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu Jul 31 17:50:55 2008 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index 7e71877..677e23d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,12 +6,16 @@ coq (8.2~beta3+dfsg-1) UNRELEASED; urgency=low cmxa-install obsolete patches. [ Stephane Glondu ] + * Update debian/rules and debhelper files * [8dd1802] Fix typo in README.Debian * [dec29bb] Add myself to Uploaders, and DM-Upload-Allowed to control * [dd1436b] Switch packaging to git - * Update debian/rules and debhelper files + * [2dd9e5d] Set doc-base section to Science/Mathematics + * [c89cb94] Add Homepage field + * [7dd7c53] Add debian/README.source + * [1c6c7c8] Bump Standards-Version to 3.8.0 - -- Stephane Glondu [EMAIL PROTECTED] Mon, 28 Jul 2008 16:13:39 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Thu, 31 Jul 2008 17:49:13 +0200 coq (8.1.pl3+dfsg-1) unstable; urgency=low -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit bd4bb27ee4f66b08434d9a199f00b04ccec34722 Merge: db4ea6ddcbeb0dea41267dc87a30b76a01e402af 870075f34dd9fa5792bfbf413afd3b96f17e76a0 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 13:18:48 2008 +0200 Merge commit 'upstream/8.2.beta4+dfsg' -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit 38db629f4be6f0a963b95a958a99bbe382b6b5d1 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 15:41:29 2008 +0200 Remove browser.dpatch and use --browser configure option diff --git a/debian/patches/00list b/debian/patches/00list index 96c8fc3..a86c496 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,2 @@ -browser no-complexity-test check diff --git a/debian/patches/browser.dpatch b/debian/patches/browser.dpatch deleted file mode 100755 index 1564795..000 --- a/debian/patches/browser.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## browser.dpatch by Samuel Mimram [EMAIL PROTECTED] -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use the default Debian browser for help. - [EMAIL PROTECTED]@ -diff -urNad coq~/lib/flags.ml coq/lib/flags.ml coq~/lib/flags.ml 2008-07-25 15:13:00.0 +0200 -+++ coq/lib/flags.ml 2008-07-25 15:30:47.0 +0200 -@@ -126,7 +126,4 @@ - let coq_netscape_remote_var = COQREMOTEBROWSER in - Sys.getenv coq_netscape_remote_var - with -- Not_found - -- if Sys.os_type = Win32 -- then C:\\PROGRA~1\\INTERN~1\\IEXPLORE %s -- else firefox -remote \OpenURL(%s,new-tab)\ || firefox %s -+ Not_found - /usr/bin/x-www-browser %s diff --git a/debian/rules b/debian/rules index 177270d..cd34b8b 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,9 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OCAMLABI := $(shell ocamlc -version) -CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man --emacslib /usr/share/emacs/site-lisp/coq --reals all --fsets all +CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \ + --emacslib /usr/share/emacs/site-lisp/coq --reals all --fsets all \ + --browser /usr/bin/x-www-browser %s configure: configure-stamp configure-stamp: -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit dbb8a5704033fb6990af449e29c6018286d4b044 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 13:28:00 2008 +0200 Disable compiling/installing doc diff --git a/debian/rules b/debian/rules index cd34b8b..8075e71 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,8 @@ OCAMLABI := $(shell ocamlc -version) CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \ --emacslib /usr/share/emacs/site-lisp/coq --reals all --fsets all \ - --browser /usr/bin/x-www-browser %s + --browser /usr/bin/x-www-browser %s \ + --with-doc no configure: configure-stamp configure-stamp: -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit 9fd4621dcafc03b56c348a0342b2d172c065121d Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 15:25:39 2008 +0200 Add use-env-in-coq-config.dpatch Use environment variables by default in coq_config.ml. This allows the run of micromega-related tests before installation. diff --git a/debian/patches/00list b/debian/patches/00list index a86c496..3e9df43 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,3 @@ no-complexity-test check +use-env-in-coq-config diff --git a/debian/patches/use-env-in-coq-config.dpatch b/debian/patches/use-env-in-coq-config.dpatch new file mode 100755 index 000..1f01315 --- /dev/null +++ b/debian/patches/use-env-in-coq-config.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## use-env-in-coq-config.dpatch by Stephane Glondu [EMAIL PROTECTED] +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use environment variables by default in coq_config.ml + [EMAIL PROTECTED]@ +diff --git a/configure b/configure +index 2747ee2..a57b996 100755 +--- a/configure b/configure +@@ -862,9 +862,9 @@ cat END_OF_COQ_CONFIG $mlconfig_file + (* DO NOT EDIT THIS FILE: automatically generated by ../configure *) + + let local = $local +-let bindir = $ESCBINDIR +-let coqlib = $ESCLIBDIR +-let coqtop = $ESCCOQTOP ++let bindir = try Sys.getenv COQBIN with Not_found - $ESCBINDIR ++let coqlib = try Sys.getenv COQLIB with Not_found - $ESCLIBDIR ++let coqtop = try Sys.getenv COQTOP with Not_found - $ESCCOQTOP + let camldir = $ESCCAMLDIR + let camllib = $ESCCAMLLIB + let camlp4 = $CAMLP4 -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit ad9b0fc2f2c0945eb48ae6d9cd7256b11dfd8792 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 16:47:33 2008 +0200 Remove Encoding from debian/coqide.desktop ...as complained by Lintian diff --git a/debian/coqide.desktop b/debian/coqide.desktop index 8c1a0c6..ea667c5 100644 --- a/debian/coqide.desktop +++ b/debian/coqide.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=CoqIDE Proof Assistant Comment=Graphical interface for the Coq proof assistant Exec=coqide -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit a88339e768ad1c3c36250dff659120236b900cf0 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 16:48:51 2008 +0200 glob.dump is not there anymore diff --git a/debian/rules b/debian/rules index e50ad14..50a6e64 100755 --- a/debian/rules +++ b/debian/rules @@ -50,11 +50,6 @@ build-stamp: configure-stamp else \ $(MAKE) BEST=byte HASCOQIDE=byte check; \ fi - if [ -e opt-stamp ]; then \ - $(MAKE) BEST=opt glob.dump; \ - else \ - $(MAKE) BEST=byte HASCOQIDE=byte glob.dump; \ - fi cp tools/coqdoc/coqdoc.sty doc/stdlib/ $(MAKE) -f Makefile.stage3 doc/stdlib/html/index.html COQDOC=bin/coqdoc --coqlib_path `pwd` touch build-stamp -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit e6b699f7e1a1ba63c1eb7b7e63094cad633791a9 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 17:57:55 2008 +0200 Install csdpcert diff --git a/debian/coq.install b/debian/coq.install index c0817f7..0648440 100644 --- a/debian/coq.install +++ b/debian/coq.install @@ -8,6 +8,7 @@ usr/bin/coq-tex usr/bin/coqtop* usr/bin/coqwc usr/bin/gallina +usr/bin/csdpcert usr/lib/coq/*.cm* usr/lib/coq/tools/coqdoc/ usr/share/emacs/site-lisp/coq/* -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit ff20e3e9f517cba61a94103d62e284b214fe4d30 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 23:14:15 2008 +0200 Tune clean target of debian/rules diff --git a/debian/rules b/debian/rules index 50a6e64..7a986d9 100755 --- a/debian/rules +++ b/debian/rules @@ -59,6 +59,10 @@ clean: unpatch dh_testroot rm -f build-stamp configure-stamp opt-stamp install-stamp + # Contains a directory ending in .d which breaks the clean rule + # of upstream Makefile + -rm -Rf debian/coq/etc + [ ! -f config/Makefile ] || $(MAKE) clean [ ! -f config/Makefile ] || $(MAKE) archclean rm -f bin/* @@ -67,6 +71,7 @@ clean: unpatch rm -f dev/ocamldebug-v7 rm -f ide/undo.mli glob.dump rm -f test-suite/modules/*.vo + rm -f doc/stdlib/coqdoc.sty dh_clean -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-44-g331f534
The following commit has been merged in the master branch: commit 331f53499e751f658e32e2beb98336f454c5c0c2 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 23:20:12 2008 +0200 Update debian/changelog diff --git a/debian/changelog b/debian/changelog index 10148c5..48d98bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,10 @@ coq (8.2~beta4+dfsg-1) UNRELEASED; urgency=low * [c89cb94] Add Homepage field * [7dd7c53] Add debian/README.source * [1c6c7c8] Bump Standards-Version to 3.8.0 + * [38db629] Remove browser.dpatch and use --browser configure option + * [9fd4621] Add use-env-in-coq-config.dpatch - -- Stephane Glondu [EMAIL PROTECTED] Fri, 08 Aug 2008 13:19:03 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Fri, 08 Aug 2008 23:18:56 +0200 coq (8.1.pl3+dfsg-1) unstable; urgency=low -- coq 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] coq packaging branch, pristine-tar, updated. a1c63f0e8dc32cda4fbc81392128d30bcb8a2e2e
The following commit has been merged in the pristine-tar branch: commit a1c63f0e8dc32cda4fbc81392128d30bcb8a2e2e Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 8 13:18:47 2008 +0200 pristine-tar data for coq_8.2~beta4+dfsg.orig.tar.gz diff --git a/coq_8.2~beta4+dfsg.orig.tar.gz.delta b/coq_8.2~beta4+dfsg.orig.tar.gz.delta new file mode 100644 index 000..112e1a1 Binary files /dev/null and b/coq_8.2~beta4+dfsg.orig.tar.gz.delta differ diff --git a/coq_8.2~beta4+dfsg.orig.tar.gz.id b/coq_8.2~beta4+dfsg.orig.tar.gz.id new file mode 100644 index 000..9384ba1 --- /dev/null +++ b/coq_8.2~beta4+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +870075f34dd9fa5792bfbf413afd3b96f17e76a0 -- coq 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] coq packaging annotated tag, upstream/8.2.beta4+dfsg, created. upstream/8.2.beta4+dfsg
The annotated tag, upstream/8.2.beta4+dfsg has been created at e8b83c4c98f9c298496b8513cdce07dd8a162889 (tag) tagging 870075f34dd9fa5792bfbf413afd3b96f17e76a0 (commit) replaces upstream/8.2.beta3+dfsg tagged by Stephane Glondu on Fri Aug 8 13:18:47 2008 +0200 - Shortlog Upstream version 8.2~beta4+dfsg Stephane Glondu (1): Imported Upstream version 8.2~beta4+dfsg --- -- coq 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] coq packaging branch, master, updated. debian/8.1.pl3+dfsg-1-46-gdfb92f7
The following commit has been merged in the master branch: commit dfb92f72bd3484d246cc241db865056393d39f47 Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Aug 12 16:38:34 2008 +0200 Update debian/changelog diff --git a/debian/changelog b/debian/changelog index 48d98bb..92f7e99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ coq (8.2~beta4+dfsg-1) UNRELEASED; urgency=low * [1c6c7c8] Bump Standards-Version to 3.8.0 * [38db629] Remove browser.dpatch and use --browser configure option * [9fd4621] Add use-env-in-coq-config.dpatch + * [c7560b2] Remove obsolete manpages (now shipped upstream) - -- Stephane Glondu [EMAIL PROTECTED] Fri, 08 Aug 2008 23:18:56 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Tue, 12 Aug 2008 16:37:51 +0200 coq (8.1.pl3+dfsg-1) unstable; urgency=low -- coq 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] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-1-2-g745e0fb
The following commit has been merged in the master branch:
commit c2b0b6213988a0592da8b773064949c637f8b64d
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Fri Aug 15 12:26:18 2008 +0200
Add non-native-archs.dpatch
Fix FTBFS on non-native architectures (Closes: #495165)
diff --git a/debian/patches/00list b/debian/patches/00list
index 3e9df43..fb3801f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
no-complexity-test
check
use-env-in-coq-config
+non-native-archs
diff --git a/debian/patches/non-native-archs.dpatch
b/debian/patches/non-native-archs.dpatch
new file mode 100755
index 000..cbb9f83
--- /dev/null
+++ b/debian/patches/non-native-archs.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## non-native-archs.dpatch by Stephane Glondu [EMAIL PROTECTED]
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on non-native architectures
+
[EMAIL PROTECTED]@
+diff --git a/Makefile.build b/Makefile.build
+index a5bae4e..c47b688 100644
+--- a/Makefile.build
b/Makefile.build
+@@ -655,7 +655,10 @@ install-library:
+ $(MKDIR) $(FULLCOQLIB)/states
+ $(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
+ $(MKDIR) $(FULLCOQLIB)/user-contrib
+- $(INSTALLLIB) $(LINKCMO) $(LINKCMX) $(GRAMMARCMA) $(FULLCOQLIB)
++ $(INSTALLLIB) $(LINKCMO) $(GRAMMARCMA) $(FULLCOQLIB)
++ifeq ($(BEST),opt)
++ $(INSTALLLIB) $(LINKCMX) $(FULLCOQLIB)
++endif
+ find . -name \*.cmi -exec $(INSTALLLIB) {} $(FULLCOQLIB) \;
+
+ install-library-light:
+@@ -716,7 +719,7 @@ dev/printers.cma: $(PRINTERSCMO)
+ parsing/grammar.cma: $(GRAMMARCMO)
+ $(SHOW)'Testing $@'
+ @touch test.ml4
+- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp $(CAMLP4O) $(CAMLP4EXTENDFLAGS)
$(GRAMMARCMO) -impl -impl test.ml4 -o test-grammar
++ $(HIDE)$(OCAMLC) $(OPTFLAGS) -pp $(CAMLP4O) $(CAMLP4EXTENDFLAGS)
$(GRAMMARCMO) -impl -impl test.ml4 -o test-grammar
+ @rm -f test-grammar test.*
+ $(SHOW)'OCAMLC -a $@'
+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@
--
coq 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] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-1-2-g745e0fb
The following commit has been merged in the master branch: commit 745e0fb3b3bc4c435870f1af25c22d495fac9f29 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Aug 15 13:21:44 2008 +0200 Update changelog and prepare for upload diff --git a/debian/changelog b/debian/changelog index 8267f20..47eeeab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +coq (8.2~beta4+dfsg-2) experimental; urgency=low + + * [45cca7f] Add non-native-archs.dpatch; fixes FTBFS on non-native +architectures (Closes: #495165) + + -- Stephane Glondu [EMAIL PROTECTED] Fri, 15 Aug 2008 13:20:16 +0200 + coq (8.2~beta4+dfsg-1) experimental; urgency=low [ Samuel Mimram ] -- coq 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] coq packaging annotated tag, debian/8.2.beta4+dfsg-2, created. debian/8.2.beta4+dfsg-2
The annotated tag, debian/8.2.beta4+dfsg-2 has been created at 4f049e3bfb7d9c447b7a891083b4337f797d7685 (tag) tagging 745e0fb3b3bc4c435870f1af25c22d495fac9f29 (commit) replaces debian/8.2.beta4+dfsg-1 tagged by Stephane Glondu on Fri Aug 15 14:09:05 2008 +0200 - Shortlog Debian release 8.2~beta4+dfsg-2 Stephane Glondu (2): Add non-native-archs.dpatch Update changelog and prepare for upload --- -- coq 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] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-2-6-ge9ca8bf
The following commit has been merged in the master branch: commit cdce320e124a3fcba458fad3c638940ce8f993ce Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Sep 7 18:05:26 2008 +0200 Bump debhelper compatibility level to 7 diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index 6df245e..d84be0b 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,16 @@ Uploaders: Ralf Treinen [EMAIL PROTECTED], Stephane Glondu [EMAIL PROTECTED] DM-Upload-Allowed: yes Standards-Version: 3.8.0 -Build-Depends: debhelper (= 4.0.0), dpkg-dev (= 1.13.19), dpatch, ocaml-nox (= 3.10), ocaml-best-compilers, camlp5, liblablgtk2-ocaml-dev (= 2.4.0), texlive-latex-extra, hevea +Build-Depends: + debhelper (= 7), + dpkg-dev (= 1.13.19), + dpatch, + ocaml-nox (= 3.10), + ocaml-best-compilers, + camlp5, + liblablgtk2-ocaml-dev (= 2.4.0), + texlive-latex-extra, + hevea Homepage: http://coq.inria.fr/ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq.git -- coq 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] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-2-6-ge9ca8bf
The following commit has been merged in the master branch:
commit b6db9f4f71b806d89cd24db386a6bcdd3b469d31
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Sun Sep 7 18:58:27 2008 +0200
Remove obsolete patches
diff --git a/debian/patches/00list b/debian/patches/00list
index fb3801f..e69de29 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +0,0 @@
-no-complexity-test
-check
-use-env-in-coq-config
-non-native-archs
diff --git a/debian/patches/check.dpatch b/debian/patches/check.dpatch
deleted file mode 100755
index d0cb390..000
--- a/debian/patches/check.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## check.dpatch by Samuel Mimram [EMAIL PROTECTED]
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Suppress warnings from tests outputs.
-
[EMAIL PROTECTED]@
-diff -urNad coq~/test-suite/check coq/test-suite/check
coq~/test-suite/check 2008-07-25 15:36:31.0 +0200
-+++ coq/test-suite/check 2008-07-25 15:36:31.0 +0200
-@@ -52,7 +52,7 @@
- nbtests=`expr $nbtests + 1`
- printf $f...
- tmpoutput=`mktemp /tmp/coqcheck.XX`
-- $command $f 21 | grep -v Welcome to Coq | grep -v Skipping rcfile
loading $tmpoutput
-+ $command $f 21 | grep -v Welcome to Coq | grep -v Skipping rcfile
loading | grep -v some rule has been masked $tmpoutput
- foutput=`dirname $f`/`basename $f .v`.out
- diff $tmpoutput $foutput /dev/null
- if [ $? = 0 ]; then
diff --git a/debian/patches/no-complexity-test.dpatch
b/debian/patches/no-complexity-test.dpatch
deleted file mode 100755
index 5f9bff6..000
--- a/debian/patches/no-complexity-test.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no-complexity-test.dpatch by Julien Cristau [EMAIL PROTECTED]
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't run complexity tests, they are far too fragile.
-
[EMAIL PROTECTED]@
-diff -urNad coq~/test-suite/check coq/test-suite/check
coq~/test-suite/check 2008-07-25 15:13:00.0 +0200
-+++ coq/test-suite/check 2008-07-25 15:33:55.0 +0200
-@@ -250,8 +250,8 @@
- test_interactive interactive
- echo Micromega tests
- test_success micromega
--echo Complexity tests
--test_complexity complexity
-+echo Skipping complexity tests
-+#test_complexity complexity
- echo Module tests
- $coqtop -compile modules/Nat
- $coqtop -compile modules/plik
diff --git a/debian/patches/non-native-archs.dpatch
b/debian/patches/non-native-archs.dpatch
deleted file mode 100755
index cbb9f83..000
--- a/debian/patches/non-native-archs.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## non-native-archs.dpatch by Stephane Glondu [EMAIL PROTECTED]
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS on non-native architectures
-
[EMAIL PROTECTED]@
-diff --git a/Makefile.build b/Makefile.build
-index a5bae4e..c47b688 100644
a/Makefile.build
-+++ b/Makefile.build
-@@ -655,7 +655,10 @@ install-library:
- $(MKDIR) $(FULLCOQLIB)/states
- $(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
- $(MKDIR) $(FULLCOQLIB)/user-contrib
-- $(INSTALLLIB) $(LINKCMO) $(LINKCMX) $(GRAMMARCMA) $(FULLCOQLIB)
-+ $(INSTALLLIB) $(LINKCMO) $(GRAMMARCMA) $(FULLCOQLIB)
-+ifeq ($(BEST),opt)
-+ $(INSTALLLIB) $(LINKCMX) $(FULLCOQLIB)
-+endif
- find . -name \*.cmi -exec $(INSTALLLIB) {} $(FULLCOQLIB) \;
-
- install-library-light:
-@@ -716,7 +719,7 @@ dev/printers.cma: $(PRINTERSCMO)
- parsing/grammar.cma: $(GRAMMARCMO)
- $(SHOW)'Testing $@'
- @touch test.ml4
-- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp $(CAMLP4O) $(CAMLP4EXTENDFLAGS)
$(GRAMMARCMO) -impl -impl test.ml4 -o test-grammar
-+ $(HIDE)$(OCAMLC) $(OPTFLAGS) -pp $(CAMLP4O) $(CAMLP4EXTENDFLAGS)
$(GRAMMARCMO) -impl -impl test.ml4 -o test-grammar
- @rm -f test-grammar test.*
- $(SHOW)'OCAMLC -a $@'
- $(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@
diff --git a/debian/patches/use-env-in-coq-config.dpatch
b/debian/patches/use-env-in-coq-config.dpatch
deleted file mode 100755
index 1f01315..000
--- a/debian/patches/use-env-in-coq-config.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use-env-in-coq-config.dpatch by Stephane Glondu [EMAIL PROTECTED]
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use environment variables by default in coq_config.ml
-
[EMAIL PROTECTED]@
-diff --git a/configure b/configure
-index 2747ee2..a57b996 100755
a/configure
-+++ b/configure
-@@ -862,9 +862,9 @@ cat END_OF_COQ_CONFIG $mlconfig_file
- (* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
-
- let local = $local
--let bindir = $ESCBINDIR
--let coqlib = $ESCLIBDIR
--let coqtop = $ESCCOQTOP
-+let bindir = try Sys.getenv COQBIN
[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-2-6-ge9ca8bf
The following commit has been merged in the master branch:
commit d8e408268a5d4c59770e5ce02d6c814f751caed3
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Sun Sep 7 18:58:58 2008 +0200
Use debhelper 7, simplify debian/rules
diff --git a/debian/control b/debian/control
index d84be0b..a24e091 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: coq
Section: math
Priority: optional
Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED]
-Uploaders: Ralf Treinen [EMAIL PROTECTED],
+Uploaders:
+ Ralf Treinen [EMAIL PROTECTED],
Remi Vanicat [EMAIL PROTECTED],
Stefano Zacchiroli [EMAIL PROTECTED],
Samuel Mimram [EMAIL PROTECTED],
@@ -43,7 +44,11 @@ Description: proof assistant for higher-order logic
(toplevel and compiler)
Package: coqide
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, coq (= 8.0)
+Depends:
+ ${shlibs:Depends},
+ coq (= ${binary:Version}),
+ ocaml-base-nox-${F:OCamlABI},
+ ${misc:Depends}
Description: proof assistant for higher-order logic (gtk interface)
Coq is a proof assistant for higher-order logic, which allows the
development of computer programs consistent with their formal
diff --git a/debian/coq-libs.links b/debian/coq-libs.links
new file mode 100644
index 000..9a521ba
--- /dev/null
+++ b/debian/coq-libs.links
@@ -0,0 +1 @@
+/usr/share/doc/coq-libs/html /usr/share/doc/coq/stdlib-html
diff --git a/debian/coq.dirs b/debian/coq.dirs
deleted file mode 100644
index 1166b15..000
--- a/debian/coq.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib
-usr/lib/coq
-usr/share/man/man1
-usr/share/pixmaps
diff --git a/debian/coq.dirs.in b/debian/coq.dirs.in
new file mode 100644
index 000..20f8dc0
--- /dev/null
+++ b/debian/coq.dirs.in
@@ -0,0 +1,6 @@
+usr/bin
+usr/lib/coq/contrib/micromega
+usr/share/man/man1
+usr/share/pixmaps
+usr/share/texmf/tex/latex/misc
+usr/lib/ocaml/@OCamlABI@/stublibs
diff --git a/debian/coq.install b/debian/coq.install
deleted file mode 100644
index 0648440..000
--- a/debian/coq.install
+++ /dev/null
@@ -1,18 +0,0 @@
-usr/bin/coqc
-usr/bin/coqdep
-usr/bin/coqdoc
-usr/bin/coq-interface*
-usr/bin/coq_makefile
-usr/bin/coqmktop
-usr/bin/coq-tex
-usr/bin/coqtop*
-usr/bin/coqwc
-usr/bin/gallina
-usr/bin/csdpcert
-usr/lib/coq/*.cm*
-usr/lib/coq/tools/coqdoc/
-usr/share/emacs/site-lisp/coq/*
-usr/share/man/man1/c*
-usr/share/man/man1/gallina.1
-usr/share/texmf/tex/latex/misc/*
-usr/share/emacs/site-lisp/coqdoc.styusr/share/texmf/tex/latex/misc/
diff --git a/debian/coq.install.in b/debian/coq.install.in
new file mode 100644
index 000..5bb62f2
--- /dev/null
+++ b/debian/coq.install.in
@@ -0,0 +1,28 @@
+usr/bin/coqc*
+usr/bin/coqdep*
+usr/bin/coqdoc*
+usr/bin/coq_makefile*
+usr/bin/coqmktop*
+usr/bin/coq-interface*
+usr/bin/coq-parser*
+usr/bin/coq-tex*
+usr/bin/coqtop*
+usr/bin/coqwc*
+usr/bin/gallina*
+usr/lib/coq/contrib/micromega/csdpcert*
+usr/lib/coq/*.cm*
+usr/lib/coq/tools/coqdoc/
+usr/share/emacs/site-lisp/coq/
+usr/share/man/man1/coqc*
+usr/share/man/man1/coqdep*
+usr/share/man/man1/coqdoc*
+usr/share/man/man1/coq_makefile*
+usr/share/man/man1/coqmktop*
+usr/share/man/man1/coq-interface*
+usr/share/man/man1/coq-parser*
+usr/share/man/man1/coq-tex*
+usr/share/man/man1/coqtop*
+usr/share/man/man1/coqwc*
+usr/share/man/man1/gallina*
+usr/lib/coq/dllcoqrun.so usr/lib/ocaml/@OCamlABI@/stublibs
+usr/share/emacs/site-lisp/coqdoc.sty usr/share/texmf/tex/latex/misc/
diff --git a/debian/coq.links.in b/debian/coq.links.in
new file mode 100644
index 000..250c321
--- /dev/null
+++ b/debian/coq.links.in
@@ -0,0 +1,2 @@
+OPT: /usr/share/man/man1/coq-interface.1
/usr/share/man/man1/coq-interface.opt.1
+OPT: /usr/share/man/man1/coq-parser.1 /usr/share/man/man1/coq-parser.opt.1
diff --git a/debian/coqide.install b/debian/coqide.install
index 238c4fd..dd6bf11 100644
--- a/debian/coqide.install
+++ b/debian/coqide.install
@@ -1,3 +1,4 @@
usr/bin/coqide*
usr/lib/coq/ide/coq.png
usr/lib/coq/ide/.coqide-gtk2rc
+usr/share/man/man1/coqide*
diff --git a/debian/coqide.links.in b/debian/coqide.links.in
new file mode 100644
index 000..c73095f
--- /dev/null
+++ b/debian/coqide.links.in
@@ -0,0 +1,2 @@
+/usr/share/man/man1/coqide.1 /usr/share/man/man1/coqide.byte.1
+OPT: /usr/share/man/man1/coqide.1 /usr/share/man/man1/coqide.opt.1
diff --git a/debian/rules b/debian/rules
index 640fceb..19bd688 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,142 +5,78 @@
#export DH_VERBOSE=1
# This has to be exported to make some magic below work.
-export DH_OPTIONS
+export COQTEST_SKIPCOMPLEXITY = true
+export CAML_LD_LIBRARY_PATH = $(shell pwd)/kernel/byterun
# We want to use dpatch
include /usr/share/dpatch/dpatch.make
+HTMLDOC := doc/stdlib/html/index.html
+
COQPREF := $(CURDIR)/debian/tmp
ADDPREF := COQINSTALLPREFIX=$(COQPREF)
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
OCAMLABI := $(shell ocamlc -version)
CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \
--emacslib
[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, pristine-tar, updated. 7a4f7aac5a2b62098a484c3d996bf47db4c11ed0
The following commit has been merged in the pristine-tar branch: commit 7a4f7aac5a2b62098a484c3d996bf47db4c11ed0 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Sep 8 00:21:18 2008 +0200 pristine-tar data for coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz diff --git a/coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz.delta b/coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz.delta new file mode 100644 index 000..031a99e Binary files /dev/null and b/coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz.delta differ diff --git a/coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz.id b/coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz.id new file mode 100644 index 000..dad0021 --- /dev/null +++ b/coq_8.2~beta4.svn20080907+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +113b703a695acbe31ac6dd6a8c4aa94f6fda7545 -- coq 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] coq packaging annotated tag, upstream/8.2.beta4.svn20080907+dfsg, created. upstream/8.2.beta4.svn20080907+dfsg
The annotated tag, upstream/8.2.beta4.svn20080907+dfsg has been created at b5e6a28e8b7d1a69e5ee94a3f88878852b74c7ec (tag) tagging 113b703a695acbe31ac6dd6a8c4aa94f6fda7545 (commit) replaces upstream/8.2.beta4+dfsg tagged by Stephane Glondu on Mon Sep 8 00:15:04 2008 +0200 - Shortlog Upstream version 8.2~beta4.svn20080907+dfsg Stephane Glondu (1): Imported Upstream version 8.2~beta4.svn20080907+dfsg --- -- coq 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] ocamlnet packaging branch, master, updated. debian/2.2.9-3-14-g49e0730
The following commit has been merged in the master branch: commit 49e07305dbe7d141917e016898bab8ba71b3a339 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Sep 8 22:30:44 2008 +0200 Document FTBFS fix on hurd diff --git a/debian/README.Debian b/debian/README.Debian index 9c79cb9..cdaf45e 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -65,10 +65,10 @@ describes in which Debian package a given Ocamlnet library can be found: -- Stefano Zacchiroli [EMAIL PROTECTED] Wed, 3 Jan 2007 16:17:34 +0100 -Debian GNU/kFreeBSD Port - +Debian GNU/kFreeBSD and GNU/Hurd ports +== The library rpc-auth-local is not available on the Debian GNU/kFreeBSD -Port. +and GNU/Hurd ports. - -- Stephane Glondu [EMAIL PROTECTED] Fri, 18 Jan 2008 00:52:20 +0100 + -- Stephane Glondu [EMAIL PROTECTED] Mon, 08 Sep 2008 22:31:29 +0200 diff --git a/debian/changelog b/debian/changelog index e5ab6d2..21fe524 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,14 @@ ocamlnet (2.2.9-4) UNRELEASED; urgency=low [ Stephane Glondu ] - * Fix FTBFS on hurd-i386. + * Do not build rpc-auth-local on hurd-i386 (fixes FTBFS) * Switching packaging to git [ Stefano Zacchiroli ] * relax build-dep on apache2-prefork-dev by forcing the apache major number to 2 instead of letting ./configure query it invoking /usr/sbin/apache2 - -- Stephane Glondu [EMAIL PROTECTED] Sat, 09 Aug 2008 16:20:10 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Mon, 08 Sep 2008 22:29:53 +0200 ocamlnet (2.2.9-3) unstable; urgency=medium -- ocamlnet 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] dh-ocaml packaging branch, master, updated. debian/0.1-3-g75aabd7
The following commit has been merged in the master branch: commit 75aabd771e0032ba0e48a54f3d2bb0b290ab0fea Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Sep 9 13:13:07 2008 +0200 CDBS: handle lines starting with OPT: in *.in files These lines will be deleted on bytecode-only architectures, and kept (with the prefix removed) on native ones. diff --git a/cdbs/ocaml.mk b/cdbs/ocaml.mk index 20673b8..9bd0ea2 100644 --- a/cdbs/ocaml.mk +++ b/cdbs/ocaml.mk @@ -42,6 +42,13 @@ DEB_DH_GENCONTROL_ARGS += -VF:OCamlNativeArchs=$(OCAML_NATIVE_ARCHS) endif +# filter out lines starting with OPT: +ifeq ($(OCAML_HAVE_OCAMLOPT),yes) +SEDOPTFILTER := -e 's/^OPT: //' +else +SEDOPTFILTER := -e '/^OPT: /d' +endif + # post-install hook to invoke ocamldoc on OCAML_OCAMLDOC_PACKAGES packages $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: @OCAMLDOC=ocamldoc $(OCAML_OCAMLDOC_FLAGS); \ @@ -87,6 +94,7 @@ ocamlinit-stamp: -e 's,@OCamlABI@,$(OCAML_ABI),g' \ -e 's,@OCamlStdlibDir@,$(OCAML_STDLIB_DIR),g' \ -e 's,@OCamlDllDir@,$(OCAML_DLL_DIR),g' \ + $(SEDOPTFILTER) \ $$f.in $$f ; \ done touch $@ diff --git a/debian/changelog b/debian/changelog index 797cfa7..e16436a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ dh-ocaml (0.2) UNRELEASED; urgency=low - * Remove XS- prefix in XS-Vcs-* in policy + * Policy: remove XS- prefix in XS-Vcs-* + * CDBS: handle lines starting with OPT: in *.in files - -- Stephane Glondu [EMAIL PROTECTED] Tue, 12 Aug 2008 18:32:17 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Tue, 09 Sep 2008 13:10:52 +0200 dh-ocaml (0.1) experimental; urgency=low -- dh-ocaml 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] ocaml-ssl packaging branch, master, updated. debian/0.4.2-3-7-g497116e
The following commit has been merged in the master branch:
commit 96dfa652b2007158f43569801233a5cede8b77e8
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Mon Sep 29 19:24:28 2008 +0200
Fix GC-unsafe operations in C stubs (Closes: #500591)
* caml_{enter,leave}_blocking_section must not be called during GC
* Store_field must not be called on custom blocks
diff --git a/debian/changelog b/debian/changelog
index 4edeef3..040b680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ ocaml-ssl (0.4.2-4) UNRELEASED; urgency=low
[ Stephane Glondu ]
* Switching packaging to git
+ * Fix GC-unsafe operations in C stubs (Closes: #500591)
- -- Stephane Glondu [EMAIL PROTECTED] Mon, 29 Sep 2008 17:17:01 +0200
+ -- Stephane Glondu [EMAIL PROTECTED] Mon, 29 Sep 2008 19:22:41 +0200
ocaml-ssl (0.4.2-3) unstable; urgency=low
diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c
index 3905499..df90bf9 100644
--- a/src/ssl_stubs.c
+++ b/src/ssl_stubs.c
@@ -61,9 +61,7 @@ static int client_verify_callback(int, X509_STORE_CTX *);
static void finalize_ctx(value block)
{
SSL_CTX *ctx = Ctx_val(block);
- caml_enter_blocking_section();
SSL_CTX_free(ctx);
- caml_leave_blocking_section();
}
static struct custom_operations ctx_ops =
@@ -83,9 +81,7 @@ static struct custom_operations ctx_ops =
static void finalize_ssl_socket(value block)
{
SSL *ssl = SSL_val(block);
- caml_enter_blocking_section();
SSL_free(ssl);
- caml_leave_blocking_section();
}
static struct custom_operations socket_ops =
@@ -509,9 +505,7 @@ CAMLprim value ocaml_ssl_get_cipher_version(value vcipher)
static void finalize_cert(value block)
{
X509 *cert = Cert_val(block);
- caml_enter_blocking_section();
X509_free(cert);
- caml_leave_blocking_section();
}
static struct custom_operations cert_ops =
@@ -563,7 +557,7 @@ CAMLprim value ocaml_ssl_get_certificate(value socket)
CAMLlocal1(block);
block = caml_alloc_final(2, finalize_cert, 0, 1);
- Store_field(block, 1, (value)cert);
+ (*((X509 **) Data_custom_val(block))) = cert;
CAMLreturn(block);
}
--
ocaml-ssl 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] ocaml-ssl packaging branch, master, updated. debian/0.4.2-3-7-g497116e
The following commit has been merged in the master branch: commit dc878f00d1eb2a2b5ca4cc404447785f6ed0d6b5 Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Sep 29 19:28:01 2008 +0200 Set Maintainer to d-o-m, and Uploaders to Sam and me diff --git a/debian/changelog b/debian/changelog index 040b680..99cbc0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ ocaml-ssl (0.4.2-4) UNRELEASED; urgency=low [ Stephane Glondu ] * Switching packaging to git * Fix GC-unsafe operations in C stubs (Closes: #500591) + * Set Maintainer to d-o-m, and Uploaders to Sam and me - -- Stephane Glondu [EMAIL PROTECTED] Mon, 29 Sep 2008 19:22:41 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Mon, 29 Sep 2008 19:27:14 +0200 ocaml-ssl (0.4.2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 9d79bb4..89ae23b 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: ocaml-ssl Section: devel Priority: optional -Maintainer: Samuel Mimram [EMAIL PROTECTED] +Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED] +Uploaders: Samuel Mimram [EMAIL PROTECTED], Stephane Glondu [EMAIL PROTECTED] Build-Depends: debhelper (= 4.0.0), dpkg-dev (= 1.13.19), libssl-dev (= 0.9.6), ocaml-nox (= 3.10), ocaml-findlib ( 1.1-3) Standards-Version: 3.7.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-ssl.git -- ocaml-ssl 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-8-g0bc2088
The following commit has been merged in the master branch: commit 0bc2088552c9567ea623099eb44d2e6e50c0d66d Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Oct 1 00:50:01 2008 +0200 Fix location of static files in conf template diff --git a/debian/ocsigen.conf.template b/debian/ocsigen.conf.template index e89abe4..bdacbfc 100644 --- a/debian/ocsigen.conf.template +++ b/debian/ocsigen.conf.template @@ -26,7 +26,7 @@ database name=%_DBNAME_% user=%_DBUSER_% password=%_DBPASSWD_% / /eliom -static dir=/usr/share/ocsigen/nurpawiki/files / +static dir=/usr/share/ocsigen/nurpawiki / /site /host /server -- nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-9-gaeb4d5b
The following commit has been merged in the master branch:
commit aeb4d5bb1b4fd659cc3a4880e3336e778d460267
Author: Janne Hellsten [EMAIL PROTECTED]
Date: Wed Oct 1 02:31:21 2008 +0300
Minor documentation changes.
diff --git a/debian/README.Debian b/debian/README.Debian
index 9a85f12..4076e46 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -18,22 +18,22 @@ user postgres):
ALTER ${DBUSER} PASSWORD '${DBPASSWORD}';
\q
3. Populate the database with Nurpawiki's schema:
- psql ${DBNAME} ${DBUSER} schema.psql
+ psql ${DBNAME} ${DBUSER} /usr/share/doc/nurpawiki/schema.psql
You can take, for example, DBUSER=ocsigen and DBNAME=nurpawiki (beware
of commands executed in psql shell). The schema.psql file is available
-in /usr/share/doc/nurpawiki where Nurpawiki is installed.
+in /usr/share/doc/nurpawiki.
A sample template for a configuration file is available in
-/usr/share/doc/nurpawiki/examples. Filling it with proper user,
-database name and password will give you a file that can be run with
-ocsigen -c file (as root). Ocsigen will then be listening on port
-8080, as user ocsigen, and be serving Nurpawiki only (at /). If
-satisfied, and if you don't use any other Ocsigen-based service, you
-can directly use that configuration file as /etc/ocsigen/ocsigen.conf
-and use the initscript to launch ocsigen. Of course, Nurpawiki can be
-used with other Ocsigen-based services, but you'll have to edit
-/etc/ocsigen.conf yourself.
+/usr/share/doc/nurpawiki/examples. Filling it with proper database
+user, database name and password will give you a file that can be
+run with ocsigen -c file (as root). Ocsigen will then be listening
+on port 8080, as user ocsigen, and be serving Nurpawiki only (at
+/). If satisfied, and if you don't use any other Ocsigen-based
+service, you can directly use that configuration file as
+/etc/ocsigen/ocsigen.conf and use the initscript to launch ocsigen. Of
+course, Nurpawiki can be used with other Ocsigen-based services, but
+you'll have to edit /etc/ocsigen.conf yourself.
At installation, a wiki user admin with an empty password is created.
@@ -44,7 +44,7 @@ At installation, a wiki user admin with an empty password
is created.
Tutorial on using Nurpawiki:
http://code.google.com/p/nurpawiki/wiki/Tutorial
- Nurpawiki project page:
+ Nurpawiki project page (use Issues tab for bug reporting):
http://code.google.com/p/nurpawiki/
Ocsigen project page:
@@ -54,11 +54,12 @@ At installation, a wiki user admin with an empty password
is created.
3. Known limitations
-Nurpawiki seems to work only with a local PostgreSQL database, and
-doesn't handle ident (socket-based) authentication.
+Nurpawiki can only be used with a local PostgreSQL database and
+doesn't handle ident (socket-based) authentication. This is merely a
+configuration limitation and should be easy to fix if need be.
Ocsigen provides a /etc/ocsigen/conf.d directory for easy splitting of
-the configuration, but the default /etc/ocsigen/ocsigen.conf provided
+the configuration but the default /etc/ocsigen/ocsigen.conf provided
by the ocsigen package makes it useless. This is the reason why the
configuration part is still a bit tricky (this will hopefully be fixed
in the future).
--
nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-10-g3e72176
The following commit has been merged in the master branch: commit 3e72176cf788a1d0e72b9728954f68c286004fce Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu Oct 2 09:35:38 2008 +0200 More copyright information diff --git a/debian/copyright b/debian/copyright index 8294e7e..10fb79c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -21,6 +21,25 @@ License: GPL-2+ The complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. +Files: files/jscalendar/* +Copyright: © 2002-2005 Mihai Bazon, Dynarch.com +License: LGPL-2.1+ + + Original website is at http://dynarch.com/mishoo/. + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + The complete text of the GNU Lesser General Public License can be found in + `/usr/share/common-licenses/LGPL'. + Files: debian/* Copyright: © 2008 Stéphane Glondu [EMAIL PROTECTED] License: GPL-2+ -- nurpawiki 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] ocsigen packaging branch, master, updated. debian/1.1.0-1-1-gb364c41
The following commit has been merged in the master branch: commit b364c411a7bc55e923992ff963203cbd01ec6d56 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Oct 3 22:01:52 2008 +0200 Make configuration file explicit in init script) diff --git a/debian/ocsigen.init b/debian/ocsigen.init index b934245..5c523fb 100644 --- a/debian/ocsigen.init +++ b/debian/ocsigen.init @@ -19,12 +19,13 @@ DAEMON=/usr/bin/ocsigen NAME=ocsigen DESC=ocsigen PIDFILE=/var/run/$NAME.pid +DEFAULTFILE=/etc/default/ocsigen test -x $DAEMON || exit 0 # Include ocsigen defaults if available -if [ -f /etc/default/ocsigen ] ; then - . /etc/default/ocsigen +if [ -f $DEFAULTFILE ] ; then + . $DEFAULTFILE fi set -e @@ -32,7 +33,7 @@ set -e case $1 in start|force-start) if [ x$LAUNCH_AT_STARTUP != xtrue ] [ x$1 = xstart ]; then - echo Configuration file prevent $NAME to be started (use force-start). + echo $DEFAULTFILE prevents $NAME to be started (use force-start). exit 0 fi -- ocsigen 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-11-g2220e37
The following commit has been merged in the master branch: commit 2220e372fa67fc6c8a5f1bfed9c55286ad60c49f Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Oct 8 17:55:18 2008 +0200 Remove pcre dependency from META file With pcre in the META file, nurpawiki needs access to pcre's META file. However, pcre is already used by the server, hence statically linked into ocsigen. This patch allows nurpawiki to be loaded without pcre's META file installed. diff --git a/debian/rules b/debian/rules index 25cccb5..a5d3e3b 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,11 @@ install: install-stamp install-stamp: build-stamp install -d $(OCAMLFIND_DESTDIR) dh install - # Fix ugly permissions +# Fix ugly permissions chmod 644 debian/nurpawiki/usr/share/ocsigen/nurpawiki/*.png +# Small hack to prevent a runtime dependency on libpcre-ocaml which is +# statically linked in ocsigen + sed -i 's/,pcre//' $(OCAMLFIND_DESTDIR)/nurpawiki/META touch $@ clean: unpatch -- nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-12-gf2f16c1
The following commit has been merged in the master branch:
commit f2f16c133c0c6e736545f9825cc46d0e1c2e3f00
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Sun Oct 12 16:30:29 2008 +0200
Clarifications in README.source
diff --git a/debian/README.source b/debian/README.source
index 1acdefb..5c1a098 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -33,14 +33,22 @@ cloning:
git add -f -u
git add -f debian/patches
git commit Releasing ${VERSION}
- 4. Build the package (and tag):
+ 6. Build the package (and tag):
git-buildpackage \
--git-pristine-tar --git-tag \
--git-debian-branch=build [options]
-During development/tests, steps 3 and 5 (and --git-tag) are not
-needed, and you may use git-buildpackage with the master branch
-instead of build, provided you git-ignore debian/patches.
+During development/tests, you can work directly on branch master,
+provided you tell git to ignore debian/patches. You can then skip
+steps 3 and 5, and forget --git-tag and --git-debian-branch options in
+step 6:
+
+ git-buildpackage --git-pristine-tar [options]
+
+Notes:
+ - don't commit serialized patches into master
+ - don't commit patched sources into master (git status will be
+ meaningful only after debclean)
3. Known problems
--
nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-13-g2a10434
The following commit has been merged in the master branch:
commit 2a10434c0de082b7a188e9e2ffbdaa84f540fea8
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Mon Oct 13 11:07:58 2008 +0200
Precision in README.source
diff --git a/debian/README.source b/debian/README.source
index 5c1a098..5757c40 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -30,6 +30,7 @@ cloning:
4. Generate debian/patches:
debian/rules tg-export
5. Update the branch (if needed):
+ git checkout build
git add -f -u
git add -f debian/patches
git commit Releasing ${VERSION}
--
nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-19-g8ac711c
The following commit has been merged in the master branch: commit 2196a453e2d19040be2ccc105cfda72c0853600a Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Oct 15 00:48:26 2008 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 7906315..ed6c0df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nurpawiki (1.2.1-1) UNRELEASED; urgency=low +nurpawiki (1.2.2-1) UNRELEASED; urgency=low * Initial release (Closes: #500726) -- nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-19-g8ac711c
The following commit has been merged in the master branch: commit eb652a83257fef86c2beefb054597cc7638197ce Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Oct 15 01:01:17 2008 +0200 Update debian/copyright diff --git a/debian/copyright b/debian/copyright index 10fb79c..8400072 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Packaged-Date: Thu, 25 Sep 2008 13:53:53 +0200 Original-Source-Location: http://code.google.com/p/nurpawiki/ Files: * -Copyright: © 2006-2007 Janne Hellsten [EMAIL PROTECTED] +Copyright: © 2006-2008 Janne Hellsten [EMAIL PROTECTED] License: GPL-2+ This program is free software: you can redistribute it and/or -- nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-19-g8ac711c
The following commit has been merged in the master branch:
commit d3d61f7db9e3da18b9ac4d3ffbcb8662c4ffe7cb
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Wed Oct 15 01:03:01 2008 +0200
Nurpawiki populates the database itself now
diff --git a/debian/README.Debian b/debian/README.Debian
index 4076e46..fc7e7dd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -17,8 +17,6 @@ user postgres):
psql ${DBNAME} ${DBUSER}
ALTER ${DBUSER} PASSWORD '${DBPASSWORD}';
\q
- 3. Populate the database with Nurpawiki's schema:
- psql ${DBNAME} ${DBUSER} /usr/share/doc/nurpawiki/schema.psql
You can take, for example, DBUSER=ocsigen and DBNAME=nurpawiki (beware
of commands executed in psql shell). The schema.psql file is available
--
nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-19-g8ac711c
The following commit has been merged in the master branch:
commit 8ac711ca53a1a18d42d5a92cbc573bf620116aa6
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Wed Oct 15 01:04:38 2008 +0200
All patches have been merged in upstream
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5757c40..000
--- a/debian/README.source
+++ /dev/null
@@ -1,59 +0,0 @@
-Building Nurpawiki for Debian
--
-
-The nurpawiki 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, however, generated from the Git repository, using
-TopGit. Please refer to /usr/share/doc/topgit/README.source for more
-information.
-
-
-1. Cloning the repository
-~
-
-Cloning a TopGit repository requires an additional step to normal Git
-cloning:
-
- 1. git clone ssh://git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git
- 2. cd nurpawiki
- 3. tg remote --populate origin
-
-
-2. Building from the Git repository
-~~~
-
- 1. Checkout the master branch
- 2. Update (and commit) TG_BRANCHES in debian/rules (if needed)
- 3. Checkout the build branch, and merge master into it
- 4. Generate debian/patches:
- debian/rules tg-export
- 5. Update the branch (if needed):
- git checkout build
- git add -f -u
- git add -f debian/patches
- git commit Releasing ${VERSION}
- 6. Build the package (and tag):
- git-buildpackage \
---git-pristine-tar --git-tag \
---git-debian-branch=build [options]
-
-During development/tests, you can work directly on branch master,
-provided you tell git to ignore debian/patches. You can then skip
-steps 3 and 5, and forget --git-tag and --git-debian-branch options in
-step 6:
-
- git-buildpackage --git-pristine-tar [options]
-
-Notes:
- - don't commit serialized patches into master
- - don't commit patched sources into master (git status will be
- meaningful only after debclean)
-
-
-3. Known problems
-~
-
-The failure of any step explained here or in TopGit's README.source
-may be difficult to sort out and result in headaches!
diff --git a/debian/control b/debian/control
index b375869..72bdb3f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Maintainer: Debian OCaml Maintainers [EMAIL PROTECTED]
Uploaders: Stephane Glondu [EMAIL PROTECTED]
DM-Upload-Allowed: yes
Build-Depends:
- quilt,
debhelper (= 7),
ocsigen-dev (= 1.1.0),
libcalendar-ocaml-dev,
diff --git a/debian/rules b/debian/rules
index a5d3e3b..bf9dc9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-TG_BRANCHES = fixes/ocsigen-1.1.0 fixes/calendar-2.0.2
-
# For ocamlfind
export OCAMLFIND_DESTDIR = debian/nurpawiki/usr/lib/ocsigen
-# We want to use quilt
-include /usr/share/quilt/quilt.make
-
build: build-stamp
build-stamp: $(QUILT_STAMPFN)
dh build
@@ -39,17 +34,4 @@ binary-arch: install-stamp
binary: binary-indep binary-arch
-tg-export:
- tg create stage-debian $(TG_BRANCHES)
- git commit -m staging
- rm -Rf debian/patches.new
- tg export --quilt debian/patches.new
- git rm -f .top*
- git checkout master
- tg delete stage-debian
- rm debian/patches.new/stage-*
- sed -i '/^stage-/d' debian/patches.new/series
- rm -Rf debian/patches
- mv debian/patches.new debian/patches
-
.PHONY: build clean binary-indep binary-arch binary install tg-export
--
nurpawiki 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] nurpawiki packaging branch, pristine-tar, updated. 6928090aaa1ee49625c326ad01020a4ca9f571a6
The following commit has been merged in the pristine-tar branch: commit 6928090aaa1ee49625c326ad01020a4ca9f571a6 Author: Stephane Glondu [EMAIL PROTECTED] Date: Wed Oct 15 00:48:09 2008 +0200 pristine-tar data for nurpawiki_1.2.2.orig.tar.gz diff --git a/nurpawiki_1.2.2.orig.tar.gz.delta b/nurpawiki_1.2.2.orig.tar.gz.delta new file mode 100644 index 000..c7c9b06 Binary files /dev/null and b/nurpawiki_1.2.2.orig.tar.gz.delta differ diff --git a/nurpawiki_1.2.2.orig.tar.gz.id b/nurpawiki_1.2.2.orig.tar.gz.id new file mode 100644 index 000..e631da4 --- /dev/null +++ b/nurpawiki_1.2.2.orig.tar.gz.id @@ -0,0 +1 @@ +e26eccd1b9905a5104b3b7ff78fd7a1bfd4ce98e -- nurpawiki 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] nurpawiki packaging branch, fixes/ocsigen-1.1.0, deleted. upstream/1.2.1-1-g3873d93
The branch, fixes/ocsigen-1.1.0 has been deleted was 3873d939dbc71a838b71f8a746fd59298c7d216d --- 3873d939dbc71a838b71f8a746fd59298c7d216d Initial commit of patch fixes/ocsigen-1.1.0 --- -- nurpawiki 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] nurpawiki packaging branch, fixes/calendar-2.0.2, deleted. upstream/1.2.1-3-g22513ea
The branch, fixes/calendar-2.0.2 has been deleted was 22513ea9df13b61c9946d2e0fd704dcdd17f8532 --- 22513ea9df13b61c9946d2e0fd704dcdd17f8532 The whole library is now packed into CalendarLib module --- -- nurpawiki 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] nurpawiki packaging branch, build, deleted. upstream/1.2.1-6-g8535e56
The branch, build has been deleted was 8535e56cbc8b495a7ca625577bafa91113a922f5 --- 8535e56cbc8b495a7ca625577bafa91113a922f5 More debhelper files --- -- nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-21-g96d2611
The following commit has been merged in the master branch:
commit 96d2611f217e46bbed1e0f70e8c00459f020847d
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Wed Oct 15 23:35:02 2008 +0200
Add dependency to ocaml-base-nox-${F:OCamlABI}
diff --git a/debian/control b/debian/control
index 72bdb3f..ca60704 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Vcs-Git:
git://git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git
Package: nurpawiki
Architecture: all
Depends:
+ ocaml-base-nox-${F:OCamlABI},
libcalendar-ocaml-dev,
libextlib-ocaml-dev,
libpostgresql-ocaml-dev,
diff --git a/debian/rules b/debian/rules
index 3e35cf7..a5bebca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ clean:
dh $@
binary-indep: install-stamp
+ echo 'F:OCamlABI=$(shell ocamlc -version)' debian/nurpawiki.substvars
dh $@
binary-arch: install-stamp
--
nurpawiki 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] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-2-7-g3e6a116
The following commit has been merged in the master branch: commit 3e6a1167fd397f2c72b48315e5d82f6c7e24703f Author: Stephane Glondu [EMAIL PROTECTED] Date: Thu Oct 16 13:39:34 2008 +0200 Define substvars more appropriately diff --git a/debian/rules b/debian/rules index 19bd688..58ad7e1 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,6 @@ configure: configure-stamp configure-stamp: patch-stamp ocamlinit-stamp dh build --before dh_auto_configure ./configure $(CONFIGUREOPTS) - echo 'F:OCamlABI=$(OCAMLABI)' debian/substvars touch $@ build: build-stamp @@ -76,6 +75,7 @@ binary-indep: install-stamp dh $@ binary-arch: install-stamp + for u in coq coqide; do echo 'F:OCamlABI=$(OCAMLABI)' debian/$$u.substvars; done dh $@ binary: binary-indep binary-arch -- coq 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] OCaml packaging branch, pristine-tar, updated. ed1e361e25ee34da2e9abe8552c68aa82ea8d99a
The following commit has been merged in the pristine-tar branch: commit ed1e361e25ee34da2e9abe8552c68aa82ea8d99a Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Oct 17 12:22:48 2008 +0200 pristine-tar data for ocaml_3.11.0~beta1.orig.tar.gz diff --git a/ocaml_3.11.0~beta1.orig.tar.gz.delta b/ocaml_3.11.0~beta1.orig.tar.gz.delta new file mode 100644 index 000..b72be48 Binary files /dev/null and b/ocaml_3.11.0~beta1.orig.tar.gz.delta differ diff --git a/ocaml_3.11.0~beta1.orig.tar.gz.id b/ocaml_3.11.0~beta1.orig.tar.gz.id new file mode 100644 index 000..11c8fb9 --- /dev/null +++ b/ocaml_3.11.0~beta1.orig.tar.gz.id @@ -0,0 +1 @@ +5dfb1ce8883f4b3457ae9da5c6dd1399bf132ef1 -- OCaml 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] OCaml packaging branch, 3.11/upstream, created. upstream/3.10.2-1-g5dfb1ce
The branch, 3.11/upstream has been created at 5dfb1ce8883f4b3457ae9da5c6dd1399bf132ef1 (commit) - Shortlog commit 5dfb1ce8883f4b3457ae9da5c6dd1399bf132ef1 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Oct 17 12:22:34 2008 +0200 Imported Upstream version 3.11.0~beta1 --- -- OCaml 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] camlp5 packaging branch, pristine-tar, updated. bc8a5e7a592a7375ca2ef684ad6c85182aebb84e
The following commit has been merged in the pristine-tar branch: commit bc8a5e7a592a7375ca2ef684ad6c85182aebb84e Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Oct 21 18:06:39 2008 +0200 pristine-tar data for camlp5_5.10.orig.tar.gz diff --git a/camlp5_5.10.orig.tar.gz.delta b/camlp5_5.10.orig.tar.gz.delta new file mode 100644 index 000..57941fa Binary files /dev/null and b/camlp5_5.10.orig.tar.gz.delta differ diff --git a/camlp5_5.10.orig.tar.gz.id b/camlp5_5.10.orig.tar.gz.id new file mode 100644 index 000..cbfd699 --- /dev/null +++ b/camlp5_5.10.orig.tar.gz.id @@ -0,0 +1 @@ +9bfb7381b2965f5105e12a99bf452c0f40a0c04a -- camlp5 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] OCaml packaging branch, 3.11/master, updated. debian/3.10.2-3-56-g1968e22
The following commit has been merged in the 3.11/master branch: commit 1968e229d9584e5b380261e2d1f89bf06a8a267d Author: Stephane Glondu [EMAIL PROTECTED] Date: Mon Oct 27 18:57:41 2008 +0100 Add manpages.dpatch and ocamldoc.dpatch diff --git a/debian/changelog b/debian/changelog index e4e3b5c..dd1cfa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low * New upstream beta release: - camlrun_shared.dpatch removed (integrated upstream) - all other patches updated +- manpages.dpatch and ocamldoc.dpatch added * Switching packaging to git (from svn) * Bump debhelper compatibility level to 7, and use debian/clean feature of dh_clean @@ -19,7 +20,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low - ocaml-md5sums (therefore also disable its usage at the end of the build process) - -- Stephane Glondu [EMAIL PROTECTED] Mon, 20 Oct 2008 23:57:07 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Mon, 27 Oct 2008 19:25:11 +0100 ocaml (3.10.2-3) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 55f0b79..3be95a8 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,5 @@ +manpages.dpatch +ocamldoc.dpatch objinfo.dpatch dumpobj.dpatch man-ocamlmklib.dpatch diff --git a/debian/patches/manpages.dpatch b/debian/patches/manpages.dpatch new file mode 100755 index 000..12873fc --- /dev/null +++ b/debian/patches/manpages.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## manpages.dpatch by Stephane Glondu [EMAIL PROTECTED] +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix errors in ocamlc and ocamlopt manpages (see Mantis #4629) + + [EMAIL PROTECTED]@ +diff --git a/man/ocamlc.m b/man/ocamlc.m +index 0ce1e8d..b1fb8bf 100644 +--- a/man/ocamlc.m b/man/ocamlc.m +@@ -421,8 +421,8 @@ as a preprocessor for each source file. The output of + is redirected to + an intermediate file, which is compiled. If there are no compilation + errors, the intermediate file is deleted afterwards. The name of this +-file is built from the basename of the source file with the extension +-.ppi for an interface (.mli) file and .ppo for an implementation ++file is built from the basename of the source file with the extension .ppi ++for an interface (.mli) file and .ppo for an implementation + (.ml) file. + .TP + .B \-principal +@@ -561,7 +561,7 @@ into errors. The compiler will stop with an error when one of these + warnings is emitted. The + .I warning\-list + has the same meaning as for +-the -w option: an uppercase character turns the corresponding ++the \-w option: an uppercase character turns the corresponding + warning into an error, a lowercase character leaves it as a warning. + The default setting is + .B \-warn\-error\ a +diff --git a/man/ocamlopt.m b/man/ocamlopt.m +index 3872bd8..2a44836 100644 +--- a/man/ocamlopt.m b/man/ocamlopt.m +@@ -222,7 +222,7 @@ and edit that file to remove all declarations of unexported names. + Add the given directory to the list of directories searched for + compiled interface files (.cmi) and compiled object code files + (.cmo). By default, the current directory is searched first, then the +-standard library directory. Directories added with -I are searched ++standard library directory. Directories added with \-I are searched + after the current directory, in the order in which they were given on + the command line, but before the standard library directory. + +@@ -536,7 +536,7 @@ into errors. The compiler will stop with an error when one of these + warnings is emitted. The + .I warning\-list + has the same meaning as for +-the -w option: an uppercase character turns the corresponding ++the \-w option: an uppercase character turns the corresponding + warning into an error, a lowercase character leaves it as a warning. + The default setting is + .B \-warn\-error\ a +@@ -577,7 +577,7 @@ trigonometric operations + .BR cos , + .BR sin , + .B tan +-have their range reduced to [-2^64, 2^64]. ++have their range reduced to [\-2^64, 2^64]. + + .SH OPTIONS FOR THE AMD64 ARCHITECTURE + diff --git a/debian/patches/ocamldoc.dpatch b/debian/patches/ocamldoc.dpatch new file mode 100755 index 000..ffd69a8 --- /dev/null +++ b/debian/patches/ocamldoc.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ocamldoc.dpatch by Stephane Glondu [EMAIL PROTECTED] +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Various fixes in ocamldoc (see Mantis #4630) + + [EMAIL PROTECTED]@ +diff --git a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml +index a550118..ae3a120 100644 +--- a/ocamldoc/odoc_man.ml b/ocamldoc/odoc_man.ml +@@ -204,6 +204,8 @@ class man = + match s.[i] with + '\\' - Buffer.add_string b \\(rs + | '.' - Buffer.add_string b \\. ++| '\'' - Buffer.add_string b \\' ++| '-' - Buffer.add_string
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 3.11/master, updated. debian/3.10.2-3-57-g198c56c
The following commit has been merged in the 3.11/master branch:
commit 198c56cc9a54711c999deeff311e52b3dd419fcc
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Mon Oct 27 19:37:47 2008 +0100
Add explicit dependency from camlp4-extra to ocaml-nox
diff --git a/debian/changelog b/debian/changelog
index dd1cfa4..ad0f355 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
* Bump debhelper compatibility level to 7, and use debian/clean feature
of dh_clean
* Add myself to uploaders, and update Julien's address
+ * Add explicit dependency from camlp4-extra to ocaml-nox
[ Stefano Zacchiroli ]
* Bump Standards-Version to 3.8.0, no changes needed
@@ -20,7 +21,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
- ocaml-md5sums (therefore also disable its usage at the end of the
build process)
- -- Stephane Glondu [EMAIL PROTECTED] Mon, 27 Oct 2008 19:25:11 +0100
+ -- Stephane Glondu [EMAIL PROTECTED] Mon, 27 Oct 2008 19:36:23 +0100
ocaml (3.10.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1822700..f69cb00 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,7 @@ Description: Pre Processor Pretty Printer for OCaml
Package: camlp4-extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, camlp4 (=${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-nox (=${binary:Version}),
camlp4 (=${binary:Version})
Description: Pre Processor Pretty Printer for OCaml - extras
Objective Caml (OCaml) is an implementation of the ML language,
based on the Caml Light dialect extended with a complete
--
OCaml 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] OCaml packaging branch, 3.11/master, updated. debian/3.10.2-3-58-g9667598
The following commit has been merged in the 3.11/master branch: commit 96675986319cce07d96e89cb4538494949b3fa14 Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Nov 2 12:58:44 2008 +0100 Remove not-native-no-aspp.dpatch See upstream bug #4375 diff --git a/debian/changelog b/debian/changelog index ad0f355..9239f7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low [ Stephane Glondu ] * New upstream beta release: - camlrun_shared.dpatch removed (integrated upstream) +- not-native-no-aspp.dpatch removed (thanks to upstream bugfix) - all other patches updated - manpages.dpatch and ocamldoc.dpatch added * Switching packaging to git (from svn) @@ -21,7 +22,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low - ocaml-md5sums (therefore also disable its usage at the end of the build process) - -- Stephane Glondu [EMAIL PROTECTED] Mon, 27 Oct 2008 19:36:23 +0100 + -- Stephane Glondu [EMAIL PROTECTED] Sun, 02 Nov 2008 12:56:34 +0100 ocaml (3.10.2-3) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 3be95a8..fcf35f8 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -9,4 +9,3 @@ no_rpath.dpatch stdlib_man_section.dpatch install_scripts_config.dpatch install_ocamlbuild.dpatch -not-native-no-aspp diff --git a/debian/patches/not-native-no-aspp.dpatch b/debian/patches/not-native-no-aspp.dpatch deleted file mode 100755 index f2d8537..000 --- a/debian/patches/not-native-no-aspp.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## not-native-no-aspp.dpatch by Sylvain Le Gall [EMAIL PROTECTED] -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -diff -urNad ocaml~/build/mkmyocamlbuild_config.sh ocaml/build/mkmyocamlbuild_config.sh ocaml~/build/mkmyocamlbuild_config.sh 2008-10-17 12:22:50.0 +0200 -+++ ocaml/build/mkmyocamlbuild_config.sh 2008-10-20 15:03:04.0 +0200 -@@ -19,6 +19,7 @@ - sed \ - -e 's/^.*FLEXDIR.*$//g' \ - -e 's/^#ml \(.*\)/\1/' \ -+-e 's/\$(AS)/no/' \ - -e 's/^\(#.*\)$/(* \1 *)/' \ - -e 's/^\(.*\$([0-9]).*\)$/(* \1 *)/' \ - -e 's/^\([^(=]*\)=\([^]*\)$/let :lower\1 = \2;;/' \ -- OCaml 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] OCaml packaging branch, master, updated. debian/3.10.2-3-16-g2af942a
The following commit has been merged in the master branch:
commit 2af942a1a9de369365be8ad312845feb1138d9d5
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Sun Nov 2 13:09:41 2008 +0100
Revert Embed bytecode in C object when using -custom
This reverts commit 5439795661016dd942b38d44acfd383dd10da236,
pushed to git.debian.org by mistake.
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index e5afbd4..83add82 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -377,7 +377,7 @@ let output_data_string outchan data =
(* Output a bytecode executable as a C file *)
-let link_bytecode_as_c tolink outfile with_main =
+let link_bytecode_as_c tolink outfile =
let outchan = open_out outfile in
try
(* The bytecode *)
@@ -413,26 +413,14 @@ CAMLextern void caml_startup_code(
(* The table of primitives *)
Symtable.output_primitive_table outchan;
(* The entry point *)
-if with_main then begin
- output_string outchan \n
-int main(int argc, char **argv)
-{
- caml_startup_code(caml_code, sizeof(caml_code),
-caml_data, sizeof(caml_data),
-caml_sections, sizeof(caml_sections),
-argv);
- return 0; /* not reached */
-}\n
-end else begin
- output_string outchan \n
+output_string outchan \n
void caml_startup(char ** argv)
{
caml_startup_code(caml_code, sizeof(caml_code),
caml_data, sizeof(caml_data),
caml_sections, sizeof(caml_sections),
argv);
-}\n
-end;
+}\n;
close_out outchan
with x -
close_out outchan;
@@ -510,16 +498,6 @@ let link objfiles output_name =
Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
if not !Clflags.custom_runtime then
link_bytecode tolink output_name true
- else if not !Clflags.make_runtime then
-let c_file = Filename.temp_file camlobj .c in
-try
- link_bytecode_as_c tolink c_file true;
- let exec_name = fix_exec_name output_name in
- if build_custom_runtime c_file exec_name 0
- then raise(Error Custom_runtime);
-with x -
- remove_file c_file;
- raise x
else if not !Clflags.output_c_object then begin
let bytecode_name = Filename.temp_file camlcode in
let prim_name = Filename.temp_file camlprim .c in
@@ -543,7 +521,7 @@ let link objfiles output_name =
Filename.chop_suffix output_name Config.ext_obj ^ .c in
if Sys.file_exists c_file then raise(Error(File_exists c_file));
try
- link_bytecode_as_c tolink c_file false;
+ link_bytecode_as_c tolink c_file;
if Ccomp.compile_file c_file 0
then raise(Error Custom_runtime);
remove_file c_file
--
OCaml 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] OCaml packaging branch, 3.11/master, updated. debian/3.10.2-3-59-g4900cdc
The following commit has been merged in the 3.11/master branch:
commit 4900cdc4d4cf44f86a11b0b443f6e3fe8b8f6446
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Mon Nov 3 23:11:29 2008 +0100
Remove dependency to gcc-4.2 on arm
diff --git a/debian/changelog b/debian/changelog
index 9239f7d..aa15bf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
- not-native-no-aspp.dpatch removed (thanks to upstream bugfix)
- all other patches updated
- manpages.dpatch and ocamldoc.dpatch added
+- dependency to gcc-4.2 on arm removed
* Switching packaging to git (from svn)
* Bump debhelper compatibility level to 7, and use debian/clean feature
of dh_clean
@@ -22,7 +23,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
- ocaml-md5sums (therefore also disable its usage at the end of the
build process)
- -- Stephane Glondu [EMAIL PROTECTED] Sun, 02 Nov 2008 12:56:34 +0100
+ -- Stephane Glondu [EMAIL PROTECTED] Mon, 03 Nov 2008 23:10:06 +0100
ocaml (3.10.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f69cb00..e17377c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
Sylvain Le Gall [EMAIL PROTECTED],
Ralf Treinen [EMAIL PROTECTED],
Stephane Glondu [EMAIL PROTECTED]
-Build-Depends: debhelper (= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev,
libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm]
+Build-Depends: debhelper (= 7), tcl8.4-dev, tk8.4-dev, libncurses5-dev,
libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git
@@ -18,7 +18,7 @@ Homepage: http://caml.inria.fr/
Package: ocaml-nox
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox
(=${binary:Version}), ocaml-interp (=${binary:Version}), gcc [!arm], gcc-4.2
[arm], binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox
(=${binary:Version}), ocaml-interp (=${binary:Version}), gcc, binutils
Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
Recommends: camlp4, ledit, file
Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -144,7 +144,7 @@ Description: Runtime system for OCaml bytecode executables
Package: ocaml-native-compilers
Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
-Depends: ocaml-nox (= ${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils,
${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends},
${misc:Depends}
Provides: ocaml-best-compilers
Replaces: ocaml-nox (= 3.09.2-3)
Description: Native code compilers of the OCaml suite (the .opt ones)
diff --git a/debian/rules b/debian/rules
index 58dfded..37aa1ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,6 @@ endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-ifeq (arm,$(DEB_BUILD_ARCH))
-CFG_CC_FLAGS = -cc gcc-4.2
-endif
abi-sed:
for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
@@ -74,7 +71,7 @@ debian/$(SRCTARBALL):
config-stamp: pre-config patch-stamp abi-sed
dh_testdir
- ./configure --with-pthread -prefix /usr $(CFG_CC_FLAGS) \
+ ./configure --with-pthread -prefix /usr \
-libdir /usr/lib/ocaml/$(OCAMLABI) \
-mandir /usr/share/man \
-tkdefs -I/usr/include/tcl8.4 \
--
OCaml 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] OCaml packaging branch, 3.11/master, updated. debian/3.11.0.beta1-1
The following commit has been merged in the 3.11/master branch: commit 1cf0a3a6588c14eabef5e591c06b4211fcbd1da6 Author: Stephane Glondu [EMAIL PROTECTED] Date: Tue Nov 4 20:14:27 2008 +0100 Prepare upload (to experimental) diff --git a/debian/changelog b/debian/changelog index aa15bf0..d5e1b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low +ocaml (3.11.0~beta1-1) experimental; urgency=low [ Stephane Glondu ] * New upstream beta release: -- OCaml 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-23-gda8cc13
The following commit has been merged in the master branch:
commit 4a9ae2cd32d6f879950f709c8ab31fc35e737ae4
Author: Stephane Glondu [EMAIL PROTECTED]
Date: Fri Nov 14 13:29:28 2008 +0100
arch:all - arch:any
As OCaml 3.11 with native Dynlink is coming very soon, we switch right
now to arch:any.
diff --git a/debian/control b/debian/control
index ca60704..eec42e8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-ocaml-maint/packages/nurpawiki.git
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git
Package: nurpawiki
-Architecture: all
+Architecture: any
Depends:
ocaml-base-nox-${F:OCamlABI},
libcalendar-ocaml-dev,
--
nurpawiki 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] nurpawiki packaging branch, master, updated. upstream/1.2.1-23-gda8cc13
The following commit has been merged in the master branch: commit da8cc13e0ca4252d4d24dcddf67409a267496f69 Author: Stephane Glondu [EMAIL PROTECTED] Date: Fri Nov 14 13:41:11 2008 +0100 Uploading (to experimental) diff --git a/debian/changelog b/debian/changelog index ed6c0df..40f15a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -nurpawiki (1.2.2-1) UNRELEASED; urgency=low +nurpawiki (1.2.2-1) experimental; urgency=low * Initial release (Closes: #500726) - -- Stephane Glondu [EMAIL PROTECTED] Tue, 30 Sep 2008 22:12:15 +0200 + -- Stephane Glondu [EMAIL PROTECTED] Fri, 14 Nov 2008 13:40:40 +0100 -- nurpawiki 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] nurpawiki packaging annotated tag, debian/1.2.2-1, created. debian/1.2.2-1
The annotated tag, debian/1.2.2-1 has been created
at 3695b2ef411e00291f394fa00be23ca6870b544a (tag)
tagging da8cc13e0ca4252d4d24dcddf67409a267496f69 (commit)
replaces upstream/1.2.1
tagged by Stephane Glondu
on Fri Nov 14 12:55:47 2008 +
- Shortlog
Debian release 1.2.2-1
Janne Hellsten (1):
Minor documentation changes.
Stephane Glondu (22):
Initial packaging
Add debian/rules and debhelper files
Add ocsigen.conf template
Add README.source
Add README.Debian
More debhelper files
Fill in ITP number
Fix location of static files in conf template
More copyright information
Remove pcre dependency from META file
Clarifications in README.source
Precision in README.source
Imported Upstream version 1.2.2
Merge commit 'upstream/1.2.2'
New upstream release
Update debian/copyright
Nurpawiki populates the database itself now
All patches have been merged in upstream
Remove quilt stuff
Add dependency to ocaml-base-nox-${F:OCamlABI}
arch:all - arch:any
Uploading (to experimental)
---
--
nurpawiki 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] alt-ergo packaging branch, pristine-tar, updated. 9626a4ca27fdc5bbbc0059173194a67640695c0e
The following commit has been merged in the pristine-tar branch: commit 9626a4ca27fdc5bbbc0059173194a67640695c0e Author: Stephane Glondu [EMAIL PROTECTED] Date: Sun Nov 16 23:05:11 2008 +0100 Proper names for files in pristine-tar branch diff --git a/alt-ergo-0.8.tar.gz.delta b/alt-ergo_0.8.orig.tar.gz.delta similarity index 100% rename from alt-ergo-0.8.tar.gz.delta rename to alt-ergo_0.8.orig.tar.gz.delta diff --git a/alt-ergo-0.8.tar.gz.id b/alt-ergo_0.8.orig.tar.gz.id similarity index 100% rename from alt-ergo-0.8.tar.gz.id rename to alt-ergo_0.8.orig.tar.gz.id -- alt-ergo 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] OCaml packaging branch, 3.11/master, updated. debian/3.11.0.beta1-1-11-ge884770
The following commit has been merged in the 3.11/master branch: commit c0ea7bb0bfa64b731a3428d8d0b203e6c8bd4ff7 Author: Stephane Glondu [EMAIL PROTECTED] Date: Sat Nov 29 11:11:59 2008 +0100 Add debian/gbp.conf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000..7383807 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,9 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default branch for upstream sources: +upstream-branch = 3.11/upstream +# the default branch for the debian patch: +debian-branch = 3.11/master +# use pristine-tar: +pristine-tar = True -- OCaml 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
