This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch experimental/master
in repository ocaml.
commit 09190fe9698559fc6690478849fa3e632d0755f6
Author: Stephane Glondu <st...@glondu.net>
Date: Tue Oct 21 12:14:13 2014 +0200
Remove references to labltk (now distributed separately)
---
debian/control | 5 -----
debian/control.in | 5 -----
debian/copyright | 5 -----
debian/ocaml-base.install.in | 1 -
debian/ocaml.install.in | 3 ---
debian/rules | 15 ---------------
6 files changed, 34 deletions(-)
diff --git a/debian/control b/debian/control
index a5ee39d..5df58ae 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,6 @@ Build-Depends:
autotools-dev,
binutils-dev,
libiberty-dev,
- tcl-dev,
- tk-dev,
libncurses5-dev,
bzip2,
dh-ocaml (>= 1.0.0~)
@@ -131,9 +129,6 @@ Depends:
libx11-dev
Provides:
${ocaml:Provides}
-Suggests:
- tcl-dev,
- tk-dev
Replaces: ocaml-nox (<< 3.11.0-2)
Description: ML language implementation with a class-based object system
Objective Caml (OCaml) is an implementation of the ML language, based on
diff --git a/debian/control.in b/debian/control.in
index 4657a5d..f2614a6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,8 +13,6 @@ Build-Depends:
quilt,
autotools-dev,
binutils-dev,
- tcl-dev,
- tk-dev,
libncurses5-dev,
bzip2,
dh-ocaml (>= 1.0.0~)
@@ -130,9 +128,6 @@ Depends:
libx11-dev
Provides:
${ocaml:Provides}
-Suggests:
- tcl-dev,
- tk-dev
Replaces: ocaml-nox (<< 3.11.0-2)
Description: ML language implementation with a class-based object system
Objective Caml (OCaml) is an implementation of the ML language, based on
diff --git a/debian/copyright b/debian/copyright
index 18ee6bc..7025c76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,11 +16,6 @@ Copyright: © 1996-2008 Institut National de Recherche en
Informatique et
en Automatique
License: QPL-1 | LGPL-2 | other
-Files: otherlibs/labltk/*
-Copyright: © 1999-2002 Institut National de Recherche en Informatique et
- en Automatique and Kyoto University
-License: LGPL-2 | other
-
Files: emacs/*
Copyright: © 1988-1991 Free Software Foundation
© 1996-1998 Institut National de Recherche en Informatique et
diff --git a/debian/ocaml-base.install.in b/debian/ocaml-base.install.in
index e1c05c2..26e6b49 100644
--- a/debian/ocaml-base.install.in
+++ b/debian/ocaml-base.install.in
@@ -1,4 +1,3 @@
- @OCamlDllDir@/dlllabltk.so
@OCamlDllDir@/dllgraphics.so
@OCamlStdlibDir@/graphics.cma
DYN: @OCamlStdlibDir@/graphics.cmxs
diff --git a/debian/ocaml.install.in b/debian/ocaml.install.in
index 26ebef4..195d4e8 100644
--- a/debian/ocaml.install.in
+++ b/debian/ocaml.install.in
@@ -1,6 +1,3 @@
- usr/bin/labltk
- usr/bin/ocamlbrowser
- @OCamlStdlibDir@/labltk
@OCamlStdlibDir@/libgraphics.a
STD: graphics.cmi
STD: graphics.cmx
diff --git a/debian/rules b/debian/rules
index ed1b060..07dd75e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,6 @@ CONFIGURE_OPTS := \
-libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \
-x11lib "$(shell pkg-config --variable=libdir x11)" \
-mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \
- -tkdefs "-I/usr/include/tcl" \
- -tklibs "-L/usr/lib -ltk -ltcl"
CONFIGURE_SED := \
-e "/LIBBFD_LINK/s%-lbfd%-Wl,-Bstatic -lbfd -Wl,-Bdynamic%" \
@@ -122,12 +120,6 @@ override_dh_auto_configure: config-stamp
config-stamp: pre-config-stamp ocamlinit-stamp
./configure $(CONFIGURE_OPTS)
sed -i $(CONFIGURE_SED) config/Makefile
- if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then \
- echo "Error, labltk library was not detected"; \
- echo "Check your tcl/tk development packages"; \
- echo "Aborting."; \
- exit 1; \
- fi
touch $@
.PHONY: override_dh_auto_build
@@ -138,8 +130,6 @@ build-stamp: config-stamp
cp -xa boot boot.debian; \
fi
rm -Rf debian/examples && mkdir debian/examples
- cp -a otherlibs/labltk/examples_labltk debian/examples/labltk
- find debian/examples/labltk -name .cvsignore -delete
ifeq ($(BUILDCACHE),)
$(MAKE) world
$(MAKE) bootstrap
@@ -227,7 +217,6 @@ endif
fi
# Install additional files not handled by dh_install
# Beware: dh_install does not handle renamings, please pay attention
- cp otherlibs/labltk/README
debian/ocaml/usr/share/doc/ocaml/README.labltk
for u in dumpobj; do \
if [ -f tools/$$u ]; then \
cp tools/$$u debian/ocaml-nox/usr/bin/ocaml$$u; \
@@ -245,10 +234,6 @@ endif
# Remaining stuff
touch $@
-.PHONY: override_dh_compress
-override_dh_compress:
- dh_compress -Xexamples/labltk
-
.PHONY: override_dh_gencontrol
override_dh_gencontrol:
for u in $(ALL_PACKAGES); do \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.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
