[Pkg-ocaml-maint-commits] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit e2f36af8115df61bb583299cbd506cae046cfad3
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 12:15:23 2013 +0200

Add a debian/gbp.conf file

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..89c739e
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+pristine-tar = True
+filter-pristine-tar = True
+filter = [
+doc/html,
+doc/tutorials,
+src_ext,
+ocp-build
+]

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 1cf6caa65f95d5f5053405bb41bca3cf0408233f
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 12:50:29 2013 +0200

Update upstream version in changelog

diff --git a/debian/changelog b/debian/changelog
index ad8ee5b..48faa5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opam (0.9.0+deb1-1) UNRELEASED; urgency=low
+opam (1.0.0-1) UNRELEASED; urgency=low
 
   * Initial upload (Closes: #641986)
 

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 52542d7874c0c4eca81f5f8d81ee1348a1f2
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 12:56:26 2013 +0200

Remove 0001-Use-Re_pcre-instead-of-Pcre.patch (fixed in 1.0.0)

diff --git a/debian/patches/0001-Use-Re_pcre-instead-of-Pcre.patch 
b/debian/patches/0001-Use-Re_pcre-instead-of-Pcre.patch
deleted file mode 100644
index 85c2b56..000
--- a/debian/patches/0001-Use-Re_pcre-instead-of-Pcre.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Mehdi Dogguy me...@debian.org
-Date: Sat, 12 Jan 2013 23:20:30 +0100
-Subject: Use Re_pcre instead of Pcre
-

- src/core/opamFile.ml |2 +-
- src/core/opamMisc.ml |2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/opamFile.ml b/src/core/opamFile.ml
-index 0161913..9658fc8 100644
 a/src/core/opamFile.ml
-+++ b/src/core/opamFile.ml
-@@ -1367,7 +1367,7 @@ module Subst = struct
-   let v = OpamVariable.Full.of_string str in
-   OpamVariable.string_of_variable_contents (f v) in
- let rex = Re_perl.compile_pat %\\{[^%]+\\}% in
--Pcre.substitute ~rex ~subst t
-+Re_pcre.substitute ~rex ~subst t
- 
-   let replace_string = replace
- 
-diff --git a/src/core/opamMisc.ml b/src/core/opamMisc.ml
-index ba24f08..44833d1 100644
 a/src/core/opamMisc.ml
-+++ b/src/core/opamMisc.ml
-@@ -215,7 +215,7 @@ let contains s c =
-   with Not_found - false
- 
- let split s c =
--  Pcre.split ~rex:(Re_perl.compile (Re.char c)) s
-+  Re_pcre.split ~rex:(Re_perl.compile (Re.char c)) s
- 
- (* Remove from a ':' separated list of string the one with the given prefix *)
- let reset_env_value ~prefix v =
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 6c079f2..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Use-Re_pcre-instead-of-Pcre.patch

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 82dec3c250b03aa8c9d9d20bafe32832f83cf147
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 13:00:57 2013 +0200

Take into account bytecode architectures

diff --git a/debian/rules b/debian/rules
index 49cb9b5..2b15922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_configure:
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
ocamlbuild $(OCAML_BEST).otarget
-   $(MAKE) -C doc OPAM=../opamMain.native man
+   $(MAKE) -C doc OPAM=../opamMain.$(BINEXT) man
$(RM) -f doc/dev-manual/dev-manual.pdf
$(MAKE) -C doc/dev-manual
 

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 181d214ac29f4bc75fa4608e514adce14aacae51
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 13:26:45 2013 +0200

Do not compile and install opam_check

diff --git a/debian/buildsys/byte.itarget b/debian/buildsys/byte.itarget
index eb6ba6f..7634908 100644
--- a/debian/buildsys/byte.itarget
+++ b/debian/buildsys/byte.itarget
@@ -1,4 +1,3 @@
 src/client/opamMain.byte
 src/scripts/opam_mk_repo.byte
-src/scripts/opam_check.byte
 src/scripts/opam_repo_check.byte
diff --git a/debian/buildsys/opt.itarget b/debian/buildsys/opt.itarget
index b513edf..8aa35da 100644
--- a/debian/buildsys/opt.itarget
+++ b/debian/buildsys/opt.itarget
@@ -1,4 +1,3 @@
 src/client/opamMain.native
 src/scripts/opam_mk_repo.native
-src/scripts/opam_check.native
 src/scripts/opam_repo_check.native
diff --git a/debian/rules b/debian/rules
index 2b15922..7503a29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ override_dh_auto_install:
cp _build/src/client/opamMain.$(BINEXT) 
$(DESTDIR)/usr/bin/opam
cp _build/src/scripts/opam_mk_repo.$(BINEXT)
$(DESTDIR)/usr/bin/opam-mk-repo
cp _build/src/scripts/opam_repo_check.$(BINEXT) 
$(DESTDIR)/usr/bin/opam-repo-check
-   cp _build/src/scripts/opam_check.$(BINEXT)  
$(DESTDIR)/usr/bin/opam-check
 
 .PHONY: override_dh_install
 override_dh_install:

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 97a4f52e0680ddd1d7cf05a0273b87eeb28d7f76
Merge: e2f36af8115df61bb583299cbd506cae046cfad3 
f647ee34f8ceea372c0b1a698b955c3ae33b7e7d
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 12:15:57 2013 +0200

Merge tag 'upstream/1.0.0'

Upstream version 1.0.0


-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit fe11d19e57921cca2ecba1083bc8c872546fc495
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 13:29:42 2013 +0200

Fix copyright holders and license of buildsys/myocamlbuild.ml

diff --git a/debian/buildsys/myocamlbuild.ml b/debian/buildsys/myocamlbuild.ml
index 4310db9..30d6cd2 100644
--- a/debian/buildsys/myocamlbuild.ml
+++ b/debian/buildsys/myocamlbuild.ml
@@ -1,21 +1,19 @@
 (**)
-(*  Copyright © 2009-2010 Stéphane Glondu st...@glondu.net  *)
-(*© 2010 Mehdi Dogguy me...@dogguy.org  *)
+(*  Copyright © 2013 Mehdi Dogguy me...@debian.org  *)
 (**)
 (*  This program is free software: you can redistribute it and/or modify  *)
-(*  it under the terms of the GNU Affero General Public License as*)
-(*  published by the Free Software Foundation, either version 3 of the*)
-(*  License, or (at your option) any later version, with the additional   *)
-(*  exemption that compiling, linking, and/or using OpenSSL is allowed.   *)
+(*  it under the terms of the GNU General Public License as published by  *)
+(*  the Free Software Foundation, either version 3 of the License, or (at *)
+(*  your option) any later version, with the additional exemption that*)
+(*  compiling, linking, and/or using OpenSSL is allowed.  *)
 (**)
 (*  This program is distributed in the hope that it will be useful, but   *)
 (*  WITHOUT ANY WARRANTY; without even the implied warranty of*)
 (*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU *)
 (*  Affero General Public License for more details.   *)
 (**)
-(*  You should have received a copy of the GNU Affero General Public  *)
-(*  License along with this program.  If not, see *)
-(*  http://www.gnu.org/licenses/.   *)
+(*  You should have received a copy of the GNU General Public License *)
+(*  along with this program.  If not, see http://www.gnu.org/licenses/. *)
 (**)
 
 open Printf

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit ac27d3153b4d5e54ebe3f5226c8a686f4b03b414
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 13:39:16 2013 +0200

Build generated modules

diff --git a/debian/rules b/debian/rules
index 7503a29..d2b541f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ BINEXT = $(if $(OCAML_OPT_ARCH),native,byte)
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
./configure
+   $(MAKE) autogen
for file in `ls -1 debian/buildsys/`; do \
ln -s debian/buildsys/$$file; \
done 

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 86c9aeadc0bca6d7fe3996e4ff8c4ab7f1754c8c
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 13:49:03 2013 +0200

Disable build of manpages

diff --git a/debian/rules b/debian/rules
index d2b541f..8511d45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,9 @@ override_dh_auto_configure:
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
ocamlbuild $(OCAML_BEST).otarget
-   $(MAKE) -C doc OPAM=../opamMain.$(BINEXT) man
+# We need pandoc on all architectures to be able to build manpages
+# As of now, pandoc is missing on mips, mipsel and s390.
+#  $(MAKE) -C doc OPAM=../opamMain.$(BINEXT) man
$(RM) -f doc/dev-manual/dev-manual.pdf
$(MAKE) -C doc/dev-manual
 

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit c1e362b316ba2b44be2b1b1ff2affb3ebd79a11b
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 13:16:26 2013 +0200

Adjust build-dependencies

diff --git a/debian/control b/debian/control
index e81e395..b521e82 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
 Build-Depends:
  debhelper (= 8),
  ocaml-nox,
+ camlp4,
  ocaml-findlib (= 1.2.4),
  dh-ocaml (= 0.9),
  libcudf-ocaml-dev,
@@ -17,7 +18,11 @@ Build-Depends:
  libocamlgraph-ocaml-dev (= 1.8),
  texlive-latex-base,
  texlive-lang-french,
- latex-make
+ texlive-latex-extra,
+ texlive-latex-recommended,
+ texlive-fonts-recommended,
+ latex-make,
+ curl
 Standards-Version: 3.9.3
 Homepage: http://opam.ocamlpro.com
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/opam.git

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 2f49b0c883acff85e55a48fc99e60bb7fb9e45e3
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 14:48:21 2013 +0200

Fix possible-unindented-list-in-extended-description

diff --git a/debian/control b/debian/control
index b521e82..5f7e220 100644
--- a/debian/control
+++ b/debian/control
@@ -42,20 +42,20 @@ Recommends:
 Description: package manager for OCaml
  OPAM stands for OCaml PAckage Manager. It aims to suit to a vast number
  of users and use cases, and has unique features:
- * Powerful handling of dependencies: versions constraints, optional
-   dependencies, conflicts, etc.
- * Multiple repositories backends: HTTP, rsync, git
- * Ease to create packages and repositories
- * Ability to switch between different compiler versions
+  * Powerful handling of dependencies: versions constraints, optional
+dependencies, conflicts, etc.
+  * Multiple repositories backends: HTTP, rsync, git
+  * Ease to create packages and repositories
+  * Ability to switch between different compiler versions
  .
  Typically, OPAM will probably make your life easier if you recognize
  yourself in at least one of these profiles:
- * You use multiple versions of the OCaml compiler, or you hack the compiler
-   yourself and needs to frequently switch between compiler versions.
- * You use or develop software that needs a specific and/or modified version
-   of the OCaml compiler to be installed.
- * You use or develop software that depends on a specific version of an OCaml
-   library, or you just want to install a specific version of a package, not
-   just the latest one.
- * You want to create your own packages yourself, put them on your own
-   repository, with minimal effort.
+  * You use multiple versions of the OCaml compiler, or you hack the compiler
+yourself and needs to frequently switch between compiler versions.
+  * You use or develop software that needs a specific and/or modified version
+of the OCaml compiler to be installed.
+  * You use or develop software that depends on a specific version of an OCaml
+library, or you just want to install a specific version of a package, not
+just the latest one.
+  * You want to create your own packages yourself, put them on your own
+repository, with minimal effort.

-- 
opam packaging

___
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] [SCM] opam packaging branch, master, updated. upstream/0.9.0+deb1-17-g2f49b0c

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the master branch:
commit 3fe7ad100c5dfae3db859e3480d90af532854835
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 14:44:28 2013 +0200

Misc changes (doc-base, -X.pdf)

diff --git a/debian/opam.doc-base b/debian/opam.doc-base
new file mode 100644
index 000..39daea4
--- /dev/null
+++ b/debian/opam.doc-base
@@ -0,0 +1,8 @@
+Document: opam-dev-man
+Title: OPAM, developer manual
+Author: Thomas Gazanaire
+Abstract: Developer Manual of OPAM
+Section: Programming/OCaml
+
+Format: PDF
+Files: /usr/share/doc/opam/dev-manual.pdf
diff --git a/debian/rules b/debian/rules
index 8511d45..d2aadd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,3 +49,7 @@ override_dh_auto_clean:
$(MAKE) clean || true
$(RM) -rf _build
$(RM) -f src/core/opamVersion.ml Makefile.config config.log 
config.status *.$(BINEXT)
+
+.PHONY: override_dh_compress
+override_dh_compress:
+   dh_compress -X.pdf
diff --git a/doc/dev-manual/dev-manual.pdf b/doc/dev-manual/dev-manual.pdf
deleted file mode 100644
index d294e1f..000
Binary files a/doc/dev-manual/dev-manual.pdf and /dev/null differ

-- 
opam packaging

___
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] [SCM] opam packaging branch, pristine-tar, updated. 4ed9fb0184768ba6a04fa921e8dfe0e2daf78e72

2013-04-06 Thread Mehdi Dogguy 
The following commit has been merged in the pristine-tar branch:
commit 4ed9fb0184768ba6a04fa921e8dfe0e2daf78e72
Author: Mehdi Dogguy me...@debian.org
Date:   Sat Apr 6 12:15:57 2013 +0200

pristine-tar data for opam_1.0.0.orig.tar.gz

diff --git a/opam_1.0.0.orig.tar.gz.delta b/opam_1.0.0.orig.tar.gz.delta
new file mode 100644
index 000..919d780
Binary files /dev/null and b/opam_1.0.0.orig.tar.gz.delta differ
diff --git a/opam_1.0.0.orig.tar.gz.id b/opam_1.0.0.orig.tar.gz.id
new file mode 100644
index 000..5638f87
--- /dev/null
+++ b/opam_1.0.0.orig.tar.gz.id
@@ -0,0 +1 @@
+6b00623b0439339dff71e9b025a1c744ef5b6933

-- 
opam packaging

___
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] [SCM] opam packaging annotated tag, upstream/1.0.0, created. upstream/1.0.0

2013-04-06 Thread Mehdi Dogguy 
The annotated tag, upstream/1.0.0 has been created
at  303d18706af410e13c74b0a79f282ab157d7c3ea (tag)
   tagging  f647ee34f8ceea372c0b1a698b955c3ae33b7e7d (commit)
  replaces  upstream/0.9.0+deb1
 tagged by  Mehdi Dogguy
on  Sat Apr 6 12:15:57 2013 +0200

- Shortlog 
Upstream version 1.0.0

Mehdi Dogguy (1):
  Imported Upstream version 1.0.0

---

-- 
opam packaging

___
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