[Pkg-ocaml-maint-commits] r2831 - in
/trunk/packages/ocaml/trunk/debian: changelog control control.in
ocaml-base-nox.docs ocaml-base.postinst ocaml-base.prerm
ocaml-nox.postinst.in ocaml-nox.prerm ocaml.postinst ocaml.prerm
ocaml_packaging_policy policy/ rules
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Fri Jun 16 08:33:20 UTC 2006
Author: smimram
Date: Fri Jun 16 08:33:18 2006
New Revision: 2831
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2831
Log:
Integrate the packaging policy to the package.
Added:
trunk/packages/ocaml/trunk/debian/policy/
- copied from r2825, trunk/policy/trunk/
Removed:
trunk/packages/ocaml/trunk/debian/ocaml_packaging_policy
Modified:
trunk/packages/ocaml/trunk/debian/changelog
trunk/packages/ocaml/trunk/debian/control
trunk/packages/ocaml/trunk/debian/control.in
trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs
trunk/packages/ocaml/trunk/debian/ocaml-base.postinst
trunk/packages/ocaml/trunk/debian/ocaml-base.prerm
trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in
trunk/packages/ocaml/trunk/debian/ocaml-nox.prerm
trunk/packages/ocaml/trunk/debian/ocaml.postinst
trunk/packages/ocaml/trunk/debian/ocaml.prerm
trunk/packages/ocaml/trunk/debian/rules
Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Fri Jun 16 08:33:18 2006
@@ -1,9 +1,15 @@
-ocaml (3.09.2-3+SVN) UNRELEASED; urgency=low
-
+ocaml (3.09.2-4) UNRELEASED; urgency=low
+
+ [ Julien Cristau ]
* Update reference to upstream tarball location in debian/copyright.
* Actually apply the patch to fix the stdlib manpages' section.
- -- Julien Cristau <julien.cristau at ens-lyon.org> Thu, 18 May 2006 10:44:52 +0200
+ [ Samuel Mimram ]
+ * Integrate the ocaml policy in the package. Added a build dependency on
+ docbook-utils to build it.
+ * We don't need to remove rpaths anymore.
+
+ -- Samuel Mimram <smimram at debian.org> Thu, 15 Jun 2006 12:26:19 +0000
ocaml (3.09.2-3) unstable; urgency=low
Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Fri Jun 16 08:33:18 2006
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, chrpath
+Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-utils
Standards-Version: 3.7.2
Package: ocaml-nox
Modified: trunk/packages/ocaml/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control.in?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control.in (original)
+++ trunk/packages/ocaml/trunk/debian/control.in Fri Jun 16 08:33:18 2006
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, chrpath
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-utils
+Standards-Version: 3.7.2
Package: ocaml-nox
Architecture: any
Modified: trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base-nox.docs Fri Jun 16 08:33:18 2006
@@ -1,3 +1,4 @@
Changes
README
-debian/ocaml_packaging_policy
+debian/policy/ocaml_packaging_policy.txt
+debian/policy/packaging-policy-html
Modified: trunk/packages/ocaml/trunk/debian/ocaml-base.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-base.postinst?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base.postinst (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base.postinst Fri Jun 16 08:33:18 2006
@@ -2,6 +2,7 @@
ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base
ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base
-ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base
+ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz /usr/share/doc/ocaml-base
+ln -sf ../ocaml-base-nox/packaging-policy-html /usr/share/doc/ocaml-base
#DEBHELPER#
Modified: trunk/packages/ocaml/trunk/debian/ocaml-base.prerm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-base.prerm?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base.prerm (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base.prerm Fri Jun 16 08:33:18 2006
@@ -2,6 +2,7 @@
rm -f /usr/share/doc/ocaml-base/Changes.gz
rm -f /usr/share/doc/ocaml-base/README.gz
-rm -f /usr/share/doc/ocaml-base/ocaml_packaging_policy.gz
+rm -f /usr/share/doc/ocaml-base/ocaml_packaging_policy.txt.gz
+rm -f /usr/share/doc/ocaml-base/packaging-policy
#DEBHELPER#
Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst.in Fri Jun 16 08:33:18 2006
@@ -4,7 +4,8 @@
ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-nox
ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-nox
-ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-nox
+ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz /usr/share/doc/ocaml-nox
+ln -sf ../ocaml-base-nox/packaging-policy-html /usr/share/doc/ocaml-nox
if [ "$1" = "configure" ]; then
ocaml-md5sums update
Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.prerm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.prerm?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.prerm (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.prerm Fri Jun 16 08:33:18 2006
@@ -2,6 +2,7 @@
rm -f /usr/share/doc/ocaml-nox/Changes.gz
rm -f /usr/share/doc/ocaml-nox/README.gz
-rm -f /usr/share/doc/ocaml-nox/ocaml_packaging_policy.gz
+rm -f /usr/share/doc/ocaml-nox/ocaml_packaging_policy.txt.gz
+rm -f /usr/share/doc/ocaml-nox/packaging-policy-html
#DEBHELPER#
Modified: trunk/packages/ocaml/trunk/debian/ocaml.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.postinst?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.postinst (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.postinst Fri Jun 16 08:33:18 2006
@@ -1,9 +1,10 @@
#!/bin/sh -e
-ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base
-ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base
-ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base
-ln -sf ../ocaml-base-nox/README.Debian /usr/share/doc/ocaml-base
+ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml
+ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml
+ln -sf ../ocaml-base-nox/README.Debian /usr/share/doc/ocaml
+ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz /usr/share/doc/ocaml
+ln -sf ../ocaml-base-nox/packaging-policy-html /usr/share/doc/ocaml
if [ "$1" = "configure" ]; then
ocaml-md5sums update
Modified: trunk/packages/ocaml/trunk/debian/ocaml.prerm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml.prerm?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml.prerm (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml.prerm Fri Jun 16 08:33:18 2006
@@ -2,6 +2,7 @@
rm -f /usr/share/doc/ocaml/Changes.gz
rm -f /usr/share/doc/ocaml/README.gz
-rm -f /usr/share/doc/ocaml/ocaml_packaging_policy.gz
+rm -f /usr/share/doc/ocaml/ocaml_packaging_policy.txt.gz
+rm -f /usr/share/doc/ocaml/packaging-policy-html
#DEBHELPER#
Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=2831&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Fri Jun 16 08:33:18 2006
@@ -105,6 +105,7 @@
else \
$(MAKE) -C debian/ocaml-md5sums all; \
fi
+ $(MAKE) -C debian/policy
touch build-arch-stamp
build-indep: build-indep-stamp
@@ -126,6 +127,7 @@
fi
-$(MAKE) -C emacs clean
-$(MAKE) -C debian/ocaml-md5sums clean
+ -$(MAKE) -C debian/policy clean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-cp -f /usr/share/misc/config.sub config/gnu/config.sub
endif
@@ -229,11 +231,6 @@
typing/*.o parsing/*.cmx parsing/*.o \
$(CURDIR)/debian/ocaml-compiler-libs/usr/lib/ocaml/$(OCAMLABI)/compiler-libs; \
fi
-
- # Delete rpath in DLLs
- chrpath -d $(CURDIR)/debian/ocaml-base/usr/lib/ocaml/$(OCAMLABI)/stublibs/dllgraphics.so \
- $(CURDIR)/debian/ocaml-base/usr/lib/ocaml/$(OCAMLABI)/stublibs/dlllabltk.so \
- $(CURDIR)/debian/ocaml-base/usr/lib/ocaml/$(OCAMLABI)/stublibs/dlltkanim.so
# install ocaml-md5sums
$(MAKE) -C debian/ocaml-md5sums install DESTDIR=$(CURDIR)/debian/ocaml-base-nox/usr/bin
More information about the Pkg-ocaml-maint-commits
mailing list