starting to configure the debian control files

diff --git a/Makefile.am b/Makefile.am
index 04319a7ffbbc09a56c7f24ee21a0b7451bd75836..f91d9ee84a6caf0785ac72c145693a94d0f825e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,12 +35,16 @@ EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
        graphviz.7 Doxyfile.in Doxyfile makearch features awk \
        config/config_perl.pl config/config_python.py \
        config/config_ruby.rb config/config_tcl.tcl dot.demo \
-       macosx windows
+       macosx windows debian
 
 .PHONY: rpm
 rpm: dist
        rpmbuild -ta graphviz-@VERSION@.tar.gz
        
+.PHONY: deb
+deb: dist
+       true
+       
 .PHONY: pkg
 pkg: dist
        tar xzf graphviz-@VERSION@.tar.gz && make -C graphviz-@VERSION@/macosx/build && mv graphviz-@VERSION@/macosx/build/graphviz-*.pkg .

diff --git a/configure.ac b/configure.ac
index c53816ff3e3be3eead1062fed48adf60611e9530..3de3bd55f6d38b74fbf20a1f3cf3e064210a7a09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ dnl For the micro number: 0 => in-progress development (from cvs)
 dnl                       timestamp => tar-file snapshot or release
 m4_define(graphviz_version_major, 2)
 m4_define(graphviz_version_minor, 21)
+#NB: the next line gets changed to a date/time string for development releases
 m4_define(graphviz_version_micro, 0)
 
 AC_INIT([graphviz],
@@ -23,8 +24,12 @@ AC_SUBST(GRAPHVIZ_VERSION_MAJOR)
 AC_SUBST(GRAPHVIZ_VERSION_MINOR)
 AC_SUBST(GRAPHVIZ_VERSION_MICRO)
 
+#NB: "development" on the next line gets changed to "stable" when building a release
 GRAPHVIZ_COLLECTION=development
+
+GRAPHVIZ_SOURCES=graphviz/$GRAPHVIZ_COLLECTION/SOURCES
 AC_SUBST(GRAPHVIZ_COLLECTION)
+AC_SUBST(GRAPHVIZ_SOURCES)
 
 dnl ===========================================================================
 
@@ -2931,6 +2936,7 @@ AC_CONFIG_FILES(Makefile
        share/icons/Makefile
        share/gui/Makefile
        graphviz.spec
+       debian/control
        Doxyfile
        )
 

diff --git a/debian/.cvsignore b/debian/.cvsignore
new file mode 100644 (file)
index 0000000..5201327
--- /dev/null
+++ b/debian/.cvsignore
@@ -0,0 +1,2 @@
+control
+watch

diff --git a/debian/control.in b/debian/control.in
index 12a64624ca01b2168ce2df817ae9762d23264b03..c23deacf7ffea3b80d21de6377b6d182552b13ce 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,8 +5,6 @@ Maintainer: John Ellson <ellson@graphviz.org>
 XSBC-Original-Maintainer: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
 Standards-Version: @VERSION@
 Build-Depends: 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
-Vcs-Git: git://git.debian.org/git/collab-maint/graphviz.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/graphviz.git
 Homepage: http://www.graphviz.org/
 
 Package: graphviz
@@ -73,7 +71,7 @@ Package: libgv-perl
 Architecture: any
 Section: perl
 Depends: ${perl:Depends}, ${shlibs:Depends}
-Conflicts: graphviz (<< 2.12-1)
+Conflicts: graphviz (<< @VERSION@-1)
 Description: Perl bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
@@ -115,12 +113,12 @@ Package: libgv-tcl
 Architecture: any
 Section: interpreters
 Depends: ${shlibs:Depends}
-Conflicts: graphviz (<< 2.12-1)
+Conflicts: graphviz (<< @VERSION@-1)
 Description: Tcl bindings for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz
  package for a full description.
  .
- This package contains the Tcl (8.4) bindings.
+ This package contains the Tcl (8.5) bindings.
 
 Package: libgraphviz4
 Architecture: any
@@ -137,7 +135,7 @@ Architecture: any
 Section: libdevel
 Depends: libgraphviz4 (= ${binary:Version}), ${devlibs:Depends}
 Suggests: ocaml-base-nox-${F:OCamlABI}, ocaml-findlib
-Conflicts: graphviz-dev (<< 2.12-1), libgraphviz3-dev, libgraphviz4-dev (<< 2.16-3)
+Conflicts: graphviz-dev (<< @VERSION@), libgraphviz3-dev, libgraphviz4-dev (<< 2.16-3)
 Replaces: libgraphviz3-dev, libgraphviz4-dev (<< 2.16-3)
 Provides: graphviz-dev
 Description: graphviz libs and headers against which to build applications
@@ -154,7 +152,7 @@ Description: graphviz libs and headers against which to build applications
 Package: graphviz-doc
 Architecture: all
 Section: doc
-Conflicts: graphviz (<< 2.12-1)
+Conflicts: graphviz (<< @VERSION@-1)
 Suggests: graphviz
 Description: additional documentation for graphviz
  Graphviz is a set of graph drawing tools. See the description of the graphviz

diff --git a/debian/watch b/debian/watch
deleted file mode 100644 (file)
index 7558805..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Site      Directory       Pattern         Version Script
-version=3
-http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-([0-9.]+)\.tar\.gz