[Pkg-ocaml-maint-commits] [ocaml-batteries] annotated tag upstream/2.3 created (now 52dc4f1)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag upstream/2.3 in repository ocaml-batteries. at 52dc4f1 (tag) tagging d852cbba051593ce1082c6976b353cdb041d0b05 (commit) replaces upstream/2.2 tagged by Stephane Glondu on Wed Jun 17 10:56:12 2015 +0200 - Log - Upstream version 2.3 Stephane Glondu (1): Imported Upstream version 2.3 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-batteries] 01/01: pristine-tar data for ocaml-batteries_2.3.orig.tar.gz
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch pristine-tar in repository ocaml-batteries. commit e2c70d46abb99f1d177ca6864892b35189f7a6a0 Author: Stephane Glondu Date: Wed Jun 17 10:56:12 2015 +0200 pristine-tar data for ocaml-batteries_2.3.orig.tar.gz --- ocaml-batteries_2.3.orig.tar.gz.delta | Bin 0 -> 10623 bytes ocaml-batteries_2.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ocaml-batteries_2.3.orig.tar.gz.delta b/ocaml-batteries_2.3.orig.tar.gz.delta new file mode 100644 index 000..2daa6f0 Binary files /dev/null and b/ocaml-batteries_2.3.orig.tar.gz.delta differ diff --git a/ocaml-batteries_2.3.orig.tar.gz.id b/ocaml-batteries_2.3.orig.tar.gz.id new file mode 100644 index 000..5526b47 --- /dev/null +++ b/ocaml-batteries_2.3.orig.tar.gz.id @@ -0,0 +1 @@ +ee5f29304deafe71ad21fe5a6ccf4ed31b87 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-batteries] 02/04: Merge tag 'upstream/2.3'
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-batteries.
commit 4dbdffc500205ffc19656f6eed3a44e618beab69
Merge: c4f52c5 d852cbb
Author: Stephane Glondu
Date: Wed Jun 17 10:56:13 2015 +0200
Merge tag 'upstream/2.3'
Upstream version 2.3
.gitignore | 2 +
ChangeLog | 59 +
Makefile| 45 +++-
README.md | 5 +-
_oasis | 2 +-
_tags | 2 +
build/prefilter.ml | 19 +-
howto/release.md| 2 +-
opam| 14 +
scripts/find_since.sh | 6 +
scripts/replace_since.sh| 15 ++
setup.ml| 6 +-
src/_tags | 3 +
src/{batArray.mli => batArray.mliv} | 52 ++--
src/{batArray.ml => batArray.mlv} | 14 +-
src/batAvlTree.ml | 59 +
src/batAvlTree.mli | 18 ++
src/batBase64.mli | 6 +-
src/batBigarray.mliv| 447 ++--
src/{batBigarray.ml => batBigarray.mlv} | 101 +---
src/batBitSet.ml| 38 ++-
src/batBool.ml | 8 +-
src/batBuffer.mli | 20 ++
src/{batBuffer.ml => batBuffer.mlv} | 4 +
src/batBytes.mliv | 399
src/batBytes.mlv| 13 +
src/batCharParser.ml| 2 +-
src/batDeque.ml | 20 ++
src/batDeque.mli| 16 +-
src/batDigest.mli | 13 +
src/{batDigest.ml => batDigest.mlv} | 8 +
src/batDynArray.ml | 104 +++-
src/batDynArray.mli | 201 +++---
src/batEnum.ml | 149 +--
src/batEnum.mli | 31 ++-
src/batFile.ml | 10 +-
src/batFile.mli | 8 +-
src/batFloat.mli| 46 ++--
src/batGc.mli | 12 +-
src/batGenlex.ml| 24 +-
src/batGenlex.mli | 4 +-
src/batHashtbl.mli | 26 +-
src/batHashtbl.mlv | 194 ++
src/batHeap.ml | 13 +
src/batIMap.ml | 2 +-
src/batIO.ml| 6 +-
src/batIO.mli | 24 +-
src/batISet.ml | 4 +-
src/batInnerIO.ml | 8 +-
src/batInnerIO.mli | 10 +-
src/batInnerPervasives.mlv | 8 +-
src/batInt.ml | 74 --
src/batInt.mli | 9 +
src/batLazyList.ml | 16 +-
src/batLazyList.mli | 30 +--
src/batList.mli | 63 -
src/{batList.ml => batList.mlv} | 147 ++-
src/batMap.mli | 56 ++--
src/batMarshal.mliv | 92 ---
src/{batMarshal.ml => batMarshal.mlv} | 4 +
src/batNumber.ml| 2 +-
src/batNumber.mli | 12 +-
src/batOptParse.mli | 8 +-
src/batOption.ml| 8 +-
src/batOption.mli | 2 +-
src/batParserCo.ml | 4 +-
src/batPervasives.ml| 22 +-
src/batPervasives.mliv | 26 +-
src/batPrintexc.mliv| 261 ---
src/{batPrintf.mli => batPrintf.mliv} | 126 -
src/{batPrintf.ml => batPrintf.mlv} | 14 +-
src/batQueue.ml | 104
src/batQueue.mli| 16 ++
src/batRef.mli | 2 +-
src/batRefList.mli | 14 +-
src/batSeq.mli | 8 +-
src/batSet.ml | 9 +-
src/batSet.mli | 52 ++--
src/batStream.mli | 13 +
src/{batStream.ml => batStream.mlv} | 44 ++--
src/batString.ml| 42 +++
src/batString.mli | 21 ++
src/batSubstring.ml | 261 ++-
src/batSubstring.mli| 12 +
src/batSys.mliv | 22 +-
src/batText.ml | 18 +-
src/batUnix.mliv| 55 +++-
src/{batUnix.ml => batUnix.mlv} | 7 +-
src/batVect.mli | 8 +-
src/batteries.ml
[Pkg-ocaml-maint-commits] [ocaml-batteries] branch pristine-tar updated (bbe67f3 -> e2c70d4)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch pristine-tar in repository ocaml-batteries. from bbe67f3 pristine-tar data for ocaml-batteries_2.2.orig.tar.gz new e2c70d4 pristine-tar data for ocaml-batteries_2.3.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: ocaml-batteries_2.3.orig.tar.gz.delta | Bin 0 -> 10623 bytes ocaml-batteries_2.3.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 ocaml-batteries_2.3.orig.tar.gz.delta create mode 100644 ocaml-batteries_2.3.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-batteries] 03/04: New upstream release
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-batteries. commit 8e52664cbb112d3fa5cb4c03677f0312118605d6 Author: Stephane Glondu Date: Wed Jun 17 10:56:18 2015 +0200 New upstream release --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7228bde..ab7c657 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-batteries (2.3-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Stéphane Glondu Wed, 17 Jun 2015 10:56:15 +0200 + ocaml-batteries (2.2-1) unstable; urgency=medium * Team upload -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-batteries] 04/04: Refresh patches
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-batteries. commit 1565992f39a6aa3c2b92adbcc635a12eba9fec7b Author: Stephane Glondu Date: Wed Jun 17 10:58:54 2015 +0200 Refresh patches --- debian/patches/0001-Do-not-enforce-sanity-check-rules.patch | 8 debian/patches/0002-Disable-qtest-based-tests.patch | 4 ++-- .../0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch index 23f88c1..2b2182d 100644 --- a/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch +++ b/debian/patches/0001-Do-not-enforce-sanity-check-rules.patch @@ -7,15 +7,15 @@ Subject: Do not enforce sanity-check rules 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 9d37afc..e88d9f9 100644 +index 8e93a30..e793723 100644 --- a/Makefile +++ b/Makefile -@@ -86,7 +86,7 @@ batteries.odocl: src/batteries.mllib src/batteriesThread.mllib +@@ -102,7 +102,7 @@ batteries.odocl: src/batteries.mllib src/batteriesThread.mllib cat $^ > $@ doc: prefilter batteries.odocl -- $(OCAMLBUILD) batteries.docdir/index.html -+ $(OCAMLBUILD) -no-hygiene batteries.docdir/index.html +- $(OCAMLBUILD) $(OCAMLBUILDFLAGS) batteries.docdir/index.html ++ $(OCAMLBUILD) -no-hygiene $(OCAMLBUILDFLAGS) batteries.docdir/index.html man: all batteries.odocl -mkdir man diff --git a/debian/patches/0002-Disable-qtest-based-tests.patch b/debian/patches/0002-Disable-qtest-based-tests.patch index cae5e8f..5556525 100644 --- a/debian/patches/0002-Disable-qtest-based-tests.patch +++ b/debian/patches/0002-Disable-qtest-based-tests.patch @@ -7,10 +7,10 @@ Subject: Disable qtest-based tests 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index e88d9f9..3f7fbff 100644 +index e793723..85f9780 100644 --- a/Makefile +++ b/Makefile -@@ -180,15 +180,13 @@ qtest: prefilter qtest-clean +@@ -203,15 +203,13 @@ qtest: prefilter qtest-clean ### run all unit tests ## diff --git a/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch b/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch index 67d4237..1447dd3 100644 --- a/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch +++ b/debian/patches/0003-Disable-test-compat-broken-with-OCaml-4.01.0.patch @@ -7,12 +7,12 @@ Subject: Disable test-compat (broken with OCaml 4.01.0) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 3f7fbff..d874bf8 100644 +index 85f9780..5de14ad 100644 --- a/Makefile +++ b/Makefile -@@ -193,7 +193,7 @@ full-test: $(TEST_TARGET) +@@ -216,7 +216,7 @@ full-test: $(TEST_TARGET) test-compat: prefilter src/batteries_compattest.ml - ocamlbuild src/batteries_compattest.byte -no-links + $(OCAMLBUILD) $(OCAMLBUILDFLAGS) src/batteries_compattest.byte -test: test-byte test-compat +test: test-byte -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-batteries] branch master updated (c4f52c5 -> 1565992)
This is an automated email from the git hooks/post-receive script.
glondu pushed a change to branch master
in repository ocaml-batteries.
from c4f52c5 Update changelog and prepare upload to unstable
new d852cbb Imported Upstream version 2.3
new 4dbdffc Merge tag 'upstream/2.3'
new 8e52664 New upstream release
new 1565992 Refresh patches
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
ChangeLog | 59 +++
Makefile | 45 ++-
README.md | 5 +-
_oasis | 2 +-
_tags | 2 +
build/prefilter.ml | 19 +-
debian/changelog | 6 +
.../0001-Do-not-enforce-sanity-check-rules.patch | 8 +-
.../patches/0002-Disable-qtest-based-tests.patch | 4 +-
...able-test-compat-broken-with-OCaml-4.01.0.patch | 6 +-
howto/release.md | 2 +-
opam | 14 +
scripts/find_since.sh | 6 +
scripts/replace_since.sh | 15 +
setup.ml | 6 +-
src/_tags | 3 +
src/{batArray.mli => batArray.mliv}| 52 ++-
src/{batArray.ml => batArray.mlv} | 14 +-
src/batAvlTree.ml | 59 +++
src/batAvlTree.mli | 18 +
src/batBase64.mli | 6 +-
src/batBigarray.mliv | 447 -
src/{batBigarray.ml => batBigarray.mlv}| 101 +++--
src/batBitSet.ml | 38 +-
src/batBool.ml | 8 +-
src/batBuffer.mli | 20 +
src/{batBuffer.ml => batBuffer.mlv}| 4 +
src/batBytes.mliv | 399 ++
src/batBytes.mlv | 13 +
src/batCharParser.ml | 2 +-
src/batDeque.ml| 20 +
src/batDeque.mli | 16 +-
src/batDigest.mli | 13 +
src/{batDigest.ml => batDigest.mlv}| 8 +
src/batDynArray.ml | 104 -
src/batDynArray.mli| 201 -
src/batEnum.ml | 149 ++-
src/batEnum.mli| 31 +-
src/batFile.ml | 10 +-
src/batFile.mli| 8 +-
src/batFloat.mli | 46 +--
src/batGc.mli | 12 +-
src/batGenlex.ml | 24 +-
src/batGenlex.mli | 4 +-
src/batHashtbl.mli | 26 +-
src/batHashtbl.mlv | 194 -
src/batHeap.ml | 13 +
src/batIMap.ml | 2 +-
src/batIO.ml | 6 +-
src/batIO.mli | 24 +-
src/batISet.ml | 4 +-
src/batInnerIO.ml | 8 +-
src/batInnerIO.mli | 10 +-
src/batInnerPervasives.mlv | 8 +-
src/batInt.ml | 74 ++--
src/batInt.mli | 9 +
src/batLazyList.ml | 16 +-
src/batLazyList.mli| 30 +-
src/batList.mli| 63 ++-
src/{batList.ml => batList.mlv}| 147 ++-
src/batMap.mli | 56 +--
src/batMarshal.mliv| 92 +++--
src/{batMarshal.ml => batMarshal.mlv} | 4 +
src/batNumber.ml | 2 +-
src/batNumber.mli | 12 +-
src/batOptParse.mli| 8 +-
src/batOption.ml | 8 +-
src/batOption.mli | 2 +-
src/batParserCo.ml | 4 +-
src/batPervasives.ml
[Pkg-ocaml-maint-commits] [ocaml-batteries] branch upstream updated (b8c25ac -> d852cbb)
This is an automated email from the git hooks/post-receive script.
glondu pushed a change to branch upstream
in repository ocaml-batteries.
from b8c25ac Imported Upstream version 2.2
new d852cbb Imported Upstream version 2.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
ChangeLog | 59 +
Makefile| 45 +++-
README.md | 5 +-
_oasis | 2 +-
_tags | 2 +
build/prefilter.ml | 19 +-
howto/release.md| 2 +-
opam| 14 +
scripts/find_since.sh | 6 +
scripts/replace_since.sh| 15 ++
setup.ml| 6 +-
src/_tags | 3 +
src/{batArray.mli => batArray.mliv} | 52 ++--
src/{batArray.ml => batArray.mlv} | 14 +-
src/batAvlTree.ml | 59 +
src/batAvlTree.mli | 18 ++
src/batBase64.mli | 6 +-
src/batBigarray.mliv| 447 ++--
src/{batBigarray.ml => batBigarray.mlv} | 101 +---
src/batBitSet.ml| 38 ++-
src/batBool.ml | 8 +-
src/batBuffer.mli | 20 ++
src/{batBuffer.ml => batBuffer.mlv} | 4 +
src/batBytes.mliv | 399
src/batBytes.mlv| 13 +
src/batCharParser.ml| 2 +-
src/batDeque.ml | 20 ++
src/batDeque.mli| 16 +-
src/batDigest.mli | 13 +
src/{batDigest.ml => batDigest.mlv} | 8 +
src/batDynArray.ml | 104 +++-
src/batDynArray.mli | 201 +++---
src/batEnum.ml | 149 +--
src/batEnum.mli | 31 ++-
src/batFile.ml | 10 +-
src/batFile.mli | 8 +-
src/batFloat.mli| 46 ++--
src/batGc.mli | 12 +-
src/batGenlex.ml| 24 +-
src/batGenlex.mli | 4 +-
src/batHashtbl.mli | 26 +-
src/batHashtbl.mlv | 194 ++
src/batHeap.ml | 13 +
src/batIMap.ml | 2 +-
src/batIO.ml| 6 +-
src/batIO.mli | 24 +-
src/batISet.ml | 4 +-
src/batInnerIO.ml | 8 +-
src/batInnerIO.mli | 10 +-
src/batInnerPervasives.mlv | 8 +-
src/batInt.ml | 74 --
src/batInt.mli | 9 +
src/batLazyList.ml | 16 +-
src/batLazyList.mli | 30 +--
src/batList.mli | 63 -
src/{batList.ml => batList.mlv} | 147 ++-
src/batMap.mli | 56 ++--
src/batMarshal.mliv | 92 ---
src/{batMarshal.ml => batMarshal.mlv} | 4 +
src/batNumber.ml| 2 +-
src/batNumber.mli | 12 +-
src/batOptParse.mli | 8 +-
src/batOption.ml| 8 +-
src/batOption.mli | 2 +-
src/batParserCo.ml | 4 +-
src/batPervasives.ml| 22 +-
src/batPervasives.mliv | 26 +-
src/batPrintexc.mliv| 261 ---
src/{batPrintf.mli => batPrintf.mliv} | 126 -
src/{batPrintf.ml => batPrintf.mlv} | 14 +-
src/batQueue.ml | 104
src/batQueue.mli| 16 ++
src/batRef.mli | 2 +-
src/batRefList.mli | 14 +-
src/batSeq.mli | 8 +-
src/batSet.ml | 9 +-
src/batSet.mli | 52 ++--
src/batStream.mli | 13 +
src/{batStream.ml => batStream.mlv} | 44 ++--
src/batString.ml| 42 +++
src/batString.mli | 21 ++
src/batSubstring.ml | 261 ++-
src/batSubstring.mli| 12 +
src/batSys.mliv | 22 +-
src/batText.ml | 18 +-
src/batUnix.mliv
[Pkg-ocaml-maint-commits] [obus] branch master updated (4cd075b -> 076d421)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository obus. from 4cd075b Prepare upload to unstable new 076d421 Add camlp4 to Build-Depends The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/control | 1 + 2 files changed, 7 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/obus.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [obus] 01/01: Add camlp4 to Build-Depends
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository obus. commit 076d421165833c1c8511313ee05c668e3ec435cc Author: Stephane Glondu Date: Wed Jun 17 11:24:57 2015 +0200 Add camlp4 to Build-Depends --- debian/changelog | 6 ++ debian/control | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index bc29d14..fb1d0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +obus (1.1.5-4) UNRELEASED; urgency=medium + + * Add camlp4 to Build-Depends + + -- Stéphane Glondu Wed, 17 Jun 2015 11:25:55 +0200 + obus (1.1.5-3) unstable; urgency=low * Upload to unstable (Closes: #713365) diff --git a/debian/control b/debian/control index f51b001..c7c2ba9 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: libtype-conv-camlp4-dev (>= 108), libxmlm-ocaml-dev, liblwt-ocaml-dev (>= 2.2.0~), + camlp4, ocaml-findlib (>= 1.4), ocaml-nox (>= 4) Standards-Version: 3.9.4 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/obus.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-usb] 01/01: Add camlp4 to Build-Depends
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-usb. commit fde7167be6d9082b0d9b2433267e63e845bb0704 Author: Stephane Glondu Date: Wed Jun 17 11:28:10 2015 +0200 Add camlp4 to Build-Depends --- debian/changelog | 6 ++ debian/control | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 93395dd..b8a848a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-usb (1.3.0-3) UNRELEASED; urgency=medium + + * Add camlp4 to Build-Depends + + -- Stéphane Glondu Wed, 17 Jun 2015 11:28:07 +0200 + ocaml-usb (1.3.0-2) unstable; urgency=low * Fix FTBFS on armel diff --git a/debian/control b/debian/control index e44891d..d515574 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 8), dh-ocaml (>= 0.9), ocaml-findlib, + camlp4, pkg-config, liblwt-ocaml-dev (>= 2.3.0), libusb-1.0-0-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-usb.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-usb] branch master updated (db12553 -> fde7167)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository ocaml-usb. from db12553 Fix FTBFS on armel new fde7167 Add camlp4 to Build-Depends The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/control | 1 + 2 files changed, 7 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-usb.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] branch pristine-tar updated (4c18dc8 -> 5b45d2c)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch pristine-tar in repository lablgtk2. from 4c18dc8 pristine-tar data for lablgtk2_2.16.0+dfsg.orig.tar.gz new 5b45d2c pristine-tar data for lablgtk2_2.18.3+dfsg.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: lablgtk2_2.18.3+dfsg.orig.tar.gz.delta | Bin 0 -> 11060 bytes lablgtk2_2.18.3+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 lablgtk2_2.18.3+dfsg.orig.tar.gz.delta create mode 100644 lablgtk2_2.18.3+dfsg.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 03/09: Imported Upstream version 2.18.2+dfsg
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository lablgtk2.
commit 7d76371c19e285c387eaac217c374b9e4ed6cf68
Author: Stephane Glondu
Date: Wed Jun 17 14:32:27 2015 +0200
Imported Upstream version 2.18.2+dfsg
---
.gitignore | 10 --
CHANGES | 22 +++
Makefile.pre | 4 +-
README | 4 +-
README.win32 | 1 +
config.make.mingw| 0
examples/seppala.ml | 19 +++
src/.depend | 24 ++--
src/Makefile | 27 ++--
src/absvalue/caml/callback.h | 59
src/absvalue/caml/mlvalues.h | 325 ---
src/build.ml.in | 13 +-
src/gData.ml | 21 ++-
src/gData.mli| 12 ++
src/gObj.ml | 6 +-
src/gObj.mli | 4 +-
src/gTree.mli| 2 +-
src/gtkBase.props| 8 +-
src/gtkData.ml | 21 ---
src/gtkSignal.ml4| 4 +-
src/gtkTree.props| 2 +-
src/ml_gtk.c | 6 +-
src/wrappers.h | 3 +-
23 files changed, 128 insertions(+), 469 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index dfee34b..000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-config.make
-config.cache
-config.status
-config.log
-configure.lineno
-aclocal.m4
-autom4te.cache
-test_dynlink.*
-*~
-*.sw[po]
diff --git a/CHANGES b/CHANGES
index edcd907..4715934 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,27 @@
LablGTK changes log
+In Lablgtk-2.18.2:
+
+2014.09.17 [Jacques]
+ * Revert old commit which broke notify signals
+ * Quote $(FLINSTALLDIR) in Makefile (cf PR#1342)
+ * Update applications/browser for 4.02
+
+2014.08.22 [Jacques]
+ * Make Float_val an alias for Double_val, since it was used
+wrongly anyway (Felix Ruess)
+ * Make GObj.misc_ops#add_accelerator polymorphic in the widget of
+the signal (Erkki Seppala)
+ * Use properties in GtkAdjustment, rather than direct accessors
+
+2013.12.31 [Jacques]
+ * fix GtkTree.IconView.get_path_at_pos (Thomas Leonard)
+
+In Lablgtk-2.18.1:
+
+2013.12.6 [Jacques]
+ * add gtksourceview2 to windows binaries
+
In Lablgtk-2.18.0:
2013.10.01 [Jacques]
diff --git a/Makefile.pre b/Makefile.pre
index 8d0bee2..c4093a2 100644
--- a/Makefile.pre
+++ b/Makefile.pre
@@ -6,6 +6,6 @@ all:
cp README $(ROOT)/Lablgtk.txt
cp README.win32 $(ROOT)/Lablgtk-install.txt
cp CHANGES $(ROOT)/Lablgtk-changes.txt
- mkdir -p $(SAMPLES)/{glade,rsvg,text,canvas}
- for i in . glade rsvg text canvas; do \
+ for i in . glade rsvg text canvas sourceview; do \
+ mkdir -p $(SAMPLES)/$$i; \
(cd examples/$$i; cp * $(SAMPLES)/$$i); done
diff --git a/README b/README
old mode 100644
new mode 100755
index bc6dbe7..1078304
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
- LablGTK2 2.18.0 : an interface to the GIMP Tool Kit
+ LablGTK2 2.18.2 : an interface to the GIMP Tool Kit
Needed:
-ocaml-3.11 or more (4.01 is preferred)
+ocaml-3.11 or more (4.02 is preferred)
gtk+-2.x (gtk+-2.16.x for full functionality)
findlib 1.2.1 or more (for default install)
GNU make (there is no standard for conditionals)
diff --git a/README.win32 b/README.win32
old mode 100644
new mode 100755
index 3d6649e..5dd7fa1
--- a/README.win32
+++ b/README.win32
@@ -22,6 +22,7 @@ Binary installation
libglade-2.6.4 (requires libxml2)
libgnomecanvas-2.30.1 (requires libart_lgpl)
librsvg-2.32.1 (requires libcroco and libgsf)
+gtksourceview-2.10
If you want to do custom linking, you need also the dev packages.
All of these are available in the above win32 and
win32/dependencies directories.
diff --git a/config.make.mingw b/config.make.mingw
old mode 100644
new mode 100755
diff --git a/examples/seppala.ml b/examples/seppala.ml
new file mode 100644
index 000..930bab1
--- /dev/null
+++ b/examples/seppala.ml
@@ -0,0 +1,19 @@
+open Gtk
+
+let destroy () = GMain.Main.quit ()
+
+let main () =
+ ignore (GMain.init ());
+ let main_window = GWindow.window () in
+ let accel_group = GtkData.AccelGroup.create () in
+ main_window#add_accel_group accel_group;
+ let quit_button = GButton.button ~label:"Quit" ~packing:main_window#add () in
+ quit_button#misc#add_accelerator
+ ~sgn:GtkButtonProps.Button.S.activate
+ ~group:accel_group
+ ~modi:[`CONTROL] GdkKeysyms._q;
+ ignore (quit_button#connect#clicked ~callback:destroy);
+ main_window#show ();
+ GMain.main ()
+
+let () = main ()
diff --git a/src/.depend b/src/.depend
index c775024..717dcf0 100644
--- a/src/.depend
+++ b/src/.depend
@@ -90,10 +90,8 @@ gtkAssistantProps.cmo : gtkSignal.cmi gtkObject.cmo
gtkEnums.cmo gtk.cmo \
gobject.cmi gdkPixbuf.cmi
gtkAssistantProps.cmx : gtkSignal.cm
[Pkg-ocaml-maint-commits] [lablgtk2] 07/09: Refresh patches
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit 513bac52426339745e08f5e57f8065c1f85529d0 Author: Stephane Glondu Date: Wed Jun 17 14:37:52 2015 +0200 Refresh patches Remove "Don't install *Props.* files." patch. With OCaml 4.02, these files are needed for e.g. mldonkey, coq. --- debian/patches/0001-Disable-svgz.patch | 4 +-- debian/patches/0002-Fix-install-path.patch | 25 -- .../patches/0003-Don-t-install-Props.-files.patch | 30 -- debian/patches/series | 2 -- 4 files changed, 2 insertions(+), 59 deletions(-) diff --git a/debian/patches/0001-Disable-svgz.patch b/debian/patches/0001-Disable-svgz.patch index b73ea45..bf314f3 100644 --- a/debian/patches/0001-Disable-svgz.patch +++ b/debian/patches/0001-Disable-svgz.patch @@ -10,10 +10,10 @@ automatically). So don't build a binding for this function. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.make.in b/config.make.in -index e689bda..d5487d7 100644 +index 14d3cdd..8d1dfff 100644 --- a/config.make.in +++ b/config.make.in -@@ -19,7 +19,7 @@ EXE=@EXE@ +@@ -22,7 +22,7 @@ EXE=@EXE@ USE_GL=@USE_GTKGL@ USE_GLADE=@USE_GLADE@ USE_RSVG=@USE_RSVG@ diff --git a/debian/patches/0002-Fix-install-path.patch b/debian/patches/0002-Fix-install-path.patch deleted file mode 100644 index 2ff6c55..000 --- a/debian/patches/0002-Fix-install-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Lifeng Sun -Date: Sun, 12 May 2013 08:30:34 +0800 -Subject: Fix install path. - - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index c498882..f4200dc 100755 a/src/Makefile -+++ b/src/Makefile -@@ -427,9 +427,9 @@ findlib-install: - then \ - echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ - fi` -- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) -+ $(RANLIB) $(CLIBS:%="$(OCAMLFIND_DESTDIR)"/lablgtk2/%) - @if test -f lablgtk.cmxa; \ --then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi -+then ($(RANLIB) $(MLLIBS:%.cma="$(OCAMLFIND_DESTDIR)"/lablgtk2/%$(XA)) $(EXTRA_MLLIBS:%.cma="$(OCAMLFIND_DESTDIR)"/lablgtk2/%$(XA)) ); fi - rm lablgtk2$(XB) - $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB) - cp lablgtk2$(XB) "$(BINDIR)" --- diff --git a/debian/patches/0003-Don-t-install-Props.-files.patch b/debian/patches/0003-Don-t-install-Props.-files.patch deleted file mode 100644 index 611fd29..000 --- a/debian/patches/0003-Don-t-install-Props.-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Lifeng Sun -Date: Thu, 25 Jul 2013 23:39:53 +0800 -Subject: Don't install *Props.* files. - - src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index f4200dc..48ad050 100755 a/src/Makefile -+++ b/src/Makefile -@@ -236,6 +236,7 @@ MLOBJS4 = gContainer.cmo gPack.cmo gButton.cmo gText.cmo \ - gUtil.cmo gToolbox.cmo - MLOBJS = $(MLOBJS1) $(ENUMOBJS) $(MLOBJS2) $(GTKPROPS:.props=Props.cmo) \ - $(MLOBJS3) $(GTKPROPS:%.props=o%Props.cmo) $(MLOBJS4) -+MLXOBJS = $(MLOBJS1) $(ENUMOBJS) $(MLOBJS2) $(MLOBJS3) $(MLOBJS4) - THOBJS = gtkThread.cmo - INITOBJS = gtkInit.cmo - ifdef USE_GTKQUARTZ -@@ -244,7 +245,7 @@ else - THINITOBJS = gtkThInit.cmo - endif - EXTRAOBJS = $(INITOBJS) $(THOBJS) $(THINITOBJS) --ALLOBJS = $(MLOBJS) $(GLMLOBJS) $(GNOMEMLOBJS) $(GLADEMLOBJS) \ -+ALLOBJS = $(MLXOBJS) $(GLMLOBJS) $(GNOMEMLOBJS) $(GLADEMLOBJS) \ - $(RSVGMLOBJS) $(GNOMECANVASMLOBJS) $(GNOMEUIMLOBJS) $(PANELMLOBJS) \ - $(GTKSPELLMLOBJS) $(GTKSOURCEVIEW2MLOBJS) \ - $(INITOBJS) --- diff --git a/debian/patches/series b/debian/patches/series index 43d771b..08b30ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ 0001-Disable-svgz.patch -0002-Fix-install-path.patch -0003-Don-t-install-Props.-files.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 01/01: pristine-tar data for lablgtk2_2.18.3+dfsg.orig.tar.gz
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch pristine-tar in repository lablgtk2. commit 5b45d2cfb2c289e2836df5c78205b60bf7594cf8 Author: Stephane Glondu Date: Wed Jun 17 15:43:54 2015 +0200 pristine-tar data for lablgtk2_2.18.3+dfsg.orig.tar.gz --- lablgtk2_2.18.3+dfsg.orig.tar.gz.delta | Bin 0 -> 11060 bytes lablgtk2_2.18.3+dfsg.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/lablgtk2_2.18.3+dfsg.orig.tar.gz.delta b/lablgtk2_2.18.3+dfsg.orig.tar.gz.delta new file mode 100644 index 000..031a7eb Binary files /dev/null and b/lablgtk2_2.18.3+dfsg.orig.tar.gz.delta differ diff --git a/lablgtk2_2.18.3+dfsg.orig.tar.gz.id b/lablgtk2_2.18.3+dfsg.orig.tar.gz.id new file mode 100644 index 000..580d638 --- /dev/null +++ b/lablgtk2_2.18.3+dfsg.orig.tar.gz.id @@ -0,0 +1 @@ +1bed505862d53d914033bb5a2a713ea2af63f609 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 01/09: Add filter directive to gbp.conf
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit d32a2edd7ee2a97d18508f2ea28be4123fbb5b57 Author: Stephane Glondu Date: Thu Feb 26 16:45:17 2015 +0100 Add filter directive to gbp.conf --- debian/gbp.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..2ef6dfd 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,3 @@ [DEFAULT] pristine-tar = True +filter = [ "applications" ] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] branch upstream updated (3ab5891 -> 7dfe769)
This is an automated email from the git hooks/post-receive script.
glondu pushed a change to branch upstream
in repository lablgtk2.
from 3ab5891 Imported Upstream version 2.16.0+dfsg
new 265a817 Imported Upstream version 2.18.0+dfsg
new 7d76371 Imported Upstream version 2.18.2+dfsg
new 7dfe769 Imported Upstream version 2.18.3+dfsg
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES | 67
META| 2 +-
Makefile| 4 +
Makefile.pre| 11 +
README | 20 +-
README.win32| 1 +
config.make.in | 5 +
configure | 279 --
configure.in| 19 +
examples/{calendar.ml => entry2.ml} | 29 +-
examples/seppala.ml | 19 +
src/.depend | 743
src/Makefile| 51 ++-
src/absvalue/caml/callback.h| 59 ---
src/absvalue/caml/mlvalues.h| 325
src/build.ml.in | 18 +-
src/gData.ml| 21 +-
src/gData.mli | 12 +
src/gEdit.ml| 7 +-
src/gEdit.mli | 44 +++
src/gFile.ml| 2 +-
src/gMenu.ml| 4 +-
src/gMisc.ml| 3 +-
src/gMisc.mli | 3 +-
src/gObj.ml | 6 +-
src/gObj.mli| 4 +-
src/gTree.mli | 20 +-
src/gWindow.mli | 4 +-
src/gdk.ml | 24 +-
src/gdk.mli | 5 +
src/gdkEvent.ml | 2 +-
src/gtk.ml | 8 +-
src/gtkBase.props | 10 +-
src/gtkData.ml | 21 -
src/gtkEdit.props | 30 ++
src/gtkMenu.props | 11 +-
src/gtkSignal.ml4 | 12 +-
src/gtkStock.ml | 34 +-
src/gtkTree.props | 10 +-
src/gtkWindow.ml| 2 +-
src/gtk_tags.var| 97 +++--
src/ml_gdk.c| 10 +-
src/ml_gdk.h| 8 +-
src/ml_glib.c | 3 +-
src/ml_gobject.c| 8 +-
src/ml_gtk.c| 17 +-
src/ml_gtkfile.c| 2 +-
src/ml_gtkmenu.c| 12 +-
src/ml_gtkstock.c | 2 +
src/ml_gtktext.c| 48 +--
src/ml_rsvg.c | 1 -
src/propcc.ml4 | 8 +-
src/wrappers.c | 6 +-
src/wrappers.h | 4 +-
54 files changed, 1122 insertions(+), 1055 deletions(-)
create mode 100644 Makefile.pre
copy examples/{calendar.ml => entry2.ml} (58%)
create mode 100644 examples/seppala.ml
delete mode 100644 src/absvalue/caml/callback.h
delete mode 100644 src/absvalue/caml/mlvalues.h
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] annotated tag upstream/2.18.3+dfsg created (now 5913d8e)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag upstream/2.18.3+dfsg in repository lablgtk2. at 5913d8e (tag) tagging 7dfe7690b59f4e382e13f820e9b8398ef52b3fec (commit) replaces upstream/2.18.2+dfsg tagged by Stephane Glondu on Wed Jun 17 14:32:47 2015 +0200 - Log - Upstream version 2.18.3+dfsg Stephane Glondu (1): Imported Upstream version 2.18.3+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] branch master updated (827dd65 -> a2a3286)
This is an automated email from the git hooks/post-receive script.
glondu pushed a change to branch master
in repository lablgtk2.
from 827dd65 Add headers to patches and refresh
new d32a2ed Add filter directive to gbp.conf
new 265a817 Imported Upstream version 2.18.0+dfsg
new 7d76371 Imported Upstream version 2.18.2+dfsg
new 7dfe769 Imported Upstream version 2.18.3+dfsg
new 85d9323 Merge tag 'upstream/2.18.3+dfsg'
new e7668bf New upstream release
new 513bac5 Refresh patches
new 8ea6c66 Update packaging
new a2a3286 Set filter-pristine-tar option to True
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES| 67 ++
META | 2 +-
Makefile | 4 +
Makefile.pre | 11 +
README | 20 +-
README.win32 | 1 +
config.make.in | 5 +
configure | 279 +---
configure.in | 19 +
debian/changelog | 6 +
debian/gbp.conf| 2 +
debian/liblablgtk2-ocaml-dev.install.in| 30 +
debian/patches/0001-Disable-svgz.patch | 4 +-
debian/patches/0002-Fix-install-path.patch | 25 -
.../patches/0003-Don-t-install-Props.-files.patch | 30 -
debian/patches/series | 2 -
debian/rules | 2 +-
examples/{calendar.ml => entry2.ml}| 29 +-
examples/seppala.ml| 19 +
src/.depend| 743 -
src/Makefile | 51 +-
src/absvalue/caml/callback.h | 59 --
src/absvalue/caml/mlvalues.h | 325 -
src/build.ml.in| 18 +-
src/gData.ml | 21 +-
src/gData.mli | 12 +
src/gEdit.ml | 7 +-
src/gEdit.mli | 44 ++
src/gFile.ml | 2 +-
src/gMenu.ml | 4 +-
src/gMisc.ml | 3 +-
src/gMisc.mli | 3 +-
src/gObj.ml| 6 +-
src/gObj.mli | 4 +-
src/gTree.mli | 20 +-
src/gWindow.mli| 4 +-
src/gdk.ml | 24 +-
src/gdk.mli| 5 +
src/gdkEvent.ml| 2 +-
src/gtk.ml | 8 +-
src/gtkBase.props | 10 +-
src/gtkData.ml | 21 -
src/gtkEdit.props | 30 +
src/gtkMenu.props | 11 +-
src/gtkSignal.ml4 | 12 +-
src/gtkStock.ml| 34 +-
src/gtkTree.props | 10 +-
src/gtkWindow.ml | 2 +-
src/gtk_tags.var | 97 ++-
src/ml_gdk.c | 10 +-
src/ml_gdk.h | 8 +-
src/ml_glib.c | 3 +-
src/ml_gobject.c | 8 +-
src/ml_gtk.c | 17 +-
src/ml_gtkfile.c | 2 +-
src/ml_gtkmenu.c | 12 +-
src/ml_gtkstock.c | 2 +
src/ml_gtktext.c | 48 +-
src/ml_rsvg.c | 1 -
src/propcc.ml4 | 8 +-
src/wrappers.c | 6 +-
src/wrappers.h | 4 +-
62 files changed, 1163 insertions(+), 1115 deletions(-)
create mode 100644 Makefile.pre
delete mode 100644 debian/patches/0002-Fix-install-path.patch
delete mode 100644 debian/patches/0003-Don-t-install-Props.-files.patch
copy examples/{calendar.ml => entry2.ml} (58%)
create mode
[Pkg-ocaml-maint-commits] [lablgtk2] annotated tag upstream/2.18.2+dfsg created (now d187f65)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag upstream/2.18.2+dfsg in repository lablgtk2. at d187f65 (tag) tagging 7d76371c19e285c387eaac217c374b9e4ed6cf68 (commit) replaces upstream/2.18.0+dfsg tagged by Stephane Glondu on Wed Jun 17 14:32:28 2015 +0200 - Log - Upstream version 2.18.2+dfsg Stephane Glondu (1): Imported Upstream version 2.18.2+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 05/09: Merge tag 'upstream/2.18.3+dfsg'
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit 85d93238eef6aeba76598e4681c96ea34ca965d5 Merge: d32a2ed 7dfe769 Author: Stephane Glondu Date: Wed Jun 17 14:32:48 2015 +0200 Merge tag 'upstream/2.18.3+dfsg' Upstream version 2.18.3+dfsg CHANGES | 67 META | 2 +- Makefile | 4 + Makefile.pre | 11 + README | 20 +- README.win32 | 1 + config.make.in | 5 + configure| 279 +--- configure.in | 19 ++ examples/entry2.ml | 19 ++ examples/seppala.ml | 19 ++ src/.depend | 743 --- src/Makefile | 51 ++- src/absvalue/caml/callback.h | 59 src/absvalue/caml/mlvalues.h | 325 --- src/build.ml.in | 18 +- src/gData.ml | 21 +- src/gData.mli| 12 + src/gEdit.ml | 7 +- src/gEdit.mli| 44 +++ src/gFile.ml | 2 +- src/gMenu.ml | 4 +- src/gMisc.ml | 3 +- src/gMisc.mli| 3 +- src/gObj.ml | 6 +- src/gObj.mli | 4 +- src/gTree.mli| 20 +- src/gWindow.mli | 4 +- src/gdk.ml | 24 +- src/gdk.mli | 5 + src/gdkEvent.ml | 2 +- src/gtk.ml | 8 +- src/gtkBase.props| 10 +- src/gtkData.ml | 21 -- src/gtkEdit.props| 30 ++ src/gtkMenu.props| 11 +- src/gtkSignal.ml4| 12 +- src/gtkStock.ml | 34 +- src/gtkTree.props| 10 +- src/gtkWindow.ml | 2 +- src/gtk_tags.var | 97 -- src/ml_gdk.c | 10 +- src/ml_gdk.h | 8 +- src/ml_glib.c| 3 +- src/ml_gobject.c | 8 +- src/ml_gtk.c | 17 +- src/ml_gtkfile.c | 2 +- src/ml_gtkmenu.c | 12 +- src/ml_gtkstock.c| 2 + src/ml_gtktext.c | 48 +-- src/ml_rsvg.c| 1 - src/propcc.ml4 | 8 +- src/wrappers.c | 6 +- src/wrappers.h | 4 +- 54 files changed, 1132 insertions(+), 1035 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 08/09: Update packaging
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit 8ea6c66fd5b6489ad67179f4f27c6cac11d22c38 Author: Stephane Glondu Date: Wed Jun 17 15:17:41 2015 +0200 Update packaging --- debian/liblablgtk2-ocaml-dev.install.in | 30 ++ debian/rules| 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/debian/liblablgtk2-ocaml-dev.install.in b/debian/liblablgtk2-ocaml-dev.install.in index 522b04a..26a1f78 100644 --- a/debian/liblablgtk2-ocaml-dev.install.in +++ b/debian/liblablgtk2-ocaml-dev.install.in @@ -91,6 +91,36 @@ usr/bin/lablgtk2 @OCamlStdlibDir@/lablgtk2/win32.h @OCamlStdlibDir@/lablgtk2/wrappers.h @OCamlStdlibDir@/lablgtk2/xml_lexer.* +@OCamlStdlibDir@/lablgtk2/gtkActionProps.* +@OCamlStdlibDir@/lablgtk2/gtkAssistantProps.* +@OCamlStdlibDir@/lablgtk2/gtkBaseProps.* +@OCamlStdlibDir@/lablgtk2/gtkBinProps.* +@OCamlStdlibDir@/lablgtk2/gtkBrokenProps.* +@OCamlStdlibDir@/lablgtk2/gtkButtonProps.* +@OCamlStdlibDir@/lablgtk2/gtkEditProps.* +@OCamlStdlibDir@/lablgtk2/gtkFileProps.* +@OCamlStdlibDir@/lablgtk2/gtkListProps.* +@OCamlStdlibDir@/lablgtk2/gtkMenuProps.* +@OCamlStdlibDir@/lablgtk2/gtkMiscProps.* +@OCamlStdlibDir@/lablgtk2/gtkPackProps.* +@OCamlStdlibDir@/lablgtk2/gtkRangeProps.* +@OCamlStdlibDir@/lablgtk2/gtkTextProps.* +@OCamlStdlibDir@/lablgtk2/gtkTreeProps.* +@OCamlStdlibDir@/lablgtk2/ogtkActionProps.* +@OCamlStdlibDir@/lablgtk2/ogtkAssistantProps.* +@OCamlStdlibDir@/lablgtk2/ogtkBaseProps.* +@OCamlStdlibDir@/lablgtk2/ogtkBinProps.* +@OCamlStdlibDir@/lablgtk2/ogtkBrokenProps.* +@OCamlStdlibDir@/lablgtk2/ogtkButtonProps.* +@OCamlStdlibDir@/lablgtk2/ogtkEditProps.* +@OCamlStdlibDir@/lablgtk2/ogtkFileProps.* +@OCamlStdlibDir@/lablgtk2/ogtkListProps.* +@OCamlStdlibDir@/lablgtk2/ogtkMenuProps.* +@OCamlStdlibDir@/lablgtk2/ogtkMiscProps.* +@OCamlStdlibDir@/lablgtk2/ogtkPackProps.* +@OCamlStdlibDir@/lablgtk2/ogtkRangeProps.* +@OCamlStdlibDir@/lablgtk2/ogtkTextProps.* +@OCamlStdlibDir@/lablgtk2/ogtkTreeProps.* OPT: @OCamlStdlibDir@/lablgtk2/lablglade.a OPT: @OCamlStdlibDir@/lablgtk2/lablglade.cmxa OPT: @OCamlStdlibDir@/lablgtk2/lablgtk.a diff --git a/debian/rules b/debian/rules index 404580a..1b53a85 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ include /usr/share/ocaml/ocamlvars.mk DESTDIR := $(CURDIR)/debian/tmp -export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_DESTDIR=$(OCAML_STDLIB_DIR) export OCAMLFIND_LDCONF=ignore %: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] annotated tag upstream/2.18.0+dfsg created (now e94614b)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag upstream/2.18.0+dfsg in repository lablgtk2. at e94614b (tag) tagging 265a8170748083e7623a1730779d0f8074d5be6b (commit) replaces upstream/2.16.0+dfsg tagged by Stephane Glondu on Wed Jun 17 14:32:11 2015 +0200 - Log - Upstream version 2.18.0+dfsg Stephane Glondu (1): Imported Upstream version 2.18.0+dfsg --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 09/09: Set filter-pristine-tar option to True
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit a2a32869ab5c52546d5d84bae7f40dd6b5c74e12 Author: Stephane Glondu Date: Wed Jun 17 15:37:56 2015 +0200 Set filter-pristine-tar option to True --- debian/gbp.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index 2ef6dfd..fa5333f 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,4 @@ [DEFAULT] pristine-tar = True +filter-pristine-tar = True filter = [ "applications" ] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 06/09: New upstream release
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit e7668bf8124fb679289bf56710ba49a6850f77b9 Author: Stephane Glondu Date: Wed Jun 17 14:33:07 2015 +0200 New upstream release --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1238331..3b024d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lablgtk2 (2.18.3+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Stéphane Glondu Wed, 17 Jun 2015 14:33:00 +0200 + lablgtk2 (2.16.0+dfsg-1) unstable; urgency=low * Upload to unstable -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [lablgtk2] 04/09: Imported Upstream version 2.18.3+dfsg
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository lablgtk2. commit 7dfe7690b59f4e382e13f820e9b8398ef52b3fec Author: Stephane Glondu Date: Wed Jun 17 14:32:46 2015 +0200 Imported Upstream version 2.18.3+dfsg --- .gitignore| 10 ++ CHANGES | 14 ++ README| 4 ++-- src/Makefile | 1 + src/gWindow.mli | 4 ++-- src/gdk.ml| 21 - src/gdk.mli | 5 + src/gdkEvent.ml | 2 +- src/gtkBase.props | 2 +- src/gtkWindow.ml | 2 +- src/ml_gdk.c | 10 ++ src/ml_gdk.h | 8 +++- src/ml_gobject.c | 8 src/ml_gtk.c | 11 ++- src/ml_gtkfile.c | 2 +- src/ml_gtkmenu.c | 12 ++-- src/ml_gtktext.c | 48 +--- src/ml_rsvg.c | 1 - src/wrappers.c| 6 -- src/wrappers.h| 1 + 20 files changed, 89 insertions(+), 83 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..dfee34b --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +config.make +config.cache +config.status +config.log +configure.lineno +aclocal.m4 +autom4te.cache +test_dynlink.* +*~ +*.sw[po] diff --git a/CHANGES b/CHANGES index 4715934..69dd00e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,19 @@ LablGTK changes log +In Lablgtk-2.18.3: + +2014.10.06 [Jacques] + * add Gdk.Window.create_foreign and set_transient_for functions (Tim Cuthbertson) + +2014.09.20 [Jacques] + * CAMLparam initializes with Val_unit rather than 0 since ocaml 4.02. +Fix a related problem in ml_gobject. +This caused random crashes with unison (Christopher Zimmermann, PR#1425) + + * Also factorize some code to use Val_option_* + * Replace XID by GdkNativeWindow where required. +You may need to insert calls to Gdk.Window.native_of_xid in some places. + In Lablgtk-2.18.2: 2014.09.17 [Jacques] diff --git a/README b/README index 1078304..7e67aa6 100755 --- a/README +++ b/README @@ -1,5 +1,5 @@ - LablGTK2 2.18.2 : an interface to the GIMP Tool Kit + LablGTK2 2.18.3 : an interface to the GIMP Tool Kit Needed: ocaml-3.11 or more (4.02 is preferred) @@ -312,7 +312,7 @@ GL extension: You can use lablgtk in combination with LablGL - * get and install lablGL 1.04 from + * get and install lablGL 1.05 from http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html * get and install gtkglarea-1.99.0.tar.gz from ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/ diff --git a/src/Makefile b/src/Makefile index c06dd3d..e4dbe7c 100755 --- a/src/Makefile +++ b/src/Makefile @@ -17,6 +17,7 @@ INSTALLDIR = $(LIBDIR)/lablgtk2 DLLDIR = $(LIBDIR)/stublibs include $(CONFIG) +#GTKCFLAGS += -Werror -Wno-error=deprecated-declarations TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \ $(THINITOBJS) build.ml diff --git a/src/gWindow.mli b/src/gWindow.mli index 4decee6..c826236 100644 --- a/src/gWindow.mli +++ b/src/gWindow.mli @@ -585,7 +585,7 @@ class plug : Gtk.plug obj -> (** @gtkdoc gtk GtkPlug *) val plug : - window:Gdk.xid -> + window:Gdk.native_window -> ?border_width:int -> ?width:int -> ?height:int -> ?show:bool -> unit -> plug @@ -607,7 +607,7 @@ class socket : Gtk.socket obj -> inherit GContainer.container val obj : Gtk.socket obj method connect : socket_signals -method steal : Gdk.xid -> unit +method steal : Gdk.native_window -> unit (** @deprecated "inherently unreliable" *) method xwindow : Gdk.xid end diff --git a/src/gdk.ml b/src/gdk.ml index cb5759b..d92fb94 100644 --- a/src/gdk.ml +++ b/src/gdk.ml @@ -43,6 +43,7 @@ type +'a event type drag_context = [`dragcontext] Gobject.obj type cursor type xid = int32 +type native_window type device type display @@ -295,8 +296,14 @@ module Drawable = struct = "ml_gdk_drawable_get_size" end +module Windowing = struct + external get : unit -> [`QUARTZ | `WIN32 | `X11] = "ml_gdk_get_platform" + let platform = get () +end + module Window = struct let cast w : window = Gobject.try_cast w "GdkWindow" + external create_foreign : native_window -> window = "ml_gdk_window_foreign_new" type background_pixmap = [ `NONE | `PARENT_RELATIVE | `PIXMAP of pixmap] external get_parent : window -> window = "ml_gdk_window_get_parent" external get_position : window -> int * int = "ml_gdk_window_get_position" @@ -323,6 +330,15 @@ module Window = struct (* for backward compatibility for lablgtk1 programs *) let get_visual = Drawable.get_visual + + let xid_of_native (w : native_window) : xid = +if Windowing.platform = `X11 then Obj.magic w else +failwith "Gdk.Window.xid_of_native only allowed for X11" + let native_of_xid (id : xid) : native_window = +if Windowing.platform = `X11 then Obj.magic id else +failwith "Gdk.Window.nat
[Pkg-ocaml-maint-commits] [ocaml-estring] 01/01: Add camlp4 to Build-Depends
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-estring. commit 9dfdedaa12f3490664f4b6c20dba8b45e5956a43 Author: Stephane Glondu Date: Thu Jun 18 07:26:07 2015 +0200 Add camlp4 to Build-Depends --- debian/changelog | 6 ++ debian/control | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7bfc6f2..0476955 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-estring (20130822-4) UNRELEASED; urgency=medium + + * Add camlp4 to Build-Depends + + -- Stéphane Glondu Thu, 18 Jun 2015 07:25:27 +0200 + ocaml-estring (20130822-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 2bca1be..6067f69 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: libfindlib-ocaml-dev, liboasis-ocaml-dev (>= 0.3), ocaml-findlib, + camlp4, ocaml-nox Standards-Version: 3.9.4 Homepage: https://forge.ocamlcore.org/projects/estring/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-estring.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [ocaml-estring] branch master updated (597721f -> 9dfdeda)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository ocaml-estring. from 597721f Release to unstable new 9dfdeda Add camlp4 to Build-Depends The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++ debian/control | 1 + 2 files changed, 7 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-estring.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [advi] 03/03: drop empty directory for lintian overrides
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository advi. commit 9594deabd4bcc9ed5a542caad9dc200472f15087 Author: Ralf Treinen Date: Thu Jun 18 07:42:17 2015 +0200 drop empty directory for lintian overrides --- debian/advi.dirs | 1 - debian/changelog | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/advi.dirs b/debian/advi.dirs index 193ae78..10b40d2 100644 --- a/debian/advi.dirs +++ b/debian/advi.dirs @@ -3,6 +3,5 @@ usr/bin usr/share/man/man1 usr/share/texmf/tex/latex/advi usr/share/hevea -usr/share/lintian/overrides usr/share/doc/advi/manual diff --git a/debian/changelog b/debian/changelog index 853bb88..73d7c36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ advi (1.10.2-3) UNRELEASED; urgency=low * Standards-Version 3.9.6 (no change) * advi-examples: drop Conflicts: advi (<< 1.6.0-4) since that version is more than 10 years old. + * advi: don't create empty directory usr/share/lintian/overrides/ -- Ralf Treinen Thu, 18 Jun 2015 07:40:18 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/advi.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [advi] 01/03: standards-version 3.9.6
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository advi. commit 9ebedde3b5739e98bd0f2e35fa7198dcb53b9b4d Author: Ralf Treinen Date: Thu Jun 18 07:30:20 2015 +0200 standards-version 3.9.6 --- debian/changelog | 5 +++-- debian/control | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f37b90e..049ca3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ advi (1.10.2-3) UNRELEASED; urgency=low - * advi-examples: drop Suggests tk4.8 et mpg321 + * advi-examples: drop spurious Suggests tk4.8 et mpg321 + * Standards-Version 3.9.6 (no change) - -- Ralf Treinen Wed, 10 Jun 2015 16:06:18 +0200 + -- Ralf Treinen Thu, 18 Jun 2015 07:29:28 +0200 advi (1.10.2-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 3c5cfbd..968b0e2 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~), tex-common, texlive-binaries, texlive-latex-base, texlive-pstricks, texlive-latex-recommended, texlive-pictures, hevea, x11proto-core-dev, libx11-dev, libxinerama-dev, zlib1g-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/advi.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/advi.git Homepage: http://advi.inria.fr/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/advi.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [advi] 02/03: advi-examples: drop conflict with very old advi
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository advi.
commit 089abd914e05c77e5f6c5cdae7c2e42aee592876
Author: Ralf Treinen
Date: Thu Jun 18 07:41:32 2015 +0200
advi-examples: drop conflict with very old advi
---
debian/changelog | 4 +++-
debian/control | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 049ca3d..853bb88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ advi (1.10.2-3) UNRELEASED; urgency=low
* advi-examples: drop spurious Suggests tk4.8 et mpg321
* Standards-Version 3.9.6 (no change)
+ * advi-examples: drop Conflicts: advi (<< 1.6.0-4) since that version is
+more than 10 years old.
- -- Ralf Treinen Thu, 18 Jun 2015 07:29:28 +0200
+ -- Ralf Treinen Thu, 18 Jun 2015 07:40:18 +0200
advi (1.10.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 968b0e2..fac28cf 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,6 @@ Description: active DVI previewer and presenter
Package: advi-examples
Architecture: all
Depends: ${misc:Depends}, texlive-latex-base, advi, imagemagick
-Conflicts: advi (<< 1.6.0-4)
Suggests: fonts-ipafont-gothic | fonts-japanese-gothic,
fonts-ipafont-mincho | fonts-japanese-mincho,
ocaml-base-nox, xterm
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/advi.git
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [advi] branch master updated (b276d3b -> 9594dea)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to branch master in repository advi. from b276d3b drop suggests tk4.8, mpeg321 new 9ebedde standards-version 3.9.6 new 089abd9 advi-examples: drop conflict with very old advi new 9594dea drop empty directory for lintian overrides The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/advi.dirs | 1 - debian/changelog | 8 ++-- debian/control | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/advi.git ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
