[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. upstream/4.00.1_20130426-20-gec7128c

2013-03-27 Thread Romain Beauxis
The following commit has been merged in the master branch:
commit 2b14db25677e474239983867067a7e401b13655b
Author: Romain Beauxis to...@rastageeks.org
Date:   Wed Mar 27 06:16:20 2013 -0500

Change binary dir to bindir to avoid makefile issues.

diff --git a/debian/rules b/debian/rules
index 9ad4182..7567bab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,19 @@
 # -*- makefile -*-
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+BINARY_DIR:= $(CURDIR)/bindir
 
 override_dh_auto_build:
rm -rf .pc build patches stamp-*
-   make MINGW_HOST=i686-w64-mingw32
+   mkdir -p $(BINARY_DIR)
+   make BINARY_DIR=$(BINARY_DIR) MINGW_HOST=i686-w64-mingw32
 ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
rm -rf .pc build patches stamp-*
-   make MINGW_HOST=x86_64-w64-mingw32
+   make BINARY_DIR=$(BINARY_DIR) MINGW_HOST=x86_64-w64-mingw32
 endif
 
 override_dh_auto_install:
-   make install INSTALL_DIR=$(CURDIR)/debian/tmp
+   make install BINARY_DIR=$(BINARY_DIR) INSTALL_DIR=$(CURDIR)/debian/tmp

 override_dh_auto_clean:
make clean

-- 
mingw32-ocaml 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] mingw32-ocaml packaging branch, master, updated. upstream/4.00.1_20130426-20-gec7128c

2013-03-27 Thread Romain Beauxis
The following commit has been merged in the master branch:
commit a73ef2f453f308e30f5f74e1226737750cffe336
Author: Romain Beauxis to...@rastageeks.org
Date:   Wed Mar 27 07:44:23 2013 -0500

Fix clean.

diff --git a/debian/rules b/debian/rules
index 7567bab..8edf6ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_install:
make install BINARY_DIR=$(BINARY_DIR) INSTALL_DIR=$(CURDIR)/debian/tmp

 override_dh_auto_clean:
-   make clean
+   make clean BINARY_DIR=$(BINARY_DIR)
rm -rf debian/*.log
 
 override_dh_strip:

-- 
mingw32-ocaml 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] mingw32-ocaml packaging branch, master, updated. upstream/4.00.1_20130426-20-gec7128c

2013-03-27 Thread Romain Beauxis
The following commit has been merged in the master branch:
commit 77805d7a023964b7dfbf678caf591b10cf08b531
Author: Romain Beauxis to...@rastageeks.org
Date:   Wed Mar 27 07:43:24 2013 -0500

Fix lintian warnings.

diff --git a/debian/control b/debian/control
index 98e8132..9604f0f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
 Uploaders: Romain Beauxis to...@rastageeks.org
-Build-Depends: debhelper (= 7), quilt, mingw-w64, gcc-multilib [amd64 
kfreebsd-amd64], 
+Build-Depends: debhelper (= = 7.0.50~), quilt, mingw-w64, gcc-multilib 
[amd64 kfreebsd-amd64], 
ocaml-nox, camlp4, m4
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
diff --git a/debian/flexdll.lintian-overrides b/debian/flexdll.lintian-overrides
new file mode 100644
index 000..efc8782
--- /dev/null
+++ b/debian/flexdll.lintian-overrides
@@ -0,0 +1,7 @@
+flexdll: hardening-no-relro usr/lib/flexdll/flexlink.exe
+flexdll: hardening-no-fortify-functions usr/lib/flexdll/flexlink.exe
+flexdll: binary-without-manpage usr/bin/flexlink
+flexdll: executable-not-elf-or-script usr/lib/flexdll/flexdll_mingw64.o
+flexdll: executable-not-elf-or-script usr/lib/flexdll/flexdll_initer_mingw.o
+flexdll: executable-not-elf-or-script usr/lib/flexdll/flexdll_mingw.o
+flexdll: executable-not-elf-or-script usr/lib/flexdll/flexdll_initer_mingw64.o
diff --git a/debian/ocaml-mingw-w64-i686.lintian-overrides 
b/debian/ocaml-mingw-w64-i686.lintian-overrides
index 96defd2..7d0ee3e 100644
--- a/debian/ocaml-mingw-w64-i686.lintian-overrides
+++ b/debian/ocaml-mingw-w64-i686.lintian-overrides
@@ -1,5 +1,6 @@
 ocaml-mingw-w64-i686: hardening-no-relro usr/bin/i686-w64-mingw32-ocamlrun
 ocaml-mingw-w64-i686: hardening-no-fortify-functions 
usr/bin/i686-w64-mingw32-ocamlrun
+ocaml-mingw-w64-i686: ocaml-custom-executable usr/bin/i686-w64-mingw32-ocamlrun
 ocaml-mingw-w64-i686: non-standard-dir-in-usr usr/i686-w64-mingw32/
 ocaml-mingw-w64-i686: file-in-unusual-dir 
usr/i686-w64-mingw32/lib/ocaml/arg.cmi
 ocaml-mingw-w64-i686: file-in-unusual-dir 
usr/i686-w64-mingw32/lib/ocaml/arg.cmx
diff --git a/debian/ocaml-mingw-w64-x86-64.lintian-overrides 
b/debian/ocaml-mingw-w64-x86-64.lintian-overrides
index 355e2bb..63f9bbb 100644
--- a/debian/ocaml-mingw-w64-x86-64.lintian-overrides
+++ b/debian/ocaml-mingw-w64-x86-64.lintian-overrides
@@ -1,5 +1,6 @@
 ocaml-mingw-w64-x86-64: hardening-no-relro usr/bin/x86_64-w64-mingw32-ocamlrun
 ocaml-mingw-w64-x86-64: hardening-no-fortify-functions 
usr/bin/x86_64-w64-mingw32-ocamlrun
+ocaml-mingw-w64-x86-64: ocaml-custom-executable 
usr/bin/x86_64-w64-mingw32-ocamlrun
 ocaml-mingw-w64-x86-64: non-standard-dir-in-usr usr/x86_64-w64-mingw32/
 ocaml-mingw-w64-x86-64: file-in-unusual-dir 
usr/x86_64-w64-mingw32/lib/ocaml/arg.cmi
 ocaml-mingw-w64-x86-64: file-in-unusual-dir 
usr/x86_64-w64-mingw32/lib/ocaml/arg.cmx

-- 
mingw32-ocaml 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] mingw32-ocaml packaging branch, master, updated. upstream/4.00.1_20130426-20-gec7128c

2013-03-27 Thread Romain Beauxis
The following commit has been merged in the master branch:
commit 6881f7d260b548a55e2e396d44a58d5b2d0e2b40
Author: Romain Beauxis to...@rastageeks.org
Date:   Tue Mar 26 21:16:12 2013 -0500

Fixe binary target.

diff --git a/debian/rules b/debian/rules
index 9ad4182..8c9c444 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@ ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
rm -rf .pc build patches stamp-*
make MINGW_HOST=x86_64-w64-mingw32
 endif
-
-override_dh_auto_install:
make install INSTALL_DIR=$(CURDIR)/debian/tmp

 override_dh_auto_clean:

-- 
mingw32-ocaml 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] mingw32-ocaml packaging branch, master, updated. upstream/4.00.1_20130426-20-gec7128c

2013-03-27 Thread Romain Beauxis
The following commit has been merged in the master branch:
commit ec7128c081a77876eac130610a1524692e2ca6c7
Author: Romain Beauxis to...@rastageeks.org
Date:   Wed Mar 27 07:45:05 2013 -0500

fix typo.

diff --git a/debian/control b/debian/control
index 9604f0f..b2670ce 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org
 Uploaders: Romain Beauxis to...@rastageeks.org
-Build-Depends: debhelper (= = 7.0.50~), quilt, mingw-w64, gcc-multilib 
[amd64 kfreebsd-amd64], 
+Build-Depends: debhelper (= 7.0.50~), quilt, mingw-w64, gcc-multilib [amd64 
kfreebsd-amd64], 
ocaml-nox, camlp4, m4
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git

-- 
mingw32-ocaml 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] mingw32-ocaml packaging annotated tag, upstream/4.00.1_20130426, updated. upstream/4.00.1_20130426

2013-03-27 Thread Romain Beauxis
The annotated tag, upstream/4.00.1_20130426 has been updated
to  a998786395957df094036e599d771619763e39bb (tag)
  from  61643b2747d0d7c20670c2b12e52289209ce39ca (which is now obsolete)
   tagging  ed85e0e825149503e68c708388cbb3eda233e038 (commit)
 tagged by  Romain Beauxis
on  Tue Mar 26 15:37:23 2013 -0500

- Shortlog 
Upstream version 4.00.1~20130426

Romain Beauxis (4):
  Initial upstream branch
  Imported Upstream version 4.00.1~20130426
  Imported Upstream version 4.00.1~20130426
  Imported Upstream version 4.00.1~20130426

---

-- 
mingw32-ocaml 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] mingw32-ocaml packaging annotated tag, debian/4.00.1_20130426-1, created. debian/4.00.1_20130426-1

2013-03-27 Thread Romain Beauxis
The annotated tag, debian/4.00.1_20130426-1 has been created
at  3fa1680b863814551a301de2dd2b4e1274f1d706 (tag)
   tagging  ec7128c081a77876eac130610a1524692e2ca6c7 (commit)
  replaces  upstream/4.00.1_20130426
 tagged by  Romain Beauxis
on  Wed Mar 27 09:21:33 2013 -0500

- Shortlog 
Debian release 4.00.1~20130426-1

Romain Beauxis (61):
  Initial package..
  Fixed mingw32-specific include
  Fixed mingw32-specific include
  Fixed build-deps
  Moved library files to /usr/leonard/lib/ocaml, as for mingw32-runtime..
  Added ocamlfind support
  Build bigarray with win32 mmap implementation
  Fixed threads lib and other stuff
  Run ranlib on threads static libs
  More fixes..
  Fixed flexlink path
  Added ocaml-findlib in Depends:
  Added m4 to build-dep
  Added campl4 in build-dep
  Fixed or overriden relevant lintian issues
  Added debian/copyright, set package version to something relevant..
  Removed an wrong space in DEB_TAR_SRCDIR in debian/rules
  Added README.Debian
  Symlink manuals for the ocaml cross-compiler binaries to the original 
manuals.
  Added patch from Jerome Vouillon
  added a patch to display Win32 as the os_type when invoking ocamlc -config
  Added pkg-config case in README.Debian
  Updated to ocaml 3.11.2
  Forgot this one..
  Ship a custom ocamlrun
  Added hurd-i386 kfreebsd-amd64 kfreebsd-i386
  Fixed build-dep on kfreebsd-amd64, removed hurd-i386 from the arch
  Added fixes from Pierre Letouzey
  Added another patch from Pierre Letouze
  Updated package to ocaml 3.12.0+beta1..
  Prepared 3.12.0+debian1
  set distribution to experimental..
  Upload ready!
  Prepared new upload..
  Fixed camlp4 information..
  Added patch fixing fd leak with win32.
  Prepared new upload.
  Fixed lintian warnings.
  Fixed upgrade path from squeeze to wheezy.
  Imported Debian version 3.12.1+debian2
  Fixed upgrade path from squeeze to wheezy.
  Merge remote-tracking branch 'origin/master'
  Removed upstream tarballs.
  Initial upstream branch.
  Imported Upstream version 4.00.1+debian1
  Merge tag 'upstream/4.00.1+debian1'
  Updated package.
  Merge tag 'upstream/4.00.1_20130426'
  Updated package.
  Merge remote-tracking branch 'origin/master'
  Updated descriptions.
  Merge tag 'upstream/4.00.1_20130426'
  Also cleanup this.
  Merge tag 'upstream/4.00.1_20130426'
  Updated debian/copyright.
  Fixe binary target.
  Revert Fixe binary target.
  Change binary dir to bindir to avoid makefile issues.
  Fix lintian warnings.
  Fix clean.
  fix typo.

---

-- 
mingw32-ocaml 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