diff options
author | Romain Beauxis <toots@rastageeks.org> | 2013-05-15 17:19:47 +0200 |
---|---|---|
committer | Romain Beauxis <toots@rastageeks.org> | 2013-05-15 17:19:47 +0200 |
commit | 44a166e15f4db8b93c760e8d9c10c08e715d3b54 (patch) | |
tree | 990f4f8a868c516a6290081c2fcbc05d445e4568 |
Import gd4o_1.0~alpha5-8.debian.tar.gz
[dgit import tarball gd4o 1.0~alpha5-8 gd4o_1.0~alpha5-8.debian.tar.gz]
-rw-r--r-- | changelog | 58 | ||||
-rw-r--r-- | compat | 1 | ||||
-rw-r--r-- | control | 68 | ||||
-rw-r--r-- | copyright | 32 | ||||
-rw-r--r-- | libgd-ocaml-dev.docs | 2 | ||||
-rw-r--r-- | libgd-ocaml-dev.install.in | 4 | ||||
-rw-r--r-- | libgd-ocaml.install.in | 1 | ||||
-rw-r--r-- | patches/add_fpic_to_cflags.patch | 13 | ||||
-rw-r--r-- | patches/series | 2 | ||||
-rw-r--r-- | patches/support_custom_cflags.patch | 15 | ||||
-rwxr-xr-x | rules | 17 | ||||
-rw-r--r-- | source/format | 1 | ||||
-rw-r--r-- | watch | 3 |
13 files changed, 217 insertions, 0 deletions
diff --git a/changelog b/changelog new file mode 100644 index 0000000..f4332a2 --- /dev/null +++ b/changelog @@ -0,0 +1,58 @@ +gd4o (1.0~alpha5-8) unstable; urgency=low + + * Really fix #709853 + + -- Romain Beauxis <toots@rastageeks.org> Wed, 15 May 2013 10:19:47 -0500 + +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@rastageeks.org> Wed, 15 May 2013 09:19:41 -0500 + +gd4o (1.0~alpha5-6) unstable; urgency=low + + * Rebuild against new libgd. + * Replace xpm/noxpm packages with dummy + transitional packages. + * Bump standards version to 3.9.4 + + -- Romain Beauxis <toots@rastageeks.org> Tue, 14 May 2013 19:49:38 -0500 + +gd4o (1.0~alpha5-5) unstable; urgency=low + + * Team upload + * Build-Depend on libpng-dev instead of libpng12-dev (Closes: #662342) + + -- Stéphane Glondu <glondu@debian.org> Mon, 05 Mar 2012 21:28:19 +0100 + +gd4o (1.0~alpha5-4) unstable; urgency=low + + * Disable native build on archs without ocaml native compiler. + + -- Romain Beauxis <toots@rastageeks.org> Wed, 12 Oct 2011 02:11:37 +0200 + +gd4o (1.0~alpha5-3) unstable; urgency=low + + * Also build native library. + + -- Romain Beauxis <toots@rastageeks.org> Wed, 12 Oct 2011 01:12:02 +0200 + +gd4o (1.0~alpha5-2) unstable; urgency=low + + * Patched Makefile to pass -fPIC to CFLAGS. + * Added patch to support flags given through make + invocation. + * Added explicit build-deps on libs referenced in Makefile. + + -- Romain Beauxis <toots@rastageeks.org> Tue, 11 Oct 2011 18:51:33 +0200 + +gd4o (1.0~alpha5-1) unstable; urgency=low + + * Initial upload to sid (Closes: #644824) + + -- Romain Beauxis <toots@rastageeks.org> Sun, 09 Oct 2011 15:40:04 +0200 @@ -0,0 +1 @@ +7 @@ -0,0 +1,68 @@ +Source: gd4o +Section: ocaml +Priority: optional +Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org> +Uploaders: Samuel Mimram <smimram@debian.org>, Romain Beauxis <toots@rastageeks.org> +Build-Depends: + cdbs (>= 0.4.72~), + debhelper, + dh-buildinfo, + ocaml-nox, + dh-ocaml (>= 0.9), + libgd-dev, + ocaml-findlib (>= 1.2.4), + pkg-config +Standards-Version: 3.9.4 +Homepage: http://matt.gushee.net/software/gd4o/ +Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/gd4o.git +Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/gd4o.git + +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. + . + GD is a graphics library. It allows your code to quickly draw images + complete with lines, arcs, text, multiple colours, cut and paste from + other images, flood fills, and write out the result as a PNG file. + This is particularly useful in World Wide Web applications, where PNG is + one of the formats accepted for inline images by most browsers. + . + This package contains only the shared runtime stub libraries. + +Package: libgd-ocaml-dev +Architecture: any +Depends: ${ocaml:Depends}, + libgd-dev, + libgd-ocaml (= ${binary:Version}), ocaml-findlib, ${misc:Depends} +Provides: ${ocaml:Provides} +Description: OCaml interface to the GD library -- developpement files + This package provides an interface to the GD library for + OCaml programmers. + . + GD is a graphics library. It allows your code to quickly draw images + complete with lines, arcs, text, multiple colours, cut and paste from + other images, flood fills, and write out the result as a PNG file. + This is particularly useful in World Wide Web applications, where PNG is + one of the formats accepted for inline images by most browsers. + . + This package contains all the development stuff you need to develop + OCaml programs which use this module. + +Package: libgd-gd2-noxpm-ocaml +Architecture: all +Depends: libgd-ocaml +Description: OCaml interface to the GD library -- transitional package + This is a transitional dummy package to install libgd-gd2-noxpm-ocaml. + It can safely be removed. + +Package: libgd-gd2-noxpm-ocaml-dev +Architecture: all +Depends: libgd-ocaml-dev +Description: OCaml interface to the GD library -- transitional package + This is a transitional dummy package to install libgd-gd2-noxpm-ocaml-dev. + It can safely be removed. diff --git a/copyright b/copyright new file mode 100644 index 0000000..a4ca195 --- /dev/null +++ b/copyright @@ -0,0 +1,32 @@ +This package was debianized by Romain Beauxis <toots@rastageeks.org> on +Sun, 09 Oct 2011 15:40:04 +0200 + +It was downloaded from <http://matt.gushee.net/software/gd4o/> + +Upstream Author: Matt Gushee <gd4o@havenrock.com> + +Copyright © 2002 by Shawn Wagner +Copyright © 2003 by Matthew C. Gushee + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + +The Debian packaging is © 2011, Romain Beauxis <toots@rastageeks.org> and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'. diff --git a/libgd-ocaml-dev.docs b/libgd-ocaml-dev.docs new file mode 100644 index 0000000..f528701 --- /dev/null +++ b/libgd-ocaml-dev.docs @@ -0,0 +1,2 @@ +README +doc diff --git a/libgd-ocaml-dev.install.in b/libgd-ocaml-dev.install.in new file mode 100644 index 0000000..f3db488 --- /dev/null +++ b/libgd-ocaml-dev.install.in @@ -0,0 +1,4 @@ +@OCamlStdlibDir@/gd/META +@OCamlStdlibDir@/gd/*.cm* +@OCamlStdlibDir@/gd/*.ml* +@OCamlStdlibDir@/gd/*.a diff --git a/libgd-ocaml.install.in b/libgd-ocaml.install.in new file mode 100644 index 0000000..4581903 --- /dev/null +++ b/libgd-ocaml.install.in @@ -0,0 +1 @@ +@OCamlStdlibDir@/gd/dll*.so @OCamlDllDir@ diff --git a/patches/add_fpic_to_cflags.patch b/patches/add_fpic_to_cflags.patch new file mode 100644 index 0000000..04cd682 --- /dev/null +++ b/patches/add_fpic_to_cflags.patch @@ -0,0 +1,13 @@ +Index: gdo/Makefile +=================================================================== +--- gdo.orig/Makefile 2011-10-09 15:50:53.760602651 +0200 ++++ gdo/Makefile 2011-10-11 18:47:57.013045759 +0200 +@@ -26,7 +26,7 @@ + ifdef FT2_LIB + FT2_FLAG = -DHAVE_FREETYPE + endif +-CFLAGS = $(CINCLUDES) -W -Wall -Wno-unused \ ++CFLAGS = $(CINCLUDES) -fPIC -W -Wall -Wno-unused \ + $(JPEG_FLAG) $(FT2_FLAG) $(SAFETY_FLAG) + + OCAMLCFLAGS=-labels -unsafe diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..b0738b1 --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +add_fpic_to_cflags.patch +support_custom_cflags.patch diff --git a/patches/support_custom_cflags.patch b/patches/support_custom_cflags.patch new file mode 100644 index 0000000..92df800 --- /dev/null +++ b/patches/support_custom_cflags.patch @@ -0,0 +1,15 @@ +Index: gdo/Makefile +=================================================================== +--- gdo.orig/Makefile 2011-10-11 18:47:57.013045759 +0200 ++++ gdo/Makefile 2011-10-11 18:56:41.173056205 +0200 +@@ -26,8 +26,8 @@ + ifdef FT2_LIB + FT2_FLAG = -DHAVE_FREETYPE + endif +-CFLAGS = $(CINCLUDES) -fPIC -W -Wall -Wno-unused \ +- $(JPEG_FLAG) $(FT2_FLAG) $(SAFETY_FLAG) ++override CFLAGS += $(CINCLUDES) -fPIC -W -Wall -Wno-unused \ ++ $(JPEG_FLAG) $(FT2_FLAG) $(SAFETY_FLAG) + + OCAMLCFLAGS=-labels -unsafe + OCAMLOPTFLAGS=-labels -inline 2 @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/ocaml.mk + +DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) +# Do not compile dynlink files for now.. +DEB_MAKE_BUILD_TARGET := OCAML_DYNLINK="" all +DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore + +ifeq ($(OCAML_HAVE_OCAMLOPT),yes) + DEB_MAKE_BUILD_TARGET += opt +endif + +makebuilddir:: + mkdir -p $(DESTDIR) diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/^([\d.]+)a([\d.]+)$/$1~alpha$2/ \ +http://sf.net/gd4o/gd4o-(.+)\.tar\.gz |