date:20150903

[Pkg-ocaml-maint-commits] [ocaml-deriving-ocsigen] 01/01: Drop versioned Build-Depends to camlp4-extra

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-deriving-ocsigen.

commit 2a21157558f1764a98122c6193083314676d81df
Author: Stephane Glondu 
Date:   Thu Jun 18 07:19:06 2015 +0200

Drop versioned Build-Depends to camlp4-extra
---
 debian/changelog | 6 ++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 433e5a8..f2a3cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-deriving-ocsigen (0.6.2-2) UNRELEASED; urgency=medium
+
+  * Drop versioned Build-Depends to camlp4-extra
+
+ -- Stéphane Glondu   Thu, 18 Jun 2015 07:18:55 +0200
+
 ocaml-deriving-ocsigen (0.6.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 3a18a12..e5dc6ac 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
   libtype-conv-camlp4-dev (>= 108),
   liboptcomp-camlp4-dev,
   oasis (>= 0.4),
-  camlp4-extra (>= 4.01)
+  camlp4-extra
 Standards-Version: 3.9.5
 Homepage: https://github.com/ocsigen/deriving
 Vcs-Git: 
git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.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] [cppo] branch master updated (4b36140 -> fa16d70)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository cppo.

  from  4b36140   Update changelog and prepare upload to unstable
   new  fa16d70   Fix compilation on bytecode architectures

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 | 7 +++
 debian/rules | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [oasis] 05/07: Add camlp4 to Build-Depends

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository oasis.

commit f8ed262616f755b5924ec204d4c6823365ee798c
Author: Stephane Glondu 
Date:   Thu Jun 18 07:06:25 2015 +0200

Add camlp4 to Build-Depends
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 90d1db6..b89d2fa 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
   ocaml-nox (>= 3.11.2),
   ocaml-best-compilers,
   ocaml-findlib (>= 1.3.1),
+  camlp4,
   ocamlify,
   ocamlmod (>= 0.0.7),
   libpcre-ocaml-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] 07/07: Update changelog and prepare upload to unstable

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository oasis.

commit 193f5c891e261d44ebea10f047316681317f656e
Author: Stephane Glondu 
Date:   Mon May 4 07:35:57 2015 -0300

Update changelog and prepare upload to unstable
---
 debian/changelog | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57cf7f2..a14adfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-oasis (0.4.5-1) UNRELEASED; urgency=low
-
-  [ Sylvain Le Gall ]
-  * Remove Sylvain Le Gall from Uploaders.
+oasis (0.4.5-1) unstable; urgency=low
 
   [ Stéphane Glondu ]
+  * Team upload
   * New upstream release
+  * Add camlp4 to Build-Depends
+  * Disable tests
+
+  [ Sylvain Le Gall ]
+  * Remove Sylvain Le Gall from Uploaders.
 
- -- Stéphane Glondu   Mon, 04 May 2015 07:33:08 -0300
+ -- Stéphane Glondu   Thu, 03 Sep 2015 23:44:13 +0200
 
 oasis (0.4.4-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] 06/07: Disable tests for now (until this is built with OCaml >= 4.02)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository oasis.

commit 950a2a0e8a9396fece35c9ab846052cc64480c98
Author: Stephane Glondu 
Date:   Thu Jun 18 07:11:47 2015 +0200

Disable tests for now (until this is built with OCaml >= 4.02)
---
 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 410a106..5a7824d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,8 @@ override_dh_auto_build:
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
-   ocaml setup.ml -test
+   # Tests disabled for now (until this is built with OCaml >= 4.02)
+   # ocaml setup.ml -test
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] branch pristine-tar updated (55a02b7 -> 1b81c12)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch pristine-tar
in repository oasis.

  from  55a02b7   pristine-tar data for oasis_0.4.4.orig.tar.gz
   new  1b81c12   pristine-tar data for oasis_0.4.5.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:
 oasis_0.4.5.orig.tar.gz.delta | Bin 0 -> 16731 bytes
 oasis_0.4.5.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 oasis_0.4.5.orig.tar.gz.delta
 create mode 100644 oasis_0.4.5.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] 01/01: pristine-tar data for oasis_0.4.5.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository oasis.

commit 1b81c121fe267c7119a44e15901ee8c15a045ea7
Author: Stephane Glondu 
Date:   Mon May 4 07:33:01 2015 -0300

pristine-tar data for oasis_0.4.5.orig.tar.gz
---
 oasis_0.4.5.orig.tar.gz.delta | Bin 0 -> 16731 bytes
 oasis_0.4.5.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/oasis_0.4.5.orig.tar.gz.delta b/oasis_0.4.5.orig.tar.gz.delta
new file mode 100644
index 000..2676539
Binary files /dev/null and b/oasis_0.4.5.orig.tar.gz.delta differ
diff --git a/oasis_0.4.5.orig.tar.gz.id b/oasis_0.4.5.orig.tar.gz.id
new file mode 100644
index 000..5fa76cf
--- /dev/null
+++ b/oasis_0.4.5.orig.tar.gz.id
@@ -0,0 +1 @@
+3239069137917c65c4f0e9c237fc089082087765

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] annotated tag debian/0.4.5-1 created (now 1f735b3)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag debian/0.4.5-1
in repository oasis.

at  1f735b3   (tag)
   tagging  193f5c891e261d44ebea10f047316681317f656e (commit)
  replaces  debian/0.4.4-2
 tagged by  Stephane Glondu
on  Thu Sep 3 23:51:38 2015 +0200

- Log -
oasis Debian release 0.4.5-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJV6MDqAAoJEHhT2k1JiBrTUScP/09XjveI1iPpJuV77ZLvvJBm
CFpkA/uz99CdPpksIhRa7KuVltGL8tshvBTJ7pbsk1xYCFmrl4cIUo8wCABV4Y5v
mNTxQfRYdEI6pG27t6zNkZOMqw/KKug3afcaTnehR7ur1qDRtCVUTDCD+oJn4g/P
ha6bp3B2DJLmiLhrSCTXvUzdiRuiHbbyuo7lZgsklEo7YqWMps4+wm13NhotCLrt
ACvIQ4Ldkyi/knVlW4XcDhw4sj5IUsd9094XkcLyQ09xEz/e6RhH1y4TmX/8x5rW
PEeg+ouvD6Eo4ighRzvp/6yrfWFrWujus1LgMyHTYX+YZvXCKTBXctL5BPNp6bVR
dli4xDh112FkSqkOo7G5plJUe0rJey8LP6FTuvadV5OnGW2MlIRTOqss00IrE4bv
t1gJhu+QnBKAl3E/5m1d3UOhe9NV8xSfZkofl7NK+CIgenJi7d6an8YVK5igXElc
HTW2IApuPxyEPE4aVxHxyv5ln9p+VDPNkgXkj/PPr/TgQyg2cHbuSXu/CrcZM4/M
kyhiEfGnIMFm6LJH9we6TKYjEkbuGxTYTizYKXGFbP5RYMtWMC03i81gcXBg8k+L
kCigr1uvPdUjAd5NSAMhyT3/e/CfWHRu2eLok+cj+4XynmqzbKSgAAKE09TPOkMp
Xdahem/Exx0fGLh4oJW0
=EWU3
-END PGP SIGNATURE-

Stephane Glondu (7):
  Imported Upstream version 0.4.5
  Merge tag 'upstream/0.4.5'
  New upstream release
  Refresh patch
  Add camlp4 to Build-Depends
  Disable tests for now (until this is built with OCaml >= 4.02)
  Update changelog and prepare upload to unstable

Sylvain Le Gall (1):
  Remove Sylvain Le Gall from Uploaders.

---

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/oasis.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] [oasis] annotated tag upstream/0.4.5 created (now aeb104f)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/0.4.5
in repository oasis.

at  aeb104f   (tag)
   tagging  f435036a4c27b85cd9dee09486292096b144e73a (commit)
  replaces  upstream/0.4.4
 tagged by  Stephane Glondu
on  Mon May 4 07:33:01 2015 -0300

- Log -
Upstream version 0.4.5

Stephane Glondu (1):
  Imported Upstream version 0.4.5

---

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/oasis.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] [oasis] branch master updated (16cba25 -> 193f5c8)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository oasis.

  from  16cba25   Remove Sylvain Le Gall from Uploaders.
   new  f435036   Imported Upstream version 0.4.5
   new  0a85330   Merge tag 'upstream/0.4.5'
   new  67bea81   New upstream release
   new  0ded971   Refresh patch
   new  f8ed262   Add camlp4 to Build-Depends
   new  950a2a0   Disable tests for now (until this is built with OCaml >= 
4.02)
   new  193f5c8   Update changelog and prepare upload to unstable

The 7 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.txt| 43 +-
 Makefile   |  3 +
 _oasis |  6 +-
 debian/changelog   | 11 ++-
 debian/control |  1 +
 .../0001-Remove-dynrun_for_release-test.patch  |  4 +-
 debian/rules   |  3 +-
 setup.ml   | 29 ---
 src/ext/plugin-loader/src/META |  4 +-
 .../plugin-loader/test/data/findlib/plugin1/META   |  4 +-
 .../plugin-loader/test/data/findlib/plugin2/META   |  4 +-
 .../plugin-loader/test/data/findlib/plugin3/META   |  4 +-
 .../test/data/findlib/pluginloaderLib/META |  4 +-
 src/ext/userconf/src/META  |  4 +-
 src/oasis/META | 12 +--
 src/oasis/OASISFeatures.ml |  7 ++
 src/oasis/OASISFileTemplate.ml | 15 ++--
 src/oasis/OASISFindlib.ml  | 14 +--
 src/oasis/OASISLibrary.ml  | 32 ---
 src/oasis/OASISString.ml   |  9 +-
 src/plugins/extra/devfiles/DevFilesPlugin.ml   |  2 +-
 src/plugins/internal/InternalInstallPlugin.ml  | 99 +-
 src/plugins/ocamlbuild/MyOCamlbuildBase.ml | 13 +--
 src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml  | 65 --
 src/plugins/ocamlbuild/OCamlbuildCommon.ml |  5 ++
 src/plugins/ocamlbuild/OCamlbuildPlugin.ml | 10 ++-
 test/TestFull.ml   | 47 +++---
 test/TestFullUtils.ml  |  6 ++
 test/TestOCamlbuild.ml | 77 +
 .../src => test/data/TestOCamlbuild/env-tags}/A.ml |  0
 test/data/TestOCamlbuild/env-tags/_oasis   | 13 +++
 .../data/TestOCamlbuild/env-tags}/myocamlbuild.ml  | 12 ++-
 .../data/TestOCamlbuild/external-c-rebuild}/A.ml   |  3 +-
 .../data/TestOCamlbuild/external-c-rebuild/B.ml|  4 +-
 test/data/TestOCamlbuild/external-c-rebuild/_oasis | 23 +
 .../TestOCamlbuild/external-c-rebuild/c_source.c   | 12 ++-
 .../TestOCamlbuild/external-c-rebuild/header.h | 10 +--
 37 files changed, 431 insertions(+), 183 deletions(-)
 copy {examples/with-subpackage/src => test/data/TestOCamlbuild/env-tags}/A.ml 
(100%)
 create mode 100644 test/data/TestOCamlbuild/env-tags/_oasis
 copy {examples/ocamlbuild => 
test/data/TestOCamlbuild/env-tags}/myocamlbuild.ml (87%)
 copy {examples/with-c/src => test/data/TestOCamlbuild/external-c-rebuild}/A.ml 
(96%)
 copy examples/interdepend-libraries/src/libe/E.ml => 
test/data/TestOCamlbuild/external-c-rebuild/B.ml (98%)
 create mode 100644 test/data/TestOCamlbuild/external-c-rebuild/_oasis
 copy examples/with-c/src/main_custom_stub.c => 
test/data/TestOCamlbuild/external-c-rebuild/c_source.c (89%)
 copy examples/with-c/src/main_custom_stub.c => 
test/data/TestOCamlbuild/external-c-rebuild/header.h (94%)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] 03/07: New upstream release

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository oasis.

commit 67bea816c2ff85b8b99aaf07ef66f6c2a7aca75f
Author: Stephane Glondu 
Date:   Mon May 4 07:33:10 2015 -0300

New upstream release
---
 debian/changelog | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64b9855..57cf7f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-oasis (0.4.4-3) UNRELEASED; urgency=low
+oasis (0.4.5-1) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from Uploaders.
 
- -- Sylvain Le Gall   Sat, 02 May 2015 15:12:15 +0200
+  [ Stéphane Glondu ]
+  * New upstream release
+
+ -- Stéphane Glondu   Mon, 04 May 2015 07:33:08 -0300
 
 oasis (0.4.4-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [oasis] 02/07: Merge tag 'upstream/0.4.5'

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository oasis.

commit 0a85330508c1ba9a69c21cbb90e428b64be65f45
Merge: 16cba25 f435036
Author: Stephane Glondu 
Date:   Mon May 4 07:33:01 2015 -0300

Merge tag 'upstream/0.4.5'

Upstream version 0.4.5

 CHANGES.txt| 43 +-
 Makefile   |  3 +
 _oasis |  6 +-
 setup.ml   | 29 ---
 src/ext/plugin-loader/src/META |  4 +-
 .../plugin-loader/test/data/findlib/plugin1/META   |  4 +-
 .../plugin-loader/test/data/findlib/plugin2/META   |  4 +-
 .../plugin-loader/test/data/findlib/plugin3/META   |  4 +-
 .../test/data/findlib/pluginloaderLib/META |  4 +-
 src/ext/userconf/src/META  |  4 +-
 src/oasis/META | 12 +--
 src/oasis/OASISFeatures.ml |  7 ++
 src/oasis/OASISFileTemplate.ml | 15 ++--
 src/oasis/OASISFindlib.ml  | 14 +--
 src/oasis/OASISLibrary.ml  | 32 ---
 src/oasis/OASISString.ml   |  9 +-
 src/plugins/extra/devfiles/DevFilesPlugin.ml   |  2 +-
 src/plugins/internal/InternalInstallPlugin.ml  | 99 +-
 src/plugins/ocamlbuild/MyOCamlbuildBase.ml | 13 +--
 src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml  | 65 --
 src/plugins/ocamlbuild/OCamlbuildCommon.ml |  5 ++
 src/plugins/ocamlbuild/OCamlbuildPlugin.ml | 10 ++-
 test/TestFull.ml   | 47 +++---
 test/TestFullUtils.ml  |  6 ++
 test/TestOCamlbuild.ml | 77 +
 test/data/TestOCamlbuild/env-tags/A.ml | 22 +
 test/data/TestOCamlbuild/env-tags/_oasis   | 13 +++
 test/data/TestOCamlbuild/env-tags/myocamlbuild.ml  | 36 
 test/data/TestOCamlbuild/external-c-rebuild/A.ml   | 24 ++
 test/data/TestOCamlbuild/external-c-rebuild/B.ml   | 25 ++
 test/data/TestOCamlbuild/external-c-rebuild/_oasis | 23 +
 .../TestOCamlbuild/external-c-rebuild/c_source.c   | 27 ++
 .../TestOCamlbuild/external-c-rebuild/header.h | 27 ++
 33 files changed, 556 insertions(+), 159 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.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] [cppo] annotated tag upstream/0.9.4 created (now 9cb9ce3)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/0.9.4
in repository cppo.

at  9cb9ce3   (tag)
   tagging  5b2862767f169a35dc295e5855099dfe68afe02b (commit)
  replaces  upstream/0.9.3
 tagged by  Stephane Glondu
on  Sun Aug 17 14:42:47 2014 +0200

- Log -
Upstream version 0.9.4

Stephane Glondu (1):
  Imported Upstream version 0.9.4

---

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/cppo.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] [cppo] 01/01: pristine-tar data for cppo_0.9.4.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository cppo.

commit 1b2a086d47498782503bccda77b31030429e80f1
Author: Stephane Glondu 
Date:   Sun Aug 17 14:42:47 2014 +0200

pristine-tar data for cppo_0.9.4.orig.tar.gz
---
 cppo_0.9.4.orig.tar.gz.delta | Bin 0 -> 1478 bytes
 cppo_0.9.4.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/cppo_0.9.4.orig.tar.gz.delta b/cppo_0.9.4.orig.tar.gz.delta
new file mode 100644
index 000..20f6def
Binary files /dev/null and b/cppo_0.9.4.orig.tar.gz.delta differ
diff --git a/cppo_0.9.4.orig.tar.gz.id b/cppo_0.9.4.orig.tar.gz.id
new file mode 100644
index 000..81d48ae
--- /dev/null
+++ b/cppo_0.9.4.orig.tar.gz.id
@@ -0,0 +1 @@
+5b0de6c78d208e016f4748261fda2c077ace338b

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 03/05: New upstream release

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit dddb74e45d6d45bdcbbfd84bf854f74156eec821
Author: Stephane Glondu 
Date:   Sun Aug 17 14:42:54 2014 +0200

New upstream release
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 24e7125..dcde2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cppo (0.9.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Stéphane Glondu   Sun, 17 Aug 2014 14:42:51 +0200
+
 cppo (0.9.3-3) unstable; urgency=low
 
   * Team upload

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 05/05: Update packaging

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 32ea48f68ce8b92ed95297a5d98637e0da51b09f
Author: Stephane Glondu 
Date:   Sun Aug 17 14:46:04 2014 +0200

Update packaging
---
 debian/cppo.docs | 2 +-
 debian/rules | 8 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/cppo.docs b/debian/cppo.docs
index e845566..b43bf86 100644
--- a/debian/cppo.docs
+++ b/debian/cppo.docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/rules b/debian/rules
index b3e6c7d..ee978b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,17 +9,21 @@ DESTDIR=$(CURDIR)/debian/cppo
 
 include /usr/share/ocaml/ocamlvars.mk
 
+export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_LDCONF=ignore
+
 %:
dh $@ --with ocaml
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-   $(MAKE) opt
+   $(MAKE) opt ocamlbuild
 else
-   $(MAKE) all
+   $(MAKE) all ocamlbuild
 endif 
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
+   mkdir -p $(OCAMLFIND_DESTDIR)
make install 'BINDIR=$(DESTDIR)/usr/bin'

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 01/05: Imported Upstream version 0.9.4

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 5b2862767f169a35dc295e5855099dfe68afe02b
Author: Stephane Glondu 
Date:   Sun Aug 17 14:42:47 2014 +0200

Imported Upstream version 0.9.4
---
 META  |   8 +
 Makefile  |  91 ---
 README| 374 
 README.md | 449 ++
 ocamlbuild_plugin/_tags   |   1 +
 ocamlbuild_plugin/ocamlbuild_cppo.ml  |  30 +++
 ocamlbuild_plugin/ocamlbuild_cppo.mli |   2 +
 opam  |  13 +
 8 files changed, 548 insertions(+), 420 deletions(-)

diff --git a/META b/META
new file mode 100644
index 000..4b2fa06
--- /dev/null
+++ b/META
@@ -0,0 +1,8 @@
+description = "Cppo ocamlbuild plugin"
+version = "dev"
+
+requires = "ocamlbuild"
+archive(byte) = "ocamlbuild_cppo.cma"
+archive(byte, plugin) = "ocamlbuild_cppo.cma"
+archive(native) = "ocamlbuild_cppo.cmxa"
+archive(native, plugin) = "ocamlbuild_cppo.cmxs"
diff --git a/Makefile b/Makefile
index 6aa477a..7f9177e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,10 @@
-VERSION = 0.9.3
+VERSION = 0.9.4
+
+ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
+EXE=.exe
+else
+EXE=
+endif
 
 ifndef OCAMLYACC
   OCAMLYACC = ocamlyacc
@@ -16,9 +22,31 @@ ifndef BINDIR
 endif
 export BINDIR
 
+
+
+BEST := opt
+NATDYNLINK ?= $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then \
+echo YES; \
+  else \
+echo NO; \
+  fi)
+
+OCAMLBUILD_IMPL := ocamlbuild_cppo.cma
+
+ifeq "${BEST}" "opt"
+OCAMLBUILD_IMPL += ocamlbuild_cppo.cmxa ocamlbuild_cppo.a
+ifeq "${NATDYNLINK}" "YES"
+OCAMLBUILD_IMPL += ocamlbuild_cppo.cmxs
+endif
+endif
+
+OCAMLBUILD_INSTALL = ocamlbuild_plugin/_build/ocamlbuild_cppo.cmi \
+ $(addprefix ocamlbuild_plugin/_build/,$(OCAMLBUILD_IMPL))
+
+
 .PHONY: default all opt install clean test
 
-default: opt
+default: opt ocamlbuild
 
 ML = cppo_version.ml cppo_types.ml \
  cppo_parser.mli cppo_parser.ml \
@@ -26,16 +54,27 @@ ML = cppo_version.ml cppo_types.ml \
  cppo_command.ml \
  cppo_eval.ml cppo_main.ml
 
+OCAMLBUILD_ML = ocamlbuild_cppo.ml
+
 all: $(ML)
-   ocamlc -o cppo -dtypes unix.cma $(ML)
+   ocamlc -o cppo$(EXE) -dtypes unix.cma $(ML)
 
 opt: $(ML)
-   ocamlopt -o cppo -dtypes unix.cmxa $(ML)
+   ocamlopt -o cppo$(EXE) -dtypes unix.cmxa $(ML)
 
-install:
+ocamlbuild:
+   cd ocamlbuild_plugin && ocamlbuild -use-ocamlfind $(OCAMLBUILD_IMPL)
+
+install: install-bin install-lib
+
+install-bin:
install -m 0755 cppo $(BINDIR) || \
install -m 0755 cppo.exe $(BINDIR)
 
+install-lib:
+   ocamlfind install -patch-version ${VERSION} "cppo_ocamlbuild" \
+   META $(OCAMLBUILD_INSTALL)
+
 cppo_version.ml: Makefile
echo 'let cppo_version = "$(VERSION)"' > cppo_version.ml
 
@@ -60,44 +99,4 @@ clean:
cppo \
cppo_parser.mli cppo_parser.ml cppo_lexer.ml cppo_version.ml
cd examples; $(MAKE) clean
-
-SUBDIRS = testdata examples
-SVNURL = svn+ssh://mjam...@svn.forge.ocamlcore.org/svnroot/cppo/trunk/cppo
-
-archive:
-   @echo "Making archive for version $(VERSION)"
-   @if [ -z "$$WWW" ]; then \
-   echo '*** Environment variable WWW is undefined ***' >&2; \
-   exit 1; \
-   fi
-   @if [ -n "$$(svn status -q)" ]; then \
-   echo "*** There are uncommitted changes, aborting. ***" >&2; \
-   exit 1; \
-   fi
-   $(MAKE) && ./cppo -help > $$WWW/cppo-help.txt
-   rm -rf /tmp/cppo /tmp/cppo-$(VERSION) && \
-   cd /tmp && \
-   svn co "$(SVNURL)" && \
-   for x in "." $(SUBDIRS); do \
-   rm -rf /tmp/cppo/$$x/.svn; \
-   done && \
-   cd /tmp && cp -r cppo cppo-$(VERSION) && \
-   tar czf cppo.tar.gz cppo && \
-   tar cjf cppo.tar.bz2 cppo && \
-   tar czf cppo-$(VERSION).tar.gz cppo-$(VERSION) && \
-   tar cjf cppo-$(VERSION).tar.bz2 cppo-$(VERSION)
-   mv /tmp/cppo.tar.gz /tmp/cppo.tar.bz2 ../releases
-   mv /tmp/cppo-$(VERSION).tar.gz /tmp/cppo-$(VERSION).tar.bz2 ../releases
-   cp ../releases/cppo.tar.gz $$WWW/
-   cp ../releases/cppo.tar.bz2 $$WWW/
-   cp ../releases/cppo-$(VERSION).tar.gz $$WWW/
-   cp ../releases/cppo-$(VERSION).tar.bz2 $$WWW/
-   cd ../releases && \
-   svn add cppo.tar.gz cppo.tar.bz2 \
-   cppo-$(VERSION).tar.gz cppo-$(VERSION).tar.bz2 && \
-   svn commit -m "cppo version $(VERSION)"
-   cp README $$WWW/cppo-manual-$(VERSION).txt
-   cp LICENSE $$WWW/cppo-license.txt
-   cp Changes

[Pkg-ocaml-maint-commits] [cppo] 02/05: Merge tag 'upstream/0.9.4'

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit c884f82b38cd8f5c0c0b8d9c0f0989eee22f2759
Merge: 7e3a677 5b28627
Author: Stephane Glondu 
Date:   Sun Aug 17 14:42:48 2014 +0200

Merge tag 'upstream/0.9.4'

Upstream version 0.9.4

 META  |   8 +
 Makefile  |  91 ---
 README| 374 
 README.md | 449 ++
 ocamlbuild_plugin/_tags   |   1 +
 ocamlbuild_plugin/ocamlbuild_cppo.ml  |  30 +++
 ocamlbuild_plugin/ocamlbuild_cppo.mli |   2 +
 opam  |  13 +
 8 files changed, 548 insertions(+), 420 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] branch master updated (7e3a677 -> 32ea48f)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository cppo.

  from  7e3a677   Prepare upload to unstable
   new  5b28627   Imported Upstream version 0.9.4
   new  c884f82   Merge tag 'upstream/0.9.4'
   new  dddb74e   New upstream release
   new  4130867   Bump Standards-Version to 3.9.5
   new  32ea48f   Update packaging

The 5 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:
 META  |   8 +
 Makefile  |  91 ---
 README| 374 
 README.md | 449 ++
 debian/changelog  |   7 +
 debian/control|   2 +-
 debian/cppo.docs  |   2 +-
 debian/rules  |   8 +-
 ocamlbuild_plugin/_tags   |   1 +
 ocamlbuild_plugin/ocamlbuild_cppo.ml  |  30 +++
 ocamlbuild_plugin/ocamlbuild_cppo.mli |   2 +
 opam  |  13 +
 12 files changed, 563 insertions(+), 424 deletions(-)
 create mode 100644 META
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 ocamlbuild_plugin/_tags
 create mode 100644 ocamlbuild_plugin/ocamlbuild_cppo.ml
 create mode 100644 ocamlbuild_plugin/ocamlbuild_cppo.mli
 create mode 100644 opam

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] branch upstream updated (d56eaeb -> 5b28627)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch upstream
in repository cppo.

  from  d56eaeb   Imported Upstream version 0.9.3
   new  5b28627   Imported Upstream version 0.9.4

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:
 META  |   8 +
 Makefile  |  91 ---
 README| 374 
 README.md | 449 ++
 ocamlbuild_plugin/_tags   |   1 +
 ocamlbuild_plugin/ocamlbuild_cppo.ml  |  30 +++
 ocamlbuild_plugin/ocamlbuild_cppo.mli |   2 +
 opam  |  13 +
 8 files changed, 548 insertions(+), 420 deletions(-)
 create mode 100644 META
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 ocamlbuild_plugin/_tags
 create mode 100644 ocamlbuild_plugin/ocamlbuild_cppo.ml
 create mode 100644 ocamlbuild_plugin/ocamlbuild_cppo.mli
 create mode 100644 opam

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] branch pristine-tar updated (04c6791 -> 1b2a086)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch pristine-tar
in repository cppo.

  from  04c6791   pristine-tar data for cppo_0.9.3.orig.tar.gz
   new  1b2a086   pristine-tar data for cppo_0.9.4.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:
 cppo_0.9.4.orig.tar.gz.delta | Bin 0 -> 1478 bytes
 cppo_0.9.4.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 cppo_0.9.4.orig.tar.gz.delta
 create mode 100644 cppo_0.9.4.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 04/05: Bump Standards-Version to 3.9.5

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 41308678fb72bf33dbef447a9fd7f2ed449d654f
Author: Stephane Glondu 
Date:   Sun Aug 17 14:43:22 2014 +0200

Bump Standards-Version to 3.9.5
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dcde2d2..98c558c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cppo (0.9.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Bump Standards-Version to 3.9.5
 
  -- Stéphane Glondu   Sun, 17 Aug 2014 14:42:51 +0200
 
diff --git a/debian/control b/debian/control
index dc2c6f3..a92b37a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
   ocaml-findlib (>= 1.4),
   dh-ocaml (>= 0.9~),
   debhelper (>= 9)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://mjambon.com/cppo.html
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/cppo.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/cppo.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] annotated tag debian/1.1.2-1 created (now 6a771a8)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag debian/1.1.2-1
in repository cppo.

at  6a771a8   (tag)
   tagging  4b361402b7c7007ac1af7bdad466beff89cf2922 (commit)
  replaces  upstream/1.1.2
 tagged by  Stephane Glondu
on  Thu Sep 3 14:38:48 2015 +0200

- Log -
cppo Debian release 1.1.2-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJV6D9YAAoJEHhT2k1JiBrTtKEP/R4kfhVRrBcfA3UY65pTdxLN
ggw6hgWB5DdKGqNODnsGDQtJ8DVWZSPHz3K5G6RMBAtYak3ei4Ig9JC6auYVM0/g
HEH1MJj3wLrCWw2mEgQybOJVyy/4Itv431kzQnujH2JWNN4GKc91Z80ufcDApeqJ
cnm7nv7pKNMlUr0hhQDFtA6AZ+3LHGER3USqn0akGRJFsUwjoHV2Ve96juBtVMLO
5zr6ky2Lxv1hG3dIrk2KAf3QsL+1g20qUae1DmpwVcx9MFS+fD7hrROvMc3paSVI
r/RL+4Y05b0owCBMB3ziHdaqjeFgOavhLbeZoHRn0kh7QdF+CSHBCaJV9WDo2Doa
1ycdPlV3KturhBPRwYqTfbczEFGjohkE6QY2BJoenW/tzu6lkzTp9QkkZ3DeRcMp
jekrMTBNZjeGTfbo/N03WOeeldvxlWpUDG/sN4V4lYHaqJjPeo2N6H9J5OcerOgg
lpJFVsw4tup2U/MYjkENLfdn9xcize8Wl6UxkvvSwEC8QWUVr8Ycv8Ul0pvnSJvd
OFv5ni+QO/f1WLaZqXLB8rhmHMeI32/PoOOcTElnx3ZV11NAJjsviC6nsWVsGWZG
hggCsszgPL8Qh97XXJINF2IF9JeORHGtuCnDFX/P7+qVGU/qJc9n21cKPR7/p0xJ
brQEkDCV9HyEuaTLiVPv
=18On
-END PGP SIGNATURE-

Hendrik Tews (3):
  update watch file
  Merge tag 'upstream/0.9.3'
  various packaging changes

Stephane Glondu (22):
  Rebuild with OCaml 3.12.0 (no changes)
  Merge commit 'upstream/0.9.1'
  New upstream release
  More cleaning
  Bump Standards-Version to 3.9.2 (no changes)
  Bump debhelper compat level to 8
  Delete trailing whitespaces from files in debian/
  Merge commit 'upstream/0.9.2'
  New upstream release
  Update copyright dates
  Prepare upload to unstable
  Compile with OCaml >= 4
  Update changelog and prepare upload to experimental
  Prepare upload to unstable
  Merge tag 'upstream/0.9.4'
  New upstream release
  Bump Standards-Version to 3.9.5
  Update packaging
  Merge tag 'upstream/1.1.2'
  New upstream release
  Bump Standards-Version to 3.9.6
  Update changelog and prepare upload to unstable

Sylvain Le Gall (2):
  Initial packaging
  Remove Sylvain Le Gall from uploaders

---

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/cppo.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] [cppo] annotated tag upstream/1.0.1 created (now 01faac7)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/1.0.1
in repository cppo.

at  01faac7   (tag)
   tagging  d41800aa6ca1a3d35823b70c7b543c4cb7821e74 (commit)
  replaces  upstream/1.0.0
 tagged by  Stephane Glondu
on  Thu Sep 3 14:21:45 2015 +0200

- Log -
Upstream version 1.0.1

Stephane Glondu (1):
  Imported Upstream version 1.0.1

---

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/cppo.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] [cppo] 01/09: Imported Upstream version 1.0.0

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 887514d836b223f6d7086c7c17ffb7fcb2210223
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:29 2015 +0200

Imported Upstream version 1.0.0
---
 .gitignore|  17 ++
 Makefile  |   4 +-
 README.md |  20 +++
 cppo_command.ml   |   2 -
 cppo_eval.ml  |  54 +-
 cppo_lexer.mll| 130 --
 cppo_main.ml  |  20 +++
 cppo_parser.mly   |   2 +-
 cppo_types.ml |   6 +-
 examples/french.ml|   2 +-
 examples/lexer.mll|   2 +-
 test/Makefile |  13 +
 test/comments.cppo|   7 +++
 test/comments.ref |   8 +++
 {testdata => test}/ext.cppo   |   0
 {testdata => test}/ext.ref|   0
 {testdata => test}/incl.cppo  |   0
 {testdata => test}/incl2.cppo |   0
 {testdata => test}/source.sh  |   0
 testdata/Makefile |   7 ---
 20 files changed, 160 insertions(+), 134 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..160ccab
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+*~
+*.out
+*.cmi
+*.cmo
+*.cmx
+*.cmxs
+*.cma
+*.cmxa
+*.o
+*.a
+*.annot
+cppo_lexer.ml
+cppo_parser.mli
+cppo_parser.ml
+cppo_version.ml
+cppo
+_build
diff --git a/Makefile b/Makefile
index 7f9177e..5c920a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.9.4
+VERSION = 1.0.0
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
@@ -92,7 +92,7 @@ cppo_parser.mli cppo_parser.ml: cppo_parser.mly cppo_types.ml
 endif
 
 test:
-   cd testdata; $(MAKE)
+   $(MAKE) -C test
 
 clean:
rm -f *.cm[iox] *.o *.annot *.conflicts *.automaton \
diff --git a/README.md b/README.md
index c1a762e..dbfd034 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ match state with
   | _ -> false
 ```
 
-After preprocessing by cppo, the code above becomes: 
+After preprocessing by cppo, the code above becomes:
 
 ```ocaml
 match state with
@@ -188,7 +188,7 @@ Arithmetic operators over signed 64-bit ints:
 * ... `land` ...
 * ... `lor` ...
 * ... `lxor` ...
-* `lnot` ... 
+* `lnot` ...
 
 Macro identifiers can be used in place of ints as long as they expand
 to an int literal, e.g.:
@@ -266,7 +266,7 @@ input from stdin and writes its output to stdout.
 Escaping
 
 
-The following characters can be escaped by a backslash when needed: 
+The following characters can be escaped by a backslash when needed:
 
 ```ocaml
 (
@@ -407,16 +407,16 @@ Options:
   Add directory DIR to the search path for included files
   -o FILE
   Output file
-  -q 
+  -q
   Identify and preserve camlp4 quotations
-  -s 
-  Output line directives pointing to the exact source location of 
-  each token, including those coming from the body of macro 
+  -s
+  Output line directives pointing to the exact source location of
+  each token, including those coming from the body of macro
   definitions.  This behavior is off by default.
-  -n 
-  Do not output any line directive other than those found in the 
+  -n
+  Do not output any line directive other than those found in the
   input (overrides -s).
-  -version 
+  -version
   Print the version of the program and exit.
   -x NAME:CMD_TEMPLATE
   Define a custom preprocessor target section starting with:
diff --git a/cppo_command.ml b/cppo_command.ml
index b92f235..5c61028 100644
--- a/cppo_command.ml
+++ b/cppo_command.ml
@@ -1,5 +1,3 @@
-(* $Id$ *)
-
 open Printf
 
 type command_token =
diff --git a/cppo_eval.ml b/cppo_eval.ml
index 94299b1..eebb8e7 100644
--- a/cppo_eval.ml
+++ b/cppo_eval.ml
@@ -1,5 +1,3 @@
-(* $Id$ *)
-
 open Printf
 
 open Cppo_types
@@ -48,17 +46,17 @@ let line_directive buf prev_file pos =
   pos.Lexing.pos_fname
   );
   bprintf buf "%s" (String.make (pos.Lexing.pos_cnum - pos.Lexing.pos_bol) ' ')
-
+
 let rec add_sep sep last = function
 [] -> [ last ]
   | [x] -> [ x; last ]
-  | x :: l -> x :: sep :: add_sep sep last l 
+  | x :: l -> x :: sep :: add_sep sep last l
 
 
 let trim s =
   let len = String.length s in
   let is_space = function ' ' | '\t' | '\n' | '\r' -> true | _ -> false in
-  let first = 
+  let first =
 let x = ref len in
 (try
for i = 0 to len - 1 do
@@ -107,7 +105,7 @@ let trim_and_compact buf s =
   | c ->
   if !need_space then
 Buffer.add_char buf ' ';
-  (match c with 
+  (match c with
'\"' -> Buffer.add_string buf "\\\""
  | '\\' -> Buffer.add_string buf ""
  | c -> Buffer.add_char buf c);
@@ -128,7 +126,7 @@ let trim_and_compact_string s =
 let is_ident s =

[Pkg-ocaml-maint-commits] [cppo] 02/09: Imported Upstream version 1.0.1

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit d41800aa6ca1a3d35823b70c7b543c4cb7821e74
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:45 2015 +0200

Imported Upstream version 1.0.1
---
 .gitignore   |  1 +
 Makefile |  5 ++--
 cppo_parser.mly  | 17 +++--
 ocamlbuild_plugin/ocamlbuild_cppo.ml |  2 +-
 test.cppo|  1 -
 test/Makefile| 11 +++--
 test/cond.cppo   | 47 
 7 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 160ccab..0baddb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *.o
 *.a
 *.annot
+*.automaton
 cppo_lexer.ml
 cppo_parser.mli
 cppo_parser.ml
diff --git a/Makefile b/Makefile
index 5c920a0..7e4e009 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.0.0
+VERSION = 1.0.1
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
@@ -98,5 +98,6 @@ clean:
rm -f *.cm[iox] *.o *.annot *.conflicts *.automaton \
cppo \
cppo_parser.mli cppo_parser.ml cppo_lexer.ml cppo_version.ml
-   cd examples; $(MAKE) clean
+   $(MAKE) -C examples clean
+   $(MAKE) -C test clean
cd ocamlbuild_plugin; ocamlbuild -clean
diff --git a/cppo_parser.mly b/cppo_parser.mly
index 6cbe59e..b28bd9a 100644
--- a/cppo_parser.mly
+++ b/cppo_parser.mly
@@ -1,4 +1,3 @@
-/* $Id$ */
 %{
   open Printf
   open Cppo_types
@@ -168,18 +167,6 @@ node:
 | IFDEF full_node_list0 elif_list error
 { error (fst $1) "missing #endif" }
 
-| IF test full_node_list0 ELSE full_node_list0 ENDIF
-{ `Cond ((fst $1, snd $6), $2, $3, $5) }
-
-| IF test full_node_list0 ELSE full_node_list0 error
-{ error $1 "missing #endif" }
-
-| IFDEF full_node_list0 ELSE full_node_list0 ENDIF
-{ `Cond ((fst (fst $1), snd $5), (snd $1), $2, $4) }
-
-| IFDEF full_node_list0 ELSE full_node_list0 error
-{ error (fst $1) "missing #endif" }
-
 | LINE  { `Line $1 }
 ;
 
@@ -189,6 +176,10 @@ elif_list:
{ let pos1, _ = $1 in
 let pos2 = Parsing.rhs_end_pos 4 in
 ((pos1, pos2), $2, $3) :: $4 }
+| ELSE full_node_list0
+   { let pos1, _ = $1 in
+let pos2 = Parsing.rhs_end_pos 2 in
+[ ((pos1, pos2), `True, $2) ] }
 |  { [] }
 ;
 
diff --git a/ocamlbuild_plugin/ocamlbuild_cppo.ml 
b/ocamlbuild_plugin/ocamlbuild_cppo.ml
index 42cf246..61ff6dc 100644
--- a/ocamlbuild_plugin/ocamlbuild_cppo.ml
+++ b/ocamlbuild_plugin/ocamlbuild_cppo.ml
@@ -24,7 +24,7 @@ let dispatcher = function
 if Pathname.is_directory s then [] else [s]) ;
   flag ["cppo"; "cppo_q"] (A "-q") ;
   flag ["cppo"; "cppo_s"] (A "-s") ;
-  flag ["cppo"; "cppo_s"] (A "-n") ;
+  flag ["cppo"; "cppo_n"] (A "-n") ;
   pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s])
 end
   | _ -> ()
diff --git a/test.cppo b/test.cppo
index 551c749..39a08ba 100644
--- a/test.cppo
+++ b/test.cppo
@@ -13,7 +13,6 @@ f(3)
 "g" is not defined
 #endif
 
-
 #define a(x) b()
 #define b(x) a()
 a()
diff --git a/test/Makefile b/test/Makefile
index 5c37a29..8e2048f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,6 +1,7 @@
-.PHONY: all ext comments
+TESTS = ext comments cond
+.PHONY: all clean $(TESTS)
 
-all: ext comments
+all: $(TESTS)
 
 ext:
../cppo -x rot13:"tr '[a-z]' '[n-za-m]'" \
@@ -11,3 +12,9 @@ ext:
 comments:
../cppo comments.cppo > comments.out
diff -u comments.ref comments.out
+
+cond:
+   ../cppo cond.cppo > cond.out
+
+clean:
+   rm -f *~ *.out
diff --git a/test/cond.cppo b/test/cond.cppo
new file mode 100644
index 000..b5f0c49
--- /dev/null
+++ b/test/cond.cppo
@@ -0,0 +1,47 @@
+#if 1 = 1
+#else
+#error "ignored #else (?)"
+#endif
+
+#if true
+  banana
+#elif false
+  apple
+  #error "ignored #elif (?)"
+#endif
+
+#if false
+  earthworm
+  #error ""
+#elif true
+  apricot
+#endif
+
+#if false
+  cuckoo
+  #error ""
+#else
+  #if false
+egg
+#error ""
+  #else
+nest
+  #endif
+#endif
+
+#define X 3
+
+#if false
+  helicopter
+  #error ""
+#elif false
+  ocean
+  #error ""
+#else
+  #if X = 12
+sand
+#error ""
+  #elif 4 * X = 12
+sea urchin
+  #endif
+#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 01/05: pristine-tar data for cppo_1.0.0.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository cppo.

commit 0b12741f8ac869b490394814b41999e9fd1b2e7e
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:29 2015 +0200

pristine-tar data for cppo_1.0.0.orig.tar.gz
---
 cppo_1.0.0.orig.tar.gz.delta | Bin 0 -> 1562 bytes
 cppo_1.0.0.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/cppo_1.0.0.orig.tar.gz.delta b/cppo_1.0.0.orig.tar.gz.delta
new file mode 100644
index 000..90e25ea
Binary files /dev/null and b/cppo_1.0.0.orig.tar.gz.delta differ
diff --git a/cppo_1.0.0.orig.tar.gz.id b/cppo_1.0.0.orig.tar.gz.id
new file mode 100644
index 000..f1e87a0
--- /dev/null
+++ b/cppo_1.0.0.orig.tar.gz.id
@@ -0,0 +1 @@
+efd32bc8f04605e4bb16a04fc6e599db9c43899e

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 04/05: pristine-tar data for cppo_1.1.1.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository cppo.

commit 9d0e2780ab555f263a4b7e62745107b96a9a77fb
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:56 2015 +0200

pristine-tar data for cppo_1.1.1.orig.tar.gz
---
 cppo_1.1.1.orig.tar.gz.delta | Bin 0 -> 1668 bytes
 cppo_1.1.1.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/cppo_1.1.1.orig.tar.gz.delta b/cppo_1.1.1.orig.tar.gz.delta
new file mode 100644
index 000..926e757
Binary files /dev/null and b/cppo_1.1.1.orig.tar.gz.delta differ
diff --git a/cppo_1.1.1.orig.tar.gz.id b/cppo_1.1.1.orig.tar.gz.id
new file mode 100644
index 000..b85835a
--- /dev/null
+++ b/cppo_1.1.1.orig.tar.gz.id
@@ -0,0 +1 @@
+1602d382496ae18eafe109521599259b56062595

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 09/09: Update changelog and prepare upload to unstable

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 4b361402b7c7007ac1af7bdad466beff89cf2922
Author: Stephane Glondu 
Date:   Thu Sep 3 14:30:37 2015 +0200

Update changelog and prepare upload to unstable
---
 debian/changelog | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1995b40..fa93eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-cppo (1.1.2-1) UNRELEASED; urgency=medium
+cppo (1.1.2-1) unstable; urgency=medium
 
+  * Team upload
   * New upstream release
-  * Bump Standards-Version to 3.9.5
+  * Bump Standards-Version to 3.9.6
 
- -- Stéphane Glondu   Thu, 03 Sep 2015 14:22:12 +0200
+ -- Stéphane Glondu   Thu, 03 Sep 2015 14:34:44 +0200
 
 cppo (0.9.3-3) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 07/09: New upstream release

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 2b6d1f2190a6da6f05e2d8d7e3b98b0afbebe5c2
Author: Stephane Glondu 
Date:   Thu Sep 3 14:22:33 2015 +0200

New upstream release
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98c558c..1995b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-cppo (0.9.4-1) UNRELEASED; urgency=medium
+cppo (1.1.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Bump Standards-Version to 3.9.5
 
- -- Stéphane Glondu   Sun, 17 Aug 2014 14:42:51 +0200
+ -- Stéphane Glondu   Thu, 03 Sep 2015 14:22:12 +0200
 
 cppo (0.9.3-3) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 08/09: Bump Standards-Version to 3.9.6

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 97e7bb7f6ac0408db687a5ae3fde7e8f4eae7c9c
Author: Stephane Glondu 
Date:   Thu Sep 3 14:36:35 2015 +0200

Bump Standards-Version to 3.9.6
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index a92b37a..57289d7 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
   ocaml-findlib (>= 1.4),
   dh-ocaml (>= 0.9~),
   debhelper (>= 9)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://mjambon.com/cppo.html
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/cppo.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/cppo.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] annotated tag upstream/1.1.2 created (now 1134e7e)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/1.1.2
in repository cppo.

at  1134e7e   (tag)
   tagging  10c7f02d0bcb4dd786f9ea58f7cce3bdc53404e1 (commit)
  replaces  upstream/1.1.1
 tagged by  Stephane Glondu
on  Thu Sep 3 14:22:08 2015 +0200

- Log -
Upstream version 1.1.2

Stephane Glondu (1):
  Imported Upstream version 1.1.2

---

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/cppo.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] [cppo] branch pristine-tar updated (1b2a086 -> 1bf5c62)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch pristine-tar
in repository cppo.

  from  1b2a086   pristine-tar data for cppo_0.9.4.orig.tar.gz
   new  0b12741   pristine-tar data for cppo_1.0.0.orig.tar.gz
   new  700b323   pristine-tar data for cppo_1.0.1.orig.tar.gz
   new  b0a106a   pristine-tar data for cppo_1.1.0.orig.tar.gz
   new  9d0e278   pristine-tar data for cppo_1.1.1.orig.tar.gz
   new  1bf5c62   pristine-tar data for cppo_1.1.2.orig.tar.gz

The 5 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:
 cppo_1.0.0.orig.tar.gz.delta | Bin 0 -> 1562 bytes
 cppo_1.0.0.orig.tar.gz.id|   1 +
 cppo_1.0.1.orig.tar.gz.delta | Bin 0 -> 1568 bytes
 cppo_1.0.1.orig.tar.gz.id|   1 +
 cppo_1.1.0.orig.tar.gz.delta | Bin 0 -> 1619 bytes
 cppo_1.1.0.orig.tar.gz.id|   1 +
 cppo_1.1.1.orig.tar.gz.delta | Bin 0 -> 1668 bytes
 cppo_1.1.1.orig.tar.gz.id|   1 +
 cppo_1.1.2.orig.tar.gz.delta | Bin 0 -> 1603 bytes
 cppo_1.1.2.orig.tar.gz.id|   1 +
 10 files changed, 5 insertions(+)
 create mode 100644 cppo_1.0.0.orig.tar.gz.delta
 create mode 100644 cppo_1.0.0.orig.tar.gz.id
 create mode 100644 cppo_1.0.1.orig.tar.gz.delta
 create mode 100644 cppo_1.0.1.orig.tar.gz.id
 create mode 100644 cppo_1.1.0.orig.tar.gz.delta
 create mode 100644 cppo_1.1.0.orig.tar.gz.id
 create mode 100644 cppo_1.1.1.orig.tar.gz.delta
 create mode 100644 cppo_1.1.1.orig.tar.gz.id
 create mode 100644 cppo_1.1.2.orig.tar.gz.delta
 create mode 100644 cppo_1.1.2.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 05/09: Imported Upstream version 1.1.2

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 10c7f02d0bcb4dd786f9ea58f7cce3bdc53404e1
Author: Stephane Glondu 
Date:   Thu Sep 3 14:22:08 2015 +0200

Imported Upstream version 1.1.2
---
 Makefile | 2 +-
 README.md| 6 --
 ocamlbuild_plugin/ocamlbuild_cppo.ml | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1daf812..467d5c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1.1
+VERSION = 1.1.2
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
diff --git a/README.md b/README.md
index a17e5f5..862864b 100644
--- a/README.md
+++ b/README.md
@@ -212,7 +212,7 @@ sharing the same prefix. See the output of `cppo -help` 
(copied at the
 bottom of this page).
 
 ```
-$ ./cppo -V OCAML:`ocamlc -version`
+$ cppo -V OCAML:`ocamlc -version`
 #if OCAML_VERSION >= (4, 0, 0)
 (* All is well. *)
 #else
@@ -388,7 +388,7 @@ Ocamlbuild plugin
 --
 
 An ocamlbuild plugin is available. To use it, you can call ocamlbuild
-with the argument `--plugin-tag package(cppo_ocamlbuild)` (only since
+with the argument `-plugin-tag package(cppo_ocamlbuild)` (only since
 4.01).
 
 With Oasis :
@@ -419,6 +419,8 @@ to produce`.ml` files. The following tags are available:
   * If `foo` is a directory, it's equivalent to `-I foo`.
   * If `foo` is a file, it adds `foo` as a dependency and apply `-I
 parent(foo)`.
+* `cppo_V(NAME:VERSION)` ≡ `-V NAME:VERSION`
+* `cppo_V_OCAML` ≡ `-V OCAML:VERSION`, where `VERSION` is the version of OCaml 
that ocamlbuild uses.
 
 Detailed command-line usage and options
 ---
diff --git a/ocamlbuild_plugin/ocamlbuild_cppo.ml 
b/ocamlbuild_plugin/ocamlbuild_cppo.ml
index fa0d591..91f7b2f 100644
--- a/ocamlbuild_plugin/ocamlbuild_cppo.ml
+++ b/ocamlbuild_plugin/ocamlbuild_cppo.ml
@@ -26,6 +26,7 @@ let dispatcher = function
   flag ["cppo"; "cppo_s"] (A "-s") ;
   flag ["cppo"; "cppo_n"] (A "-n") ;
   pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s]);
-  pflag ["cppo"] "cppo_V" (fun s -> S [A "-V"; A s])
+  pflag ["cppo"] "cppo_V" (fun s -> S [A "-V"; A s]);
+  flag ["cppo"; "cppo_V_OCAML"] & S [A "-V"; A ("OCAML:" ^ 
Sys.ocaml_version)]
 end
   | _ -> ()

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 06/09: Merge tag 'upstream/1.1.2'

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 45bf01e6f309ba3d39c92eef370deba9a09ea7b8
Merge: 32ea48f 10c7f02
Author: Stephane Glondu 
Date:   Thu Sep 3 14:22:08 2015 +0200

Merge tag 'upstream/1.1.2'

Upstream version 1.1.2

 .gitignore   |  18 +
 .ocp-indent  |  22 ++
 Makefile |  17 +-
 README.md|  81 +++--
 cppo_command.ml  |   2 -
 cppo_eval.ml | 659 +++
 cppo_lexer.mll   | 500 +-
 cppo_main.ml | 156 ++---
 cppo_parser.mly  | 131 +++
 cppo_types.ml|  15 +-
 examples/french.ml   |   4 +-
 examples/lexer.mll   |   2 +-
 ocamlbuild_plugin/ocamlbuild_cppo.ml |   6 +-
 test.cppo|   1 -
 test/Makefile|  26 ++
 test/comments.cppo   |   7 +
 test/comments.ref|   8 +
 test/cond.cppo   |  47 +++
 {testdata => test}/ext.cppo  |   0
 {testdata => test}/ext.ref   |   0
 {testdata => test}/incl.cppo |   0
 {testdata => test}/incl2.cppo|   0
 {testdata => test}/source.sh |   0
 test/tuple.cppo  |  38 ++
 test/version.cppo|  30 ++
 testdata/Makefile|   7 -
 26 files changed, 1079 insertions(+), 698 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] annotated tag upstream/1.1.0 created (now fde2d04)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/1.1.0
in repository cppo.

at  fde2d04   (tag)
   tagging  4c9b4f2f3995f72f1473debea2ac3c65572eecf2 (commit)
  replaces  upstream/1.0.1
 tagged by  Stephane Glondu
on  Thu Sep 3 14:21:52 2015 +0200

- Log -
Upstream version 1.1.0

Stephane Glondu (1):
  Imported Upstream version 1.1.0

---

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/cppo.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] [cppo] 02/05: pristine-tar data for cppo_1.0.1.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository cppo.

commit 700b323c11266a84bc9da37377a0ddf3e45120fe
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:45 2015 +0200

pristine-tar data for cppo_1.0.1.orig.tar.gz
---
 cppo_1.0.1.orig.tar.gz.delta | Bin 0 -> 1568 bytes
 cppo_1.0.1.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/cppo_1.0.1.orig.tar.gz.delta b/cppo_1.0.1.orig.tar.gz.delta
new file mode 100644
index 000..5a48c8c
Binary files /dev/null and b/cppo_1.0.1.orig.tar.gz.delta differ
diff --git a/cppo_1.0.1.orig.tar.gz.id b/cppo_1.0.1.orig.tar.gz.id
new file mode 100644
index 000..9688539
--- /dev/null
+++ b/cppo_1.0.1.orig.tar.gz.id
@@ -0,0 +1 @@
+d4b3ea5071f0523deed5967f4e899b96c0de0a00

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] branch master updated (32ea48f -> 4b36140)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository cppo.

  from  32ea48f   Update packaging
   new  887514d   Imported Upstream version 1.0.0
   new  d41800a   Imported Upstream version 1.0.1
   new  4c9b4f2   Imported Upstream version 1.1.0
   new  1bdb8f4   Imported Upstream version 1.1.1
   new  10c7f02   Imported Upstream version 1.1.2
   new  45bf01e   Merge tag 'upstream/1.1.2'
   new  2b6d1f2   New upstream release
   new  97e7bb7   Bump Standards-Version to 3.9.6
   new  4b36140   Update changelog and prepare upload to unstable

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:
 .gitignore   |  18 +
 .ocp-indent  |  22 ++
 Makefile |  17 +-
 README.md|  81 +++--
 cppo_command.ml  |   2 -
 cppo_eval.ml | 659 +++
 cppo_lexer.mll   | 500 +-
 cppo_main.ml | 156 ++---
 cppo_parser.mly  | 131 +++
 cppo_types.ml|  15 +-
 debian/changelog |   7 +-
 debian/control   |   2 +-
 examples/french.ml   |   4 +-
 examples/lexer.mll   |   2 +-
 ocamlbuild_plugin/ocamlbuild_cppo.ml |   6 +-
 test.cppo|   1 -
 test/Makefile|  26 ++
 test/comments.cppo   |   7 +
 test/comments.ref|   8 +
 test/cond.cppo   |  47 +++
 {testdata => test}/ext.cppo  |   0
 {testdata => test}/ext.ref   |   0
 {testdata => test}/incl.cppo |   0
 {testdata => test}/incl2.cppo|   0
 {testdata => test}/source.sh |   0
 test/tuple.cppo  |  38 ++
 test/version.cppo|  30 ++
 testdata/Makefile|   7 -
 28 files changed, 1084 insertions(+), 702 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .ocp-indent
 create mode 100644 test/Makefile
 create mode 100644 test/comments.cppo
 create mode 100644 test/comments.ref
 create mode 100644 test/cond.cppo
 rename {testdata => test}/ext.cppo (100%)
 rename {testdata => test}/ext.ref (100%)
 rename {testdata => test}/incl.cppo (100%)
 rename {testdata => test}/incl2.cppo (100%)
 rename {testdata => test}/source.sh (100%)
 create mode 100644 test/tuple.cppo
 create mode 100644 test/version.cppo
 delete mode 100644 testdata/Makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] annotated tag upstream/1.0.0 created (now 3b686bd)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/1.0.0
in repository cppo.

at  3b686bd   (tag)
   tagging  887514d836b223f6d7086c7c17ffb7fcb2210223 (commit)
  replaces  upstream/0.9.4
 tagged by  Stephane Glondu
on  Thu Sep 3 14:21:29 2015 +0200

- Log -
Upstream version 1.0.0

Stephane Glondu (1):
  Imported Upstream version 1.0.0

---

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/cppo.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] [cppo] 05/05: pristine-tar data for cppo_1.1.2.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository cppo.

commit 1bf5c6260e2da7153bd8d8b65700e02f5ddb2115
Author: Stephane Glondu 
Date:   Thu Sep 3 14:22:08 2015 +0200

pristine-tar data for cppo_1.1.2.orig.tar.gz
---
 cppo_1.1.2.orig.tar.gz.delta | Bin 0 -> 1603 bytes
 cppo_1.1.2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/cppo_1.1.2.orig.tar.gz.delta b/cppo_1.1.2.orig.tar.gz.delta
new file mode 100644
index 000..ab00c01
Binary files /dev/null and b/cppo_1.1.2.orig.tar.gz.delta differ
diff --git a/cppo_1.1.2.orig.tar.gz.id b/cppo_1.1.2.orig.tar.gz.id
new file mode 100644
index 000..fa8a2e3
--- /dev/null
+++ b/cppo_1.1.2.orig.tar.gz.id
@@ -0,0 +1 @@
+97dd9a1ab86e35c84cfc9f1b1ae4a80c7e4b4b48

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] branch upstream updated (5b28627 -> 10c7f02)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch upstream
in repository cppo.

  from  5b28627   Imported Upstream version 0.9.4
   new  887514d   Imported Upstream version 1.0.0
   new  d41800a   Imported Upstream version 1.0.1
   new  4c9b4f2   Imported Upstream version 1.1.0
   new  1bdb8f4   Imported Upstream version 1.1.1
   new  10c7f02   Imported Upstream version 1.1.2

The 5 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   |  18 +
 .ocp-indent  |  22 ++
 Makefile |  17 +-
 README.md|  81 +++--
 cppo_command.ml  |   2 -
 cppo_eval.ml | 659 +++
 cppo_lexer.mll   | 500 +-
 cppo_main.ml | 156 ++---
 cppo_parser.mly  | 131 +++
 cppo_types.ml|  15 +-
 examples/french.ml   |   4 +-
 examples/lexer.mll   |   2 +-
 ocamlbuild_plugin/ocamlbuild_cppo.ml |   6 +-
 test.cppo|   1 -
 test/Makefile|  26 ++
 test/comments.cppo   |   7 +
 test/comments.ref|   8 +
 test/cond.cppo   |  47 +++
 {testdata => test}/ext.cppo  |   0
 {testdata => test}/ext.ref   |   0
 {testdata => test}/incl.cppo |   0
 {testdata => test}/incl2.cppo|   0
 {testdata => test}/source.sh |   0
 test/tuple.cppo  |  38 ++
 test/version.cppo|  30 ++
 testdata/Makefile|   7 -
 26 files changed, 1079 insertions(+), 698 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .ocp-indent
 create mode 100644 test/Makefile
 create mode 100644 test/comments.cppo
 create mode 100644 test/comments.ref
 create mode 100644 test/cond.cppo
 rename {testdata => test}/ext.cppo (100%)
 rename {testdata => test}/ext.ref (100%)
 rename {testdata => test}/incl.cppo (100%)
 rename {testdata => test}/incl2.cppo (100%)
 rename {testdata => test}/source.sh (100%)
 create mode 100644 test/tuple.cppo
 create mode 100644 test/version.cppo
 delete mode 100644 testdata/Makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] 04/09: Imported Upstream version 1.1.1

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository cppo.

commit 1bdb8f4f3f4448673911234a7b81bc6a777091f1
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:56 2015 +0200

Imported Upstream version 1.1.1
---
 Makefile | 2 +-
 README.md| 3 ++-
 ocamlbuild_plugin/ocamlbuild_cppo.ml | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e89850d..1daf812 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1.0
+VERSION = 1.1.1
 
 ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
 EXE=.exe
diff --git a/README.md b/README.md
index cecd6b2..a17e5f5 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,8 @@ to an int literal or a tuple of int literals, e.g.:
 
 Version strings (http://semver.org/) can also be passed to cppo on the
 command line. This results in multiple variables being defined, all
-sharing the same prefix. See the output `cppo -help` (copied below).
+sharing the same prefix. See the output of `cppo -help` (copied at the
+bottom of this page).
 
 ```
 $ ./cppo -V OCAML:`ocamlc -version`
diff --git a/ocamlbuild_plugin/ocamlbuild_cppo.ml 
b/ocamlbuild_plugin/ocamlbuild_cppo.ml
index 61ff6dc..fa0d591 100644
--- a/ocamlbuild_plugin/ocamlbuild_cppo.ml
+++ b/ocamlbuild_plugin/ocamlbuild_cppo.ml
@@ -25,6 +25,7 @@ let dispatcher = function
   flag ["cppo"; "cppo_q"] (A "-q") ;
   flag ["cppo"; "cppo_s"] (A "-s") ;
   flag ["cppo"; "cppo_n"] (A "-n") ;
-  pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s])
+  pflag ["cppo"] "cppo_x" (fun s -> S [A "-x"; A s]);
+  pflag ["cppo"] "cppo_V" (fun s -> S [A "-V"; A s])
 end
   | _ -> ()

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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] [cppo] annotated tag upstream/1.1.1 created (now a33a947)

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/1.1.1
in repository cppo.

at  a33a947   (tag)
   tagging  1bdb8f4f3f4448673911234a7b81bc6a777091f1 (commit)
  replaces  upstream/1.1.0
 tagged by  Stephane Glondu
on  Thu Sep 3 14:21:56 2015 +0200

- Log -
Upstream version 1.1.1

Stephane Glondu (1):
  Imported Upstream version 1.1.1

---

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/cppo.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] [cppo] 03/05: pristine-tar data for cppo_1.1.0.orig.tar.gz

2015-09-03 Thread Stéphane Glondu

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository cppo.

commit b0a106a8f9bc4650807d376eddc4499a7d848a36
Author: Stephane Glondu 
Date:   Thu Sep 3 14:21:52 2015 +0200

pristine-tar data for cppo_1.1.0.orig.tar.gz
---
 cppo_1.1.0.orig.tar.gz.delta | Bin 0 -> 1619 bytes
 cppo_1.1.0.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/cppo_1.1.0.orig.tar.gz.delta b/cppo_1.1.0.orig.tar.gz.delta
new file mode 100644
index 000..525693a
Binary files /dev/null and b/cppo_1.1.0.orig.tar.gz.delta differ
diff --git a/cppo_1.1.0.orig.tar.gz.id b/cppo_1.1.0.orig.tar.gz.id
new file mode 100644
index 000..5bcc544
--- /dev/null
+++ b/cppo_1.1.0.orig.tar.gz.id
@@ -0,0 +1 @@
+85050352a2557ccc3d9e85c87a6a5b2f70e16809

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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

44 matches

Mail list logo