[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-1-16-g6ec7ec5
The following commit has been merged in the master branch: commit 6ec7ec578f94ecf776425bc05a15023d60f6a9fe Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 13:27:36 2009 +0200 add closes statement in changlog (#535675) diff --git a/debian/changelog b/debian/changelog index 1bf6fba..0e13f55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ camlimages (1:3.0.1-2) unstable; urgency=low * Add myself to uploaders - * Fix missing comma in control file + * Fix missing comma in control file, Closes: #535675. * Move library packages to ocaml section. * Get rid of usage of old OCaml's stdlib location, fixes FTBFS. * Add versioned dependencies to ocaml-findlib and lablgtk2 to ease -- camlimages 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-1+dfsg-2-4-gd43a92c
The following commit has been merged in the master branch:
commit 1769cbaddea77112dd6f336316d8eb9a0945a1e6
Author: Stephane Glondu st...@glondu.net
Date: Sat Jul 4 11:58:21 2009 +0200
Keep some file from doc/common/styles/html/simple
They are needed for HTML API doc generation.
diff --git a/debian/purify_tarball b/debian/purify_tarball
index a453db0..f1d7996 100755
--- a/debian/purify_tarball
+++ b/debian/purify_tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
set -e
@@ -12,7 +12,10 @@ cd $WORKDIR
tar zxf $ORIGFILE
+mv
coq-$VERSION/doc/common/styles/html/simple/{style.css,header.html,footer.html}
coq-$VERSION
rm -rf coq-$VERSION/doc/common
+mkdir -p coq-$VERSION/doc/common/styles/html/simple
+mv coq-$VERSION/{style.css,header.html,footer.html}
coq-$VERSION/doc/common/styles/html/simple
rm -rf coq-$VERSION/doc/faq
rm -rf coq-$VERSION/doc/RecTutorial
rm -rf coq-$VERSION/doc/refman
--
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-1+dfsg-2-4-gd43a92c
The following commit has been merged in the master branch: commit 3a420f4ad929e8372d32c735fd0fd89dfc0346a1 Merge: 1769cbaddea77112dd6f336316d8eb9a0945a1e6 e4282ea99c664d8d58067bee199cbbcf881b60d5 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 13:28:38 2009 +0200 Merge commit 'upstream/8.2.pl1+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.2-1+dfsg-2-4-gd43a92c
The following commit has been merged in the master branch: commit d43a92cbe2dd9b90393698e98eb96104b14c04fa Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 12:14:10 2009 +0200 New Upstream Version diff --git a/debian/changelog b/debian/changelog index 11d3c53..9692444 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +coq (8.2.pl1+dfsg-1) unstable; urgency=low + + * New Upstream Version + * debian/purify_tarball: keep some files from doc/common/styles/html +needed for HTML API doc generation + + -- Stephane Glondu st...@glondu.net Sat, 04 Jul 2009 12:13:28 +0200 + coq (8.2-1+dfsg-2) unstable; 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 branch, pristine-tar, updated. 03081be093d8fe2eb290fe63db4b3d1bb83be652
The following commit has been merged in the pristine-tar branch: commit 03081be093d8fe2eb290fe63db4b3d1bb83be652 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 13:28:37 2009 +0200 pristine-tar data for coq_8.2.pl1+dfsg.orig.tar.gz diff --git a/coq_8.2.pl1+dfsg.orig.tar.gz.delta b/coq_8.2.pl1+dfsg.orig.tar.gz.delta new file mode 100644 index 000..a303adc Binary files /dev/null and b/coq_8.2.pl1+dfsg.orig.tar.gz.delta differ diff --git a/coq_8.2.pl1+dfsg.orig.tar.gz.id b/coq_8.2.pl1+dfsg.orig.tar.gz.id new file mode 100644 index 000..0a5ac1c --- /dev/null +++ b/coq_8.2.pl1+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +e4282ea99c664d8d58067bee199cbbcf881b60d5 -- 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.pl1+dfsg-1, created. debian/8.2.pl1+dfsg-1
The annotated tag, debian/8.2.pl1+dfsg-1 has been created at 35fa0c947758cb3a8e16e9ced728dd31d96f2574 (tag) tagging d43a92cbe2dd9b90393698e98eb96104b14c04fa (commit) replaces debian/8.2-1+dfsg-2 tagged by Stephane Glondu on Sat Jul 4 14:12:54 2009 +0200 - Shortlog Debian release 8.2.pl1+dfsg-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABEDAAYFAkpPR0YACgkQBg8odvzgPapaJgCeNInDn1C7QlSKQXZtGRCz1M4c 7aEAoJzklfXquHi7LL4JSbuvQX8S0tbM =GloK -END PGP SIGNATURE- Stephane Glondu (4): Keep some file from doc/common/styles/html/simple Imported Upstream version 8.2.pl1+dfsg Merge commit 'upstream/8.2.pl1+dfsg' New Upstream Version --- -- 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.pl1+dfsg, created. upstream/8.2.pl1+dfsg
The annotated tag, upstream/8.2.pl1+dfsg has been created at deef30f6aec0954b20629e56ab2c4bddc704f3c2 (tag) tagging e4282ea99c664d8d58067bee199cbbcf881b60d5 (commit) replaces upstream/8.2-1+dfsg tagged by Stephane Glondu on Sat Jul 4 13:28:37 2009 +0200 - Shortlog Upstream version 8.2.pl1+dfsg Stephane Glondu (1): Imported Upstream version 8.2.pl1+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-float packaging branch, master, updated. debian/8.2-1.2-2-1-gb1f9cb0
The following commit has been merged in the master branch: commit b1f9cb06d2dbc984114627ae33ad87f5dbaf30da Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 14:07:17 2009 +0200 Rebuild with Coq 8.2pl1 diff --git a/debian/changelog b/debian/changelog index b13ff37..c54a8ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coq-float (1:8.2-1.2-3) unstable; urgency=low + + * Rebuild with Coq 8.2pl1 + + -- Stephane Glondu st...@glondu.net Sat, 04 Jul 2009 14:06:56 +0200 + coq-float (1:8.2-1.2-2) unstable; urgency=low * Recompile with OCaml 3.11.1 ABI -- coq-float 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-float packaging annotated tag, debian/8.2-1.2-3, created. debian/8.2-1.2-3
The annotated tag, debian/8.2-1.2-3 has been created at 908da9b22045a83409ff9371beefb1fbaa896c5d (tag) tagging b1f9cb06d2dbc984114627ae33ad87f5dbaf30da (commit) replaces debian/8.2-1.2-2 tagged by Stephane Glondu on Sat Jul 4 14:27:28 2009 +0200 - Shortlog Debian release 1:8.2-1.2-3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABEDAAYFAkpPSrAACgkQBg8odvzgPao/JgCfcHu/bJW8u+TJXhpueOo+j/+f hzkAnjLSCqeEJD/pq2OhzGfkIGhVzDBL =neay -END PGP SIGNATURE- Stephane Glondu (1): Rebuild with Coq 8.2pl1 --- -- coq-float 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] r6422 - in /trunk/packages/ocaml-reins: tarballs/ trunk/README trunk/debian/
Author: glondu-guest Date: Sat Jul 4 12:43:30 2009 New Revision: 6422 URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1rev=6422 Log: Switch ocaml-reins packaging to Git Added: trunk/packages/ocaml-reins/trunk/README Removed: trunk/packages/ocaml-reins/tarballs/ trunk/packages/ocaml-reins/trunk/debian/ Added: trunk/packages/ocaml-reins/trunk/README URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-reins/trunk/README?rev=6422op=file == --- trunk/packages/ocaml-reins/trunk/README (added) +++ trunk/packages/ocaml-reins/trunk/README Sat Jul 4 12:43:30 2009 @@ -1,0 +1,3 @@ +This package has moved to: +http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git +git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git ___ 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-reins packaging branch, master, updated. debian/0.1a-1-4-g609414c
The following commit has been merged in the master branch: commit 609414c9fd5454bdaa4da6c5b787715054ed3b07 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 14:47:55 2009 +0200 Switch packaging to git diff --git a/debian/changelog b/debian/changelog index d7bfdab..7fd6361 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ ocaml-reins (0.1a-2) UNRELEASED; urgency=low * promote Homepage to a real debian/control field, now that dpkg supports it * fix vcs-svn field to point just above the debian/ dir + [ Stephane Glondu ] + * Switch packaging to git + -- Stefano Zacchiroli z...@debian.org Sat, 17 Nov 2007 17:34:10 +0100 ocaml-reins (0.1a-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b29876b..c757782 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: Mike Furr mf...@debian.org Build-Depends: debhelper (= 5), dpatch, ocaml-nox (= 3.10.0), omake, libounit-ocaml-dev, ocaml-findlib Standards-Version: 3.7.2 -Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-reins/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-reins/trunk/ +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git Homepage: http://ocaml-reins.sourceforge.net/ Package: libreins-ocaml-dev diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/svn-deblayout b/debian/svn-deblayout deleted file mode 100644 index 38da519..000 --- a/debian/svn-deblayout +++ /dev/null @@ -1 +0,0 @@ -tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-reins -- ocaml-reins 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-reins packaging branch, master, updated. debian/0.1a-1-5-gb22e562
The following commit has been merged in the master branch:
commit b22e5621ff359174a7ba3ce4877191d19f97efc0
Author: Stephane Glondu st...@glondu.net
Date: Sat Jul 4 14:50:12 2009 +0200
Switch patches to quilt, add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..a26fede
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+ocaml-reins Debian source package
+=
+
+Patching upstream sources
+-
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (= 0.4.2) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stephane Glondu st...@glondu.net, Sat, 04 Jul 2009 15:00:10 +0200
diff --git a/debian/control b/debian/control
index c757782..1ff3a1c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,13 @@ Source: ocaml-reins
Section: libdevel
Priority: optional
Maintainer: Mike Furr mf...@debian.org
-Build-Depends: debhelper (= 5), dpatch, ocaml-nox (= 3.10.0), omake,
libounit-ocaml-dev, ocaml-findlib
+Build-Depends:
+ debhelper (= 5),
+ quilt,
+ ocaml-nox (= 3.10.0),
+ omake,
+ libounit-ocaml-dev,
+ ocaml-findlib
Standards-Version: 3.7.2
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git
diff --git a/debian/patches/0001-Fix-PREFIX-handling.patch
b/debian/patches/0001-Fix-PREFIX-handling.patch
new file mode 100644
index 000..c55fa27
--- /dev/null
+++ b/debian/patches/0001-Fix-PREFIX-handling.patch
@@ -0,0 +1,27 @@
+From: Mike Furr mf...@debian.org
+Date: Sat, 4 Jul 2009 14:48:29 +0200
+Subject: [PATCH] Fix PREFIX handling
+
+---
+ config.omake |7 ++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/config.omake b/config.omake
+index 4417254..7a35fc2 100644
+--- a/config.omake
b/config.omake
+@@ -7,7 +7,12 @@ static. =
+ exit 1
+ OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE)
+ OCAMLDEP=$(OCAMLDEP_MODULES)
+- PREFIX=$(shell ocamlc -where)
++ if $(not $(defined PREFIX))
++PREFIX=$(shell ocamlc -where)
++export
++ if $(defined-env OCAMLFIND_DESTDIR)
++PREFIX = $(getenv OCAMLFIND_DESTDIR)
++export
+ VERSION=0.1a
+ ConfMsgChecking(oUnit)
+ OUNIT_DIR=$(shell ocamlfind query oUnit)
+--
diff --git a/debian/patches/0002-Install-cmi.patch
b/debian/patches/0002-Install-cmi.patch
new file mode 100644
index 000..7efb7f6
--- /dev/null
+++ b/debian/patches/0002-Install-cmi.patch
@@ -0,0 +1,20 @@
+From: Mike Furr mf...@debian.org
+Date: Sat, 4 Jul 2009 14:48:41 +0200
+Subject: [PATCH] Install cmi
+
+---
+ src/OMakefile |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/OMakefile b/src/OMakefile
+index 983799d..e85608c 100644
+--- a/src/OMakefile
b/src/OMakefile
+@@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx)
+
+ install: META $(REINS_LIB)
+ mkdir -p $(PREFIX)/reins
+- ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \
++ ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \
+ $(filter-exists $(addsuffix .mli, $(FILES)))
+--
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9e9dbfb..000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10_DESTDIR
-20_INSTALL_CMI
diff --git a/debian/patches/10_DESTDIR.dpatch b/debian/patches/10_DESTDIR.dpatch
deleted file mode 100755
index d40d667..000
--- a/debian/patches/10_DESTDIR.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_DESTDIR.dpatch by Mike Furr mf...@debian.org
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-...@dpatch@
-diff -urNad ocaml-reins-0.1a~/config.omake ocaml-reins-0.1a/config.omake
ocaml-reins-0.1a~/config.omake 2007-10-02 18:09:15.312445370 -0400
-+++ ocaml-reins-0.1a/config.omake 2007-10-02 18:09:24.105535886 -0400
-@@ -7,7 +7,12 @@
- exit 1
- OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE)
- OCAMLDEP=$(OCAMLDEP_MODULES)
-- PREFIX=$(shell ocamlc -where)
-+ if $(not $(defined PREFIX))
-+PREFIX=$(shell ocamlc -where)
-+export
-+ if $(defined-env OCAMLFIND_DESTDIR)
-+PREFIX = $(getenv OCAMLFIND_DESTDIR)
-+export
- VERSION=0.1a
- ConfMsgChecking(oUnit)
- OUNIT_DIR=$(shell ocamlfind query oUnit)
diff --git a/debian/patches/20_INSTALL_CMI.dpatch
b/debian/patches/20_INSTALL_CMI.dpatch
deleted file mode 100755
index be64f03..000
---
[Pkg-ocaml-maint-commits] [SCM] ocaml-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d
The following commit has been merged in the master branch: commit 79f6ec9741cfe161504675687b49765f8c2d29ad Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 15:06:25 2009 +0200 Switch Maintainer to d-o-m, add Mike and myself to Uploaders diff --git a/debian/control b/debian/control index 1ff3a1c..007ad69 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,11 @@ Source: ocaml-reins Section: libdevel Priority: optional -Maintainer: Mike Furr mf...@debian.org +Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org +Uploaders: + Mike Furr mf...@debian.org, + Stephane Glondu st...@glondu.net +DM-Upload-Allowed: yes Build-Depends: debhelper (= 5), quilt, -- ocaml-reins 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-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d
The following commit has been merged in the master branch:
commit 85c2fa00b231e5fcc0baa362ff3126405dd980c8
Author: Stephane Glondu st...@glondu.net
Date: Sat Jul 4 15:12:27 2009 +0200
Use dh and bump debhelper compatibility level to 7
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 007ad69..ae5335e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,13 @@ Uploaders:
Stephane Glondu st...@glondu.net
DM-Upload-Allowed: yes
Build-Depends:
- debhelper (= 5),
- quilt,
+ debhelper (= 7.0.52),
+ quilt (= 0.46-7),
ocaml-nox (= 3.10.0),
omake,
libounit-ocaml-dev,
- ocaml-findlib
+ ocaml-findlib,
+ dh-ocaml
Standards-Version: 3.7.2
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git
diff --git a/debian/rules b/debian/rules
index 5ccacba..dd59bd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,74 +1,29 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/ocaml/ocamlvars.mk
-PACKAGE=ocaml-reins
-include /usr/share/quilt/quilt.make
-OCAMLABI = $(shell ocamlc -version)
-OCAMLLIB = $(shell ocamlc -where)
-DEST = $(CURDIR)/debian/libreins-ocaml-dev/$(OCAMLLIB)
+DEST := $(CURDIR)/debian/libreins-ocaml-dev/$(OCAML_STDLIB_DIR)
-build: build-stamp
-
-build-stamp: patch
- dh_testdir
+%:
+ dh --with quilt $@
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
OCAMLFIND_DESTDIR=$(DEST) omake --config
-# omake doc
-
- touch $@
-
-clean: patch clean1 unpatch
-clean1:
- dh_testdir
- dh_testroot
- rm -f build-stamp
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
omake clean
rm -f .omake*
find . -iname \*.omc -exec rm -f \{\} \;
find . -iname \*.annot -exec rm -f \{\} \;
rm -f doc/html/api/*
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
OCAMLFIND_DESTDIR=$(DEST) omake install
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI=$(OCAMLABI)
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: override_dh_gencontrol
+override_dh_gencontrol:
+ dh_gencontrol -- -VF:OCamlABI=$(OCAML_ABI)
--
ocaml-reins 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-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d
The following commit has been merged in the master branch: commit 5bb4611226c0fab282c3886573e477674db2d64c Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 15:14:13 2009 +0200 Move to section ocaml diff --git a/debian/control b/debian/control index ae5335e..7b9c364 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: ocaml-reins -Section: libdevel +Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: -- ocaml-reins 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-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d
The following commit has been merged in the master branch: commit 385a9e380aac37f97fc6ff5536b557738e537c0e Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 15:14:35 2009 +0200 Update Standards-Version to 3.8.2 diff --git a/debian/control b/debian/control index 7b9c364..02fdc6f 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: libounit-ocaml-dev, ocaml-findlib, dh-ocaml -Standards-Version: 3.7.2 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git Homepage: http://ocaml-reins.sourceforge.net/ -- ocaml-reins 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-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d
The following commit has been merged in the master branch: commit 80e1e4d562efda67e4a5677ab9a5bf6df4f0f9c3 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 15:18:34 2009 +0200 Switch debian/copyright to new format diff --git a/debian/copyright b/debian/copyright index af31026..dea3ba6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,38 +1,33 @@ -This package was debianized by Mike Furr mf...@debian.org on -October 2, 2007. - -It was downloaded from http://ocaml-reins.sourceforge.net/ - -Upstream Author: - -Mike Furr f...@cs.umd.edu - -Copyright: - -(C) 2007 Mike Furr - -License: - -The OCaml Reins library is distributed under the terms of the Lesser -General Public License version 2.1 (provided in the file -/usr/share/common-licenses/LGPL-2.1) with the following linking -exception. - -As a special exception to the GNU Lesser General Public License, -you may link, statically or dynamically, a work that uses the -Library with a publicly distributed version of the Library to -produce an executable file containing portions of the Library, and -distribute that executable file under terms of your choice, -without any of the additional requirements listed in clause 6 of -the GNU Lesser General Public License. By a publicly distributed -version of the Library, we mean either the unmodified Library as -distributed by the official ocaml-reins website (currently -ocaml-reins.sourceforge.net), or a modified version of the Library -that is distributed under the conditions defined in clause 3 of -the GNU Lesser General Public License. This exception does not -however invalidate any other reasons why the executable file might -be covered by the GNU Lesser General Public License. - -The Debian packaging is (C) 2007, Mike Furr mf...@debian.org and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - +Packaged-By: Mike Furr mf...@debian.org +Packaged-Date: Tue, 02 Oct 2007 16:35:40 -0400 +Original-Source-Location: http://ocaml-reins.sourceforge.net/ +Upstream-Author: Mike Furr f...@cs.umd.edu + +Files: * +Copyright: © 2007 Mike Furr +License: LGPL-2.1 | other + + The OCaml Reins library is distributed under the terms of the Lesser + General Public License version 2.1 (provided in the file + /usr/share/common-licenses/LGPL-2.1) with the following linking + exception. + + As a special exception to the GNU Lesser General Public License, you + may link, statically or dynamically, a work that uses the Library + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Lesser General + Public License. By a publicly distributed version of the Library, + we mean either the unmodified Library as distributed by the official + ocaml-reins website (currently ocaml-reins.sourceforge.net), or a + modified version of the Library that is distributed under the + conditions defined in clause 3 of the GNU Lesser General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU Lesser + General Public License. + +Files: debian/* +Copyright: © 2007 Mike Furr mf...@debian.org + © 2009 Stéphane Glondu st...@glondu.net +License: GPL-2+ -- ocaml-reins 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-reins packaging branch, master, updated. debian/0.1a-1-11-gc47911d
The following commit has been merged in the master branch: commit c47911d73dda900cd9550d61206f33da9cc91e3f Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 15:21:09 2009 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index 7fd6361..0faa32b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,23 @@ ocaml-reins (0.1a-2) UNRELEASED; urgency=low - * NOT RELEASED YET - [ Stefano Zacchiroli ] * promote Homepage to a real debian/control field, now that dpkg supports it * fix vcs-svn field to point just above the debian/ dir [ Stephane Glondu ] * Switch packaging to git + * Switch patches to quilt, add README.source + * Use dh and bump debhelper compatibility level to 7 + * debian/control: +- set Maintainer to d-o-m, add Mike and myself to Uploaders +- move to section ocaml +- update Standards-Version to 3.8.2 + * Switch debian/copyright to new format - -- Stefano Zacchiroli z...@debian.org Sat, 17 Nov 2007 17:34:10 +0100 + -- Stephane Glondu st...@glondu.net Sat, 04 Jul 2009 15:22:21 +0200 ocaml-reins (0.1a-1) unstable; urgency=low * Initial release (Closes: #445039) -- Mike Furr mf...@debian.org Tue, 02 Oct 2007 16:35:40 -0400 - -- ocaml-reins 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] omake packaging branch, master, updated. debian/0.9.8.5-3-5-2-g29db9e5
The following commit has been merged in the master branch: commit f04a7ad2bfe72b9dee2fb82e4693e0d66f8fa3b8 Author: Stephane Glondu st...@glondu.net Date: Sat Jul 4 16:12:24 2009 +0200 Properly strip only on native architectures diff --git a/debian/changelog b/debian/changelog index 0e35989..a553e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omake (0.9.8.5-3-6) unstable; urgency=low + + * Properly strip only on native architectures + + -- Stephane Glondu st...@glondu.net Sat, 04 Jul 2009 16:11:04 +0200 + omake (0.9.8.5-3-5) unstable; urgency=low * Add DM-Upload-Allowed diff --git a/debian/rules b/debian/rules index 58f118b..9460f16 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ override_dh_compress: override_dh_strip: # omake is compiled with -custom -ifdef OCAML_OPT_ARCH +ifeq ($(OCAML_HAVE_OCAMLOPT),yes) dh_strip endif -- omake 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] omake packaging annotated tag, debian/0.9.8.5-3-6, created. debian/0.9.8.5-3-6
The annotated tag, debian/0.9.8.5-3-6 has been created at b0006d516490ef74e391418e96c190a7933e1f75 (tag) tagging 29db9e546b2fa68913489a76078798625339a864 (commit) replaces debian/0.9.8.5-3-5 tagged by Stephane Glondu on Sat Jul 4 16:20:32 2009 +0200 - Shortlog Debian release 0.9.8.5-3-6 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABEDAAYFAkpPZTAACgkQBg8odvzgPapk6wCcCP6ugserqO3c5VUKKYYOXYXw 7pAAnRxLOFY5bxv9o4yzw58pBk91DNbP =MMrj -END PGP SIGNATURE- Stephane Glondu (2): Properly strip only on native architectures Various updates --- -- omake 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] mldonkey packaging branch, master, updated. debian/3.0.0-2-8-g3f44d2f
The following commit has been merged in the master branch: commit 8c24bcbb5edf899507f87d818dee058a3a884fb7 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Mon Apr 20 14:25:47 2009 +0200 Remove useless file: /var/log/mldonkey/mldonkey-server.log diff --git a/debian/changelog b/debian/changelog index b427537..7f948eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ mldonkey (3.0.0-3) UNRELEASED; urgency=low + [ Samuel Mimram ] * Update Spanish debconf translation, closes: #524447. - -- Samuel Mimram smim...@debian.org Fri, 17 Apr 2009 10:51:04 +0200 + [ Mehdi Dogguy ] + * Remove useless file: /var/log/mldonkey/mldonkey-server.log. + + -- Mehdi Dogguy dog...@pps.jussieu.fr Mon, 20 Apr 2009 14:25:17 +0200 mldonkey (3.0.0-2) unstable; urgency=low diff --git a/debian/mldonkey-server.init b/debian/mldonkey-server.init index fc13862..1ae5544 100644 --- a/debian/mldonkey-server.init +++ b/debian/mldonkey-server.init @@ -128,7 +128,7 @@ case $1 in start-stop-daemon --start $WRAPPER_OPTIONS \ --pidfile $PIDFILE --background --exec $EXEC \ --- -log_file $SERVERLOG -pid $PIDDIR $LOGFILE 21 +-- -log_file $SERVERLOG -pid $PIDDIR 21 StartErrorCheck -- mldonkey 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] mldonkey packaging branch, master, updated. debian/3.0.0-2-8-g3f44d2f
The following commit has been merged in the master branch: commit 0ebc473098fc38b25f350e17c2af6c962aadcbd8 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 21:14:59 2009 +0200 Update build-dependencies to ease OCaml 3.11.1 transition. diff --git a/debian/changelog b/debian/changelog index 7f948eb..4821cfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mldonkey (3.0.0-3) UNRELEASED; urgency=low [ Mehdi Dogguy ] * Remove useless file: /var/log/mldonkey/mldonkey-server.log. + * Update build-dependencies to ease OCaml 3.11.1 transition. -- Mehdi Dogguy dog...@pps.jussieu.fr Mon, 20 Apr 2009 14:25:17 +0200 diff --git a/debian/control b/debian/control index e328c1e..d2140e1 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Uploaders: DM-Upload-Allowed: yes Homepage: http://mldonkey.sourceforge.net/ Build-Depends: autoconf, autotools-dev, - ocaml-nox (= 3.10.1), + ocaml-nox (= 3.11.1), ocaml-best-compilers | ocaml-nox, dh-ocaml (= 0.4.1), camlp4, @@ -23,7 +23,7 @@ Build-Depends: autoconf, autotools-dev, m4, dpatch, debconf, - liblablgtk2-ocaml-dev (= 2.10.0-3), + liblablgtk2-ocaml-dev (= 2.12.0-3), libgd2-noxpm-dev, liblablgtk2-gnome-ocaml-dev, libxml2-utils -- mldonkey 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] mldonkey packaging branch, master, updated. debian/3.0.0-2-8-g3f44d2f
The following commit has been merged in the master branch: commit af317bc09e0ecead89c825740da045c80cc22c87 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 21:18:21 2009 +0200 Add a patch ocaml_3.11.1 to let mldonkey build with OCaml 3.11.1 diff --git a/debian/changelog b/debian/changelog index 4821cfa..434724b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ mldonkey (3.0.0-3) UNRELEASED; urgency=low [ Mehdi Dogguy ] * Remove useless file: /var/log/mldonkey/mldonkey-server.log. * Update build-dependencies to ease OCaml 3.11.1 transition. + * Add a patch ocaml_3.11.1 to let mldonkey build with OCaml 3.11.1. -- Mehdi Dogguy dog...@pps.jussieu.fr Mon, 20 Apr 2009 14:25:17 +0200 diff --git a/debian/patches/00list b/debian/patches/00list index e3142cf..f112b77 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ 01_see +ocaml_3.11.1 diff --git a/debian/patches/ocaml_3.11.1.dpatch b/debian/patches/ocaml_3.11.1.dpatch new file mode 100755 index 000..ac937f4 --- /dev/null +++ b/debian/patches/ocaml_3.11.1.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ocaml_3.11.1.dpatch by Mehdi Dogguy dog...@pps.jussieu.fr +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad mldonkey~/config/configure mldonkey/config/configure +--- mldonkey~/config/configure 2009-07-04 21:12:20.0 +0200 mldonkey/config/configure 2009-07-04 21:17:10.0 +0200 +@@ -4580,7 +4580,7 @@ + else + OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` + case $OCAMLVERSION in +-$REQUIRED_OCAML*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;; ++$REQUIRED_OCAML*|3.11.1*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;; + *) + echo Need build + BUILD_OCAML=yes +diff -urNad mldonkey~/config/configure.in mldonkey/config/configure.in +--- mldonkey~/config/configure.in 2009-07-04 21:12:20.0 +0200 mldonkey/config/configure.in 2009-07-04 21:16:57.0 +0200 +@@ -486,7 +486,7 @@ + else + OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` + case $OCAMLVERSION in +-$REQUIRED_OCAML*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;; ++$REQUIRED_OCAML*|3.11.1*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;; + *) + echo Need build + BUILD_OCAML=yes -- mldonkey 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] mldonkey packaging annotated tag, debian/3.0.0-3, created. debian/3.0.0-3
The annotated tag, debian/3.0.0-3 has been created at 71e421fee0a65469bfcdf2f3999e59264bca0507 (tag) tagging 3f44d2fb0c8d30e52d603a5b73e00e501c6cc7d9 (commit) replaces debian/3.0.0-2 tagged by Mehdi Dogguy on Sat Jul 4 22:02:12 2009 +0200 - Shortlog Debian release 3.0.0-3 Mehdi Dogguy (7): Update gbp.conf Remove useless file: /var/log/mldonkey/mldonkey-server.log Update build-dependencies to ease OCaml 3.11.1 transition. Add a patch ocaml_3.11.1 to let mldonkey build with OCaml 3.11.1 wrap long lines in es.po Add a patch to remove bashism from script make_buginfo, Closes: #530141 Releasing to unstable Samuel Mimram (1): Update Spanish debconf translation. --- -- mldonkey 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-bitstring packaging annotated tag, debian/2.0.0-2, created. debian/2.0.0-2
The annotated tag, debian/2.0.0-2 has been created at acd52e97d7064ab12873ab6036141e93ca5687d6 (tag) tagging 6f982df00297ec5bba15861cf7373a844635d996 (commit) replaces debian/2.0.0-1 tagged by Sylvain Le Gall on Sat Jul 4 21:08:57 2009 + - Shortlog Debian release 2.0.0-2 Sylvain Le Gall (1): Fix camlp4of.opt detection in configure --- -- ocaml-bitstring 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-bitstring packaging branch, master, updated. debian/2.0.0-2
The following commit has been merged in the master branch:
commit 6f982df00297ec5bba15861cf7373a844635d996
Author: Sylvain Le Gall gil...@debian.org
Date: Sat Jul 4 21:05:17 2009 +
Fix camlp4of.opt detection in configure
diff --git a/debian/changelog b/debian/changelog
index 0a4f174..3d799c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-bitstring (2.0.0-2) unstable; urgency=low
+
+ * Fix camlp4of.opt detection in configure
+
+ -- Sylvain Le Gall gil...@debian.org Sat, 04 Jul 2009 21:03:45 +
+
ocaml-bitstring (2.0.0-1) unstable; urgency=low
* Add debian/gbp.conf to force using pristine-tar
diff --git a/debian/patches/no-camlp4of-opt.patch
b/debian/patches/no-camlp4of-opt.patch
new file mode 100644
index 000..377a008
--- /dev/null
+++ b/debian/patches/no-camlp4of-opt.patch
@@ -0,0 +1,20 @@
+Index: ocaml-bitstring/configure.ac
+===
+--- ocaml-bitstring.orig/configure.ac 2009-07-04 20:52:47.0 +
ocaml-bitstring/configure.ac 2009-07-04 20:56:45.0 +
+@@ -59,9 +59,13 @@
+ fi
+
+ dnl Check for camlp4
+-AC_CHECK_PROG(CAMLP4OF,camlp4of.opt,camlp4of.opt,no)
++AC_CHECK_PROG(CAMLP4OF,camlp4of,camlp4of,no)
++AC_CHECK_PROG(CAMLP4OFOPT,camlp4of.opt,camlp4of.opt,no)
++if ! test x$CAMLP4OFOPT = xno; then
++ CAMLP4OF=$CAMLP4OFOPT
++fi
+ if test x$CAMLP4OF = xno; then
+-AC_MSG_ERROR([You must have camlp4 installed])
++ AC_MSG_ERROR([You must have camlp4 installed])
+ fi
+
+ dnl Check for Extlib (optional)
diff --git a/debian/patches/series b/debian/patches/series
index 4e6aa30..ddc2975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
+no-camlp4of-opt.patch
add_dynlink.patch
01-byte-compilation.dpatch
+update-configure.patch
diff --git a/debian/patches/update-configure.patch
b/debian/patches/update-configure.patch
new file mode 100644
index 000..85f1a3a
--- /dev/null
+++ b/debian/patches/update-configure.patch
@@ -0,0 +1,83 @@
+Index: ocaml-bitstring/configure
+===
+--- ocaml-bitstring.orig/configure 2009-07-04 20:52:47.0 +
ocaml-bitstring/configure 2009-07-04 20:57:41.0 +
+@@ -643,6 +643,7 @@
+ TIME
+ pkg_cil
+ pkg_extlib
++CAMLP4OFOPT
+ CAMLP4OF
+ OCAMLFIND
+ OCAMLLIB
+@@ -4609,8 +4610,8 @@
+{ (exit 1); exit 1; }; }
+ fi
+
+-# Extract the first word of camlp4of.opt, so it can be a program name with
args.
+-set dummy camlp4of.opt; ac_word=$2
++# Extract the first word of camlp4of, so it can be a program name with args.
++set dummy camlp4of; ac_word=$2
+ { $as_echo $as_me:$LINENO: checking for $ac_word 5
+ $as_echo_n checking for $ac_word... 6; }
+ if test ${ac_cv_prog_CAMLP4OF+set} = set; then
+@@ -4626,7 +4627,7 @@
+ test -z $as_dir as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f $as_dir/$ac_word$ac_exec_ext $as_test_x
$as_dir/$ac_word$ac_exec_ext; }; then
+-ac_cv_prog_CAMLP4OF=camlp4of.opt
++ac_cv_prog_CAMLP4OF=camlp4of
+ $as_echo $as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext 5
+ break 2
+ fi
+@@ -4647,8 +4648,49 @@
+ fi
+
+
++# Extract the first word of camlp4of.opt, so it can be a program name with
args.
++set dummy camlp4of.opt; ac_word=$2
++{ $as_echo $as_me:$LINENO: checking for $ac_word 5
++$as_echo_n checking for $ac_word... 6; }
++if test ${ac_cv_prog_CAMLP4OFOPT+set} = set; then
++ $as_echo_n (cached) 6
++else
++ if test -n $CAMLP4OFOPT; then
++ ac_cv_prog_CAMLP4OFOPT=$CAMLP4OFOPT # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z $as_dir as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f $as_dir/$ac_word$ac_exec_ext $as_test_x
$as_dir/$ac_word$ac_exec_ext; }; then
++ac_cv_prog_CAMLP4OFOPT=camlp4of.opt
++$as_echo $as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext 5
++break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z $ac_cv_prog_CAMLP4OFOPT ac_cv_prog_CAMLP4OFOPT=no
++fi
++fi
++CAMLP4OFOPT=$ac_cv_prog_CAMLP4OFOPT
++if test -n $CAMLP4OFOPT; then
++ { $as_echo $as_me:$LINENO: result: $CAMLP4OFOPT 5
++$as_echo $CAMLP4OFOPT 6; }
++else
++ { $as_echo $as_me:$LINENO: result: no 5
++$as_echo no 6; }
++fi
++
++
++if ! test x$CAMLP4OFOPT = xno; then
++ CAMLP4OF=$CAMLP4OFOPT
++fi
+ if test x$CAMLP4OF = xno; then
+-{ { $as_echo $as_me:$LINENO: error: You must have camlp4 installed 5
++ { { $as_echo $as_me:$LINENO: error: You must have camlp4 installed 5
+ $as_echo $as_me: error: You must have camlp4 installed 2;}
+{ (exit 1); exit 1; }; }
+ fi
--
ocaml-bitstring 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-7-gbdd4088
The following commit has been merged in the master branch: commit 099ae10467374285f3d85c03ed331921acf6e76f Merge: bb5f702de884c7feb3e1540e6289134dab77d117 7f168fe0ebfb79f12b5b142f92680ebd36779ab1 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Wed Jun 24 13:07:24 2009 +0200 Merge commit 'upstream/1.1' -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-7-gbdd4088
The following commit has been merged in the master branch: commit e53276342fcb7b9eee391493a80dc2e490b27586 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 21:43:07 2009 +0200 Remove one part of the patch as it was included upstream diff --git a/debian/changelog b/debian/changelog index 486bdd3..1cf408b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocamlgraph (1.1-1) unstable; urgency=low + + * New Upstream Version + + -- Mehdi Dogguy dog...@pps.jussieu.fr Wed, 24 Jun 2009 13:07:24 +0200 + ocamlgraph (1.0-2) unstable; urgency=low * Modify 01_makefile.dpatch to: diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch index 259c121..2d32b3b 100755 --- a/debian/patches/01_makefile.dpatch +++ b/debian/patches/01_makefile.dpatch @@ -23,20 +23,6 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I . -@@ -157,11 +160,11 @@ - - $(VIEWER_DIR)/viewgraph.byte: $(CMA) $(VIEWER_CMO) - $(OCAMLC) -g -o $@ $(VIEWER_INCLUDES) \ -- lablgtk.cma lablgnomecanvas.cma $^ -+ lablgtk.cma gtkInit.cmo lablgnomecanvas.cma $^ - - $(VIEWER_DIR)/viewgraph.opt: $(CMXA) $(VIEWER_CMX) - $(OCAMLOPT) -o $@ $(VIEWER_INCLUDES) \ -- lablgtk.cmxa lablgnomecanvas.cmxa $^ -+ lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa $^ - - # Examples - ## @@ -240,44 +243,43 @@ DESTDIR = -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-7-gbdd4088
The following commit has been merged in the master branch: commit b2ca3b0030c70061bd30c5d5069146d3ec1aae25 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 22:20:11 2009 +0200 Update some build-deps versions diff --git a/debian/changelog b/debian/changelog index 1cf408b..f7ae4c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ocamlgraph (1.1-1) unstable; urgency=low * New Upstream Version + * Update some build-dependencies versions -- Mehdi Dogguy dog...@pps.jussieu.fr Wed, 24 Jun 2009 13:07:24 +0200 diff --git a/debian/control b/debian/control index 13a6562..5849932 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Build-Depends: dh-ocaml (= 0.4.1), debhelper (= 7), dpatch, - ocaml-nox (= 3.10.0-9), + ocaml-nox (= 3.11.1), ocamlweb, - ocaml-findlib (= 1.1.2pl1-4), + ocaml-findlib ( 1.2.4-2), liblablgtk2-ocaml-dev, liblablgtk2-gnome-ocaml-dev, docbook-xml (= 4.4), -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-7-gbdd4088
The following commit has been merged in the master branch: commit b79cbd447d20ebba8f8cd67f2b412942ec284d68 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 22:20:58 2009 +0200 Upgrade Standards-Version to 3.8.2, no changes needed. diff --git a/debian/changelog b/debian/changelog index f7ae4c4..8d3094d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ocamlgraph (1.1-1) unstable; urgency=low * New Upstream Version * Update some build-dependencies versions + * Upgrade Standards-Version to 3.8.2, no changes needed. -- Mehdi Dogguy dog...@pps.jussieu.fr Wed, 24 Jun 2009 13:07:24 +0200 diff --git a/debian/control b/debian/control index 5849932..86820ae 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: libxml2-utils, xsltproc, po4a -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Homepage: http://ocamlgraph.lri.fr/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlgraph.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlgraph.git -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-7-gbdd4088
The following commit has been merged in the master branch: commit bdd4088d1f1391675545dc35d85269fddc275fe7 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 21:52:51 2009 +0200 Update patch 01_makefile diff --git a/debian/changelog b/debian/changelog index 8d3094d..a1cc31d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ocamlgraph (1.1-1) unstable; urgency=low * New Upstream Version * Update some build-dependencies versions * Upgrade Standards-Version to 3.8.2, no changes needed. + * Update patch 01_makefile -- Mehdi Dogguy dog...@pps.jussieu.fr Wed, 24 Jun 2009 13:07:24 +0200 diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch index 2d32b3b..939b86a 100755 --- a/debian/patches/01_makefile.dpatch +++ b/debian/patches/01_makefile.dpatch @@ -1,20 +1,19 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 01_makefile.dpatch by Stefano Zacchiroli z...@debian.org +## 01_makefile.dpatch by Mehdi Dogguy dog...@pps.jussieu.fr ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: make ocamlfind install target choose the best @DPATCH@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in ocamlgraph~/Makefile.in2009-05-12 13:10:12.0 +0200 -+++ ocamlgraph/Makefile.in 2009-05-14 18:13:16.0 +0200 +--- ocamlgraph~/Makefile.in2009-07-04 23:02:52.0 +0200 ocamlgraph/Makefile.in 2009-07-04 23:03:29.0 +0200 @@ -143,10 +143,13 @@ viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST) --VIEWER_CMO=viewGraph viewGraph_select +ifeq (@LABLGNOMECANVAS@,yes) -+VIEWER_CMO=viewGraph viewGraph_select viewGraph_test + VIEWER_CMO=viewGraph viewGraph_select viewGraph_utils viewGraph_test VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO)) +endif VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx) @@ -23,7 +22,7 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I . -@@ -240,44 +243,43 @@ +@@ -240,42 +243,16 @@ DESTDIR = @@ -53,14 +52,10 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in - cp -f $(VIEWER_CMX) $(DESTDIR)$(OCAMLLIB) - cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/graph-viewer.opt -endif -+install: install-bin -+ cp -f graph.cmo graph.cmi $(CMA) $(VIEWER_CMO) $(VIEWER_CMI) $(DESTDIR)$(OCAMLLIB) -+ifeq ($(OCAMLBEST),opt) -+ cp -f graph$(LIBEXT) graph.cmx graph.o $(CMXA) $(VIEWER_CMX) $(VIEWER_OFILES) $(DESTDIR)$(OCAMLLIB) -+endif - +- -install-findlib: META ifdef OCAMLFIND +-ifeq (@LABLGNOMECANVAS@,yes) +install-findlib: META install-bin +ifeq ($(OCAMLBEST),opt) $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ @@ -68,14 +63,15 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in - $(VIEWER_CMX) $(VIEWER_CMO) + graph$(LIBEXT) graph.cmx graph.o graph.cmo graph.cmi $(CMA) $(CMXA) \ + $(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES) -+else -+ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ + else + $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ +- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) + graph.cmo graph.cmi $(CMA) \ + $(VIEWER_CMO) $(VIEWER_CMI) -+endif + endif endif - META: META.in Makefile +@@ -283,6 +260,20 @@ sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \ $...@.in $@ -- ocamlgraph 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] ocamlgraph packaging branch, pristine-tar, updated. becef2bd41e33eda1c1a512c7079b9647608eeaa
The following commit has been merged in the pristine-tar branch: commit becef2bd41e33eda1c1a512c7079b9647608eeaa Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Wed Jun 24 13:07:24 2009 +0200 pristine-tar data for ocamlgraph_1.1.orig.tar.gz diff --git a/ocamlgraph_1.1.orig.tar.gz.delta b/ocamlgraph_1.1.orig.tar.gz.delta new file mode 100644 index 000..479c94e Binary files /dev/null and b/ocamlgraph_1.1.orig.tar.gz.delta differ diff --git a/ocamlgraph_1.1.orig.tar.gz.id b/ocamlgraph_1.1.orig.tar.gz.id new file mode 100644 index 000..99bdfed --- /dev/null +++ b/ocamlgraph_1.1.orig.tar.gz.id @@ -0,0 +1 @@ +7f168fe0ebfb79f12b5b142f92680ebd36779ab1 -- ocamlgraph 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] ocamlgraph packaging annotated tag, upstream/1.1, created. upstream/1.1
The annotated tag, upstream/1.1 has been created at 16936d7c1851aaa53ee9d8b9ba11c251d5cbf63d (tag) tagging 7f168fe0ebfb79f12b5b142f92680ebd36779ab1 (commit) replaces upstream/1.0 tagged by Mehdi Dogguy on Wed Jun 24 13:07:24 2009 +0200 - Shortlog Upstream version 1.1 Mehdi Dogguy (1): Imported Upstream version 1.1 --- -- ocamlgraph 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] camlimages packaging branch, master, updated. debian/3.0.1-1-17-gac79155
The following commit has been merged in the master branch: commit ac791552c5cbbaca8e5d1b7089290a6b40466109 Author: Sylvain Le Gall gil...@debian.org Date: Sat Jul 4 21:36:01 2009 + Use a unique ID foreach document managed by doc-base diff --git a/debian/changelog b/debian/changelog index 0e13f55..3ca3368 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ camlimages (1:3.0.1-2) unstable; urgency=low + [ Mehdi Dogguy ] * Add myself to uploaders * Fix missing comma in control file, Closes: #535675. * Move library packages to ocaml section. @@ -10,6 +11,9 @@ camlimages (1:3.0.1-2) unstable; urgency=low * Move documentation from the -dev package to the -doc one. * Add a patch fix_integer_overflows to fix security issue (CVE-2009-2295) + [ Sylvain Le Gall ] + * Use a unique ID foreach document managed by doc-base + -- Mehdi Dogguy dog...@pps.jussieu.fr Thu, 02 Jul 2009 11:39:30 +0200 camlimages (1:3.0.1-1) unstable; urgency=low diff --git a/debian/libcamlimages-ocaml-doc.doc-base.doc b/debian/libcamlimages-ocaml-doc.doc-base.1 similarity index 100% rename from debian/libcamlimages-ocaml-doc.doc-base.doc rename to debian/libcamlimages-ocaml-doc.doc-base.1 diff --git a/debian/libcamlimages-ocaml-doc.doc-base.html b/debian/libcamlimages-ocaml-doc.doc-base.2 similarity index 88% rename from debian/libcamlimages-ocaml-doc.doc-base.html rename to debian/libcamlimages-ocaml-doc.doc-base.2 index 54853a6..bcb5c5a 100644 --- a/debian/libcamlimages-ocaml-doc.doc-base.html +++ b/debian/libcamlimages-ocaml-doc.doc-base.2 @@ -1,4 +1,4 @@ -Document: libcamlimages-ocaml-doc +Document: libcamlimages-ocaml-doc-api-ref Title: CamlImages OCamldoc API Reference Abstract: API reference manual for CamlImages (generated via OCamldoc) Author: Jun Furuse and Pierre Weis -- camlimages 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-8-g1ccb222
The following commit has been merged in the master branch: commit 1ccb222a819b92a107e507d49bf4331055ebbd50 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sat Jul 4 23:28:38 2009 +0200 Update list of files to backup diff --git a/debian/rules b/debian/rules index ae3e048..5737797 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,6 @@ clean:: -cp '$(CURDIR)/src/dot_parser.mli' '$(CURDIR)/src/dot_parser.mli.old' -cp '$(CURDIR)/src/version.ml' '$(CURDIR)/src/version.ml.old' -cp '$(CURDIR)/src/gml.ml' '$(CURDIR)/src/gml.ml.old' - -cp '$(CURDIR)/src/path.mlocamlwizard_tmp_file.annot' '$(CURDIR)/src/path.mlocamlwizard_tmp_file.annot.old' include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk @@ -74,7 +73,6 @@ clean:: -cp '$(CURDIR)/src/dot_parser.mli.old' '$(CURDIR)/src/dot_parser.mli' -cp '$(CURDIR)/src/version.ml.old' '$(CURDIR)/src/version.ml' -cp '$(CURDIR)/src/gml.ml.old' '$(CURDIR)/src/gml.ml' - -cp '$(CURDIR)/src/path.mlocamlwizard_tmp_file.annot.old' '$(CURDIR)/src/path.mlocamlwizard_tmp_file.annot' -$(RM) '$(CURDIR)/src/imperative.mli~.old' -$(RM) '$(CURDIR)/src/imperative.ml~.old' -$(RM) '$(CURDIR)/src/persistent.mli~.old' @@ -84,4 +82,3 @@ clean:: -$(RM) '$(CURDIR)/src/dot_parser.mli.old' -$(RM) '$(CURDIR)/src/version.ml.old' -$(RM) '$(CURDIR)/src/gml.ml.old' - -$(RM) '$(CURDIR)/src/path.mlocamlwizard_tmp_file.annot.old' -- ocamlgraph 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-bitstring packaging annotated tag, debian/2.0.0-3, created. debian/2.0.0-3
The annotated tag, debian/2.0.0-3 has been created at e7dfd669b7f0b7ea27a6c2ae2d14e2f1fde05b8e (tag) tagging 2a43517d614f42f334446d729c0f5a97a7931dad (commit) replaces debian/2.0.0-2 tagged by Sylvain Le Gall on Sat Jul 4 22:09:32 2009 + - Shortlog Debian release 2.0.0-3 Sylvain Le Gall (1): Fix only-bytecode former upload --- -- ocaml-bitstring 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-11-g435c98c
The following commit has been merged in the master branch: commit a3c1c3d9f8a98cead98ea4862728a0fe77a229a0 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sun Jul 5 00:34:04 2009 +0200 Fix typo in patch diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch index 3fade77..809ef53 100755 --- a/debian/patches/01_makefile.dpatch +++ b/debian/patches/01_makefile.dpatch @@ -34,14 +34,14 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in +ifdef OCAMLFIND +install-findlib: META install-bin +ifeq ($(OCAMLBEST),opt) -+ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli $(SRCDIR)/view_graph/*.mli view_graph/viewGraph_test.ml \ ++ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli view_graph/*.mli view_graph/viewGraph_test.ml \ + graph$(LIBEXT) graph.cmx graph.o graph.cmo graph.cmi $(CMA) $(CMXA) \ + $(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES) else - cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE) - cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE) -endif -+ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli $(SRCDIR)/view_graph/*.mli \ ++ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli view_graph/*.mli \ + graph.cmo graph.cmi $(CMA) view_graph/viewGraph_test.ml \ + $(VIEWER_CMO) $(VIEWER_CMI) endif -- ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.0-2-11-g435c98c
The following commit has been merged in the master branch: commit 435c98ca2f65ef0c3eec095447cbc8fbc376c632 Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sun Jul 5 00:43:02 2009 +0200 Include +lablgtk2 when generating documentation diff --git a/debian/rules b/debian/rules index 5737797..60af55c 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ DEB_MAKE_INSTALL_TARGET = install-findlib \ # TODO: reactive when doc/intro.txt will be back #OCAML_OCAMLDOC_PACKAGES_DOCBASE = $(DEV_PKG) OCAML_OCAMLDOC_PACKAGES = $(DEV_PKG) -OCAML_OCAMLDOC_FLAGS += -I $(CURDIR)/src +OCAML_OCAMLDOC_FLAGS += -I $(CURDIR)/src -I +lablgtk2 DEB_STRIP_EXCLUDE += usr/bin/ocamlgraph-editor.byte usr/bin/ocamlgraph-viewer.byte ifeq ($(OCAML_HAVE_OCAMLOPT),no) -- ocamlgraph 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] laby packaging branch, master, updated. debian/0.5.0-1-9-gb0792c3
The following commit has been merged in the master branch: commit b0792c3b0d3a8f3e0d5886b2b9517a60923897ba Author: Mehdi Dogguy dog...@pps.jussieu.fr Date: Sun Jul 5 00:00:19 2009 +0200 Update OCaml version in build-deps diff --git a/debian/changelog b/debian/changelog index f1323e2..a212ca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ laby (0.5.1-1) unstable; urgency=low * New Upstream Version * Update manpage: add --tile-size + * Update OCaml version in build-deps -- Mehdi Dogguy dog...@pps.jussieu.fr Fri, 05 Jun 2009 12:43:47 +0200 diff --git a/debian/control b/debian/control index 8d1c67e..8258a9d 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Mehdi Dogguy dog...@pps.jussieu.fr DM-Upload-Allowed: yes Build-Depends: debhelper (= 7), - ocaml-nox (= 3.11), + ocaml-nox (= 3.11.1), dh-ocaml, liblablgtk2-ocaml-dev, liblablgtksourceview-ocaml-dev -- laby 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] laby packaging annotated tag, debian/0.5.1-1, created. debian/0.5.1-1
The annotated tag, debian/0.5.1-1 has been created at 9f1530afb57ba1208b7a8d62442cf84aa95e0370 (tag) tagging b0792c3b0d3a8f3e0d5886b2b9517a60923897ba (commit) replaces debian/0.5.0-1 tagged by Mehdi Dogguy on Sun Jul 5 01:19:00 2009 +0200 - Shortlog Debian release 0.5.1-1 Mehdi Dogguy (9): Update manpage Remove trailing dot in description Imported Upstream version 0.5.1 Merge commit 'upstream/0.5.1' Update changelog Add Vcs-* fields Fix runtime dependency for non-native code Merge branch 'master' of git+ssh://git.debian.org//git/pkg-ocaml-maint/packages/laby Update OCaml version in build-deps --- -- laby 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
