[Pkg-ocaml-maint-commits] [SCM] gdo packaging branch, master, updated. debian/1.0_alpha5-6-2-gd912d07

[Romain Beauxis]

The following commit has been merged in the master branch:
commit d9352b3a038a1e7308ff3bc8fe674caa176ec01a
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed May 15 09:19:52 2013 -0500

    New upload.

diff --git a/Makefile.orig b/Makefile.orig
deleted file mode 100644
index f5463df..0000000
--- a/Makefile.orig
+++ /dev/null
@@ -1,63 +0,0 @@
-# You might have to change these.
-OCAMLC=ocamlc
-OCAMLOPT=ocamlopt
-OCAMLMKLIB=ocamlmklib
-OCAMLLIB=`$(OCAMLC) -where`
-CINCLUDES=-I$(OCAMLLIB) -I/usr/include 
-CC=gcc
-
-# If you don't have libjpeg, remove the -DHAVE_JPEG and -cclib -ljpeg parts of
-# the following lines.
-CFLAGS=$(CINCLUDES) -DHAVE_JPEG -W -Wall -Wno-unused
-LIBS=-lgd -lpng -lz -ljpeg
-OCAMLCFLAGS=-labels -unsafe
-OCAMLOPTFLAGS=-inline 1
-
-OPT_FILES=gd.cmxa
-INSTALL_FILES=gd.cmi gd.cma libocamlgd.a dllocamlgd.so
-
-.PHONY : all opt install install-opt clean realclean
-
-all: gd.cma gdtest
-
-opt: gd.cmxa gdtest.opt
-
-
-install: all
-	cp -f $(INSTALL_FILES) $(OCAMLLIB)
-
-install-opt: all
-	cp -f gd.cmxa libocamlgd.a $(OCAMLLIB)
-
-gd.cma: gd.cmi gd.cmo gdstubs.o
-	ocamlmklib -o gd gd.cmo gdstubs.o -oc ocamlgd $(LIBS)
-
-gd.cmxa: gd.cmi gd.cmx gdstubs.o
-	ocamlmklib -o gd gd.cmx gdstubs.o -oc ocamlgd $(LIBS)
-
-gd.cmx: gd.cmi gd.ml
-	$(OCAMLOPT) $(OCAMLCFLAGS) -c gd.ml
-
-gd.cmo: gd.cmi gd.ml
-	$(OCAMLC) $(OCAMLCFLAGS) -c gd.ml
-
-gd.cmi: gd.mli
-	$(OCAMLC) $(OCAMLCFLAGS) -c gd.mli
-
-gdtest: gd.cma gdtest.cmo
-	$(OCAMLC) -o gdtest -dllpath . gd.cma gdtest.cmo 
-
-gdtest.opt: gd.cmxa gdtest.ml
-	$(OCAMLOPT) $(OCAMLCFLAGS) -o gdtest.opt gd.cmxa gdtest.ml
-
-gdstubs.o: gdstubs.c
-	$(CC) $(CFLAGS) -c gdstubs.c
-
-gdtest.cmo: gd.cmi gdtest.ml
-	$(OCAMLC) $(OCAMLCFLAGS) -c gdtest.ml
-
-clean :
-	-rm -f *.cmi *.cmo *.cmx *.o
-
-realclean : clean
-	-rm -f *.a *.so *.cma *.cmxa
diff --git a/debian/changelog b/debian/changelog
index 5705d07..4013188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gd4o (1.0~alpha5-7) unstable; urgency=low
+
+  * Added BreaksL libgd-gd2-noxpm-ocaml (<< 1.0~alpha5-6~) 
+    to libgd-ocaml-dev.
+  Closes: #709858
+  * Added debian/tmp/usr/lib/ocaml to libgd-ocaml.dirs
+  Closes: #709853
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 15 May 2013 09:19:41 -0500
+
 gd4o (1.0~alpha5-6) unstable; urgency=low
 
   * Rebuild against new libgd.
diff --git a/debian/control b/debian/control
index b04b37c..db0c41e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: libgd-ocaml
 Architecture: any
 Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${ocaml:Provides}
+Breaks: libgd-gd2-noxpm-ocaml (<< 1.0~alpha5-6~)
 Description: OCaml interface to the GD library -- runtime files
  This package provides an interface to the GD library for
  OCaml programmers.
diff --git a/debian/libgd-ocaml.dirs b/debian/libgd-ocaml.dirs
new file mode 100644
index 0000000..18a6cae
--- /dev/null
+++ b/debian/libgd-ocaml.dirs
@@ -0,0 +1 @@
+debian/tmp/usr/lib/ocaml

-- 
gdo packaging