Changes in support of launchpad build

diff --git a/debian/changelog.in b/debian/changelog.in
index e338f704ea717faf836cc4ee284a5d88b356db7f..2d36fcd5da86d71096b9a0ed0a64692f8c0c6c94 100644 (file)
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,5 +1,11 @@
 graphviz (@VERSION@-1) intrepid; urgency=low
 
+  * Modified build scripts for Launchpad use
+
+ -- Dwight Perry <dperry@research.att.com>  Wed, 10 Oct 2012 13:07:00 -0400
+
+graphviz (2.18-1ubuntu5) intrepid; urgency=low
+
   * libcgraph API bump ->5
 
  -- John Ellson <ellson@research.att.com>  Tue, 19 Jan 2010 09:07:00 -0400

diff --git a/debian/control b/debian/control
index bdd8573de8b2e50cfcb4bb95a5ab9b95bc6a7ec8..59f3e3883097756e7c579b2e0fcc193a6fcd3175 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: graphics
 Priority: optional
 Maintainer: John Ellson <ellson@graphviz.org>
 Standards-Version: 3.7.3
-Build-Depends: tk8.5-dev, tcl8.5-dev, debhelper (>= 5), libfreetype6-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libxaw7-dev, bison, flex, autotools-dev, pdksh, libexpat1-dev, libfontconfig1-dev, libltdl3-dev, swig, libperl-dev, libgd2-noxpm-dev (>= 2.0.35), quilt (>= 0.40), groff-base, ghostscript, liblualib50-dev, ruby, ruby1.8-dev, php5-dev, php5-cli, ocaml-nox, python-dev, python-minimal, libcairo2-dev, libpango1.0-dev, guile-1.8-dev, d-shlibs, python-support, librsvg2-dev, libdevil-dev, libgts-dev, liblasi-dev, libtiff4-dev
+Build-Depends: tk-dev (>= 8.5), tcl-dev (>= 8.5), debhelper (>= 8), libfreetype6-dev, zlib1g-dev, libjpeg-dev, libpng12-dev, libxaw7-dev, bison, flex, autotools-dev, pdksh, libexpat1-dev, libfontconfig1-dev, libltdl3-dev, swig, libperl-dev, libgd2-noxpm-dev (>= 2.0.35), quilt (>= 0.40), groff-base, ghostscript, ruby, ruby1.8-dev, php5-dev, php5-cli, ocaml-nox, python-dev, python-minimal, libcairo2-dev, libpango1.0-dev, guile-1.8-dev, d-shlibs, librsvg2-dev, libtiff4-dev, libgtkglext1-dev, libglade2-dev, libgts-dev, freeglut3-dev, liblualib50-dev
 Homepage: http://www.graphviz.org/
 
 Package: graphviz
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gdtclft
 Suggests: msttcorefonts, gsfonts, graphviz-doc
 Description: rich set of graph drawing tools
@@ -37,7 +37,7 @@ Description: rich set of graph drawing tools
 Package: libgv-guile
 Architecture: any
 Section: interpreters
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Guile bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -47,7 +47,7 @@ Description: Guile bindings for graphviz
 Package: libgv-lua
 Architecture: any
 Section: interpreters
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Lua bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -57,7 +57,7 @@ Description: Lua bindings for graphviz
 Package: libgv-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -69,7 +69,7 @@ Description: OCaml bindings for graphviz
 Package: libgv-perl
 Architecture: any
 Section: perl
-Depends: ${perl:Depends}, ${shlibs:Depends}
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: graphviz (<< 2.12-1)
 Description: Perl bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
@@ -80,7 +80,7 @@ Description: Perl bindings for graphviz
 Package: libgv-php5
 Architecture: any
 Section: interpreters
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Php5 bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -90,7 +90,7 @@ Description: Php5 bindings for graphviz
 Package: libgv-python
 Architecture: any
 Section: interpreters
-Depends: ${shlibs:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Description: Python bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -100,7 +100,7 @@ Description: Python bindings for graphviz
 Package: libgv-ruby
 Architecture: any
 Section: interpreters
-Depends: ${shlibs:Depends}, ruby1.8
+Depends: ${shlibs:Depends}, ruby1.8, ${misc:Depends}
 Description: Ruby bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -111,7 +111,7 @@ Description: Ruby bindings for graphviz
 Package: libgv-tcl
 Architecture: any
 Section: interpreters
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: graphviz (<< 2.12-1)
 Description: Tcl bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
@@ -122,7 +122,7 @@ Description: Tcl bindings for graphviz
 Package: libgraphviz4
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: rich set of graph drawing tools
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -132,7 +132,7 @@ Description: rich set of graph drawing tools
 Package: libgraphviz-dev
 Architecture: any
 Section: libdevel
-Depends: libgraphviz4 (= ${binary:Version}), ${devlibs:Depends}
+Depends: libgraphviz4 (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends}
 Suggests: ocaml-base-nox-${F:OCamlABI}, ocaml-findlib
 Conflicts: graphviz-dev (<< 2.12-1), libgraphviz3-dev, libgraphviz4-dev (<< 2.16.3)
 Replaces: libgraphviz3-dev, libgraphviz4-dev (<< 2.16.3)
@@ -150,6 +150,7 @@ Description: graphviz libs and headers against which to build applications
 
 Package: graphviz-doc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Conflicts: graphviz (<< 2.12-1)
 Suggests: graphviz
@@ -162,7 +163,7 @@ Description: additional documentation for graphviz
 
 Package: graphviz-dev
 Architecture: all
-Depends: libgraphviz-dev
+Depends: libgraphviz-dev, ${misc:Depends}
 Description: transitional package for graphviz-dev rename
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.

diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index 020df96..13f67e2
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,7 @@ clean-patched:
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
 
        # Install the package into debian/tmp
@@ -256,7 +256,7 @@ binary-arch: build install
        dh_installman -a
        dh_installchangelogs ChangeLog -a
        dh_perl -a
-       dh_pysupport -a
+       dh_python2 -a
        dh_link -a
        dh_strip -a
        dh_compress -a