New upload, following libgd transition.

7 files changed, 29 insertions, 77 deletions

diff --git a/debian/changelog b/debian/changelog
index 14ff051..5705d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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
diff --git a/debian/control b/debian/control
index dbf30a7..b04b37c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,18 +9,15 @@ Build-Depends:
  dh-buildinfo,
  ocaml-nox,
  dh-ocaml (>= 0.9), 
- libgd2-noxpm-dev,
- libjpeg8-dev,
- libfreetype6-dev,
- libpng-dev, 
+ libgd-dev,
  ocaml-findlib (>= 1.2.4), 
  pkg-config
-Standards-Version: 3.9.2
+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-gd2-noxpm-ocaml
+Package: libgd-ocaml
 Architecture: any
 Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${ocaml:Provides}
@@ -34,16 +31,13 @@ Description: OCaml interface to the GD library -- runtime files
  This is particularly useful in World Wide Web applications, where PNG is
  one of the formats accepted for inline images by most browsers.
  .
- This is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
  This package contains only the shared runtime stub libraries.
 
-Package: libgd-gd2-noxpm-ocaml-dev
+Package: libgd-ocaml-dev
 Architecture: any
 Depends: ${ocaml:Depends}, 
-         libgd2-noxpm-dev, 
-         libgd-gd2-noxpm-ocaml (= ${binary:Version}), ocaml-findlib, ${misc: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
@@ -55,8 +49,19 @@ Description: OCaml interface to the GD library -- developpement files
  This is particularly useful in World Wide Web applications, where PNG is
  one of the formats accepted for inline images by most browsers.
  .
- This is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
  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/debian/control.in b/debian/control.in
deleted file mode 100644
index d1d3887..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,58 +0,0 @@
-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@, 
- libgd2-noxpm-dev,
- libjpeg8-dev,
- libfreetype6-dev,
- libpng12-dev, 
- ocaml-findlib (>= 1.2.4), 
- pkg-config
-Standards-Version: 3.9.2
-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-gd2-noxpm-ocaml
-Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${ocaml:Provides}
-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 is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
- This package contains only the shared runtime stub libraries.
-
-Package: libgd-gd2-noxpm-ocaml-dev
-Architecture: any
-Depends: ${ocaml:Depends}, 
-         libgd2-noxpm-dev, 
-         libgd-gd2-noxpm-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 is the full development version of the library, built without XPM
- (X pixmap) or fontconfig support.
- .
- This package contains all the development stuff you need to develop
- OCaml programs which use this module.
diff --git a/debian/libgd-gd2-noxpm-ocaml-dev.docs b/debian/libgd-ocaml-dev.docs
index f528701..f528701 100644
--- a/debian/libgd-gd2-noxpm-ocaml-dev.docs
+++ b/debian/libgd-ocaml-dev.docs
diff --git a/debian/libgd-gd2-noxpm-ocaml-dev.install.in b/debian/libgd-ocaml-dev.install.in
index f3db488..f3db488 100644
--- a/debian/libgd-gd2-noxpm-ocaml-dev.install.in
+++ b/debian/libgd-ocaml-dev.install.in
diff --git a/debian/libgd-gd2-noxpm-ocaml.install.in b/debian/libgd-ocaml.install.in
index 4581903..4581903 100644
--- a/debian/libgd-gd2-noxpm-ocaml.install.in
+++ b/debian/libgd-ocaml.install.in
diff --git a/debian/rules b/debian/rules
index c74d402..ee192df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
-# In order to regenerate 'debian/control' :
-#   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
-# Then check manually if everything's ok
-
 DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 # Do not compile dynlink files for now..
 DEB_MAKE_BUILD_TARGET := OCAML_DYNLINK="" all