[DebianGIS-dev] CVS Update: pkg-grass/debian changelog control
grass-doc.dirs grass-doc.install rules
frankie at haydn.debian.org
frankie at haydn.debian.org
Tue Mar 14 15:02:46 UTC 2006
User: frankie
Date: 06/03/14 15:02:45
Modified: debian changelog control grass-doc.dirs grass-doc.install
rules
Log:
Preparing for 6.0.2
Revision Changes Path
1.42 +15 -0 pkg-grass/debian/changelog
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/changelog?annotate=1.42&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/changelog?rev=1.42&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/changelog.diff?r1=1.42&r2=1.41&cvsroot=
-----------------------------------
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-grass/pkg-grass/debian/changelog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- changelog 23 Feb 2006 16:14:02 -0000 1.41
+++ changelog 14 Mar 2006 15:02:44 -0000 1.42
@@ -1,3 +1,18 @@
+grass (6.0.2-1) unstable; urgency=low
+
+ [ Francesco Paolo Lovergine ]
+
+ * New upstream release
+ (closes: #328519)
+ * Removed configure.in.dpatch, merged upstream.
+ * Now generates programming manual by doxygen and dot.
+ Added graphviz build-dep in debian/control.
+ Resulting files belongs to grass-doc.
+ * Rules file revised to clean doxygen doc properly.
+ * Targets revised in rules to adopt a more clean schema of dependencies.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 23 Feb 2006 10:42:54 +0100
+
grass (6.0.1-4) unstable; urgency=low
[ Steve Halasz ]
1.30 +5 -5 pkg-grass/debian/control
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/control?annotate=1.30&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/control?rev=1.30&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/control.diff?r1=1.30&r2=1.29&cvsroot=
-----------------------------------
Index: control
===================================================================
RCS file: /cvsroot/pkg-grass/pkg-grass/debian/control,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- control 23 Feb 2006 16:14:02 -0000 1.29
+++ control 14 Mar 2006 15:02:44 -0000 1.30
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Steve Halasz <debian at adkgis.org>
-Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 4.0.2), dpatch, libtiff4-dev, tcl8.3-dev, tk8.3-dev, fftw-dev, libxmu-dev,xlibmesa-gl-dev, libglu1-xorg-dev | xlibmesa-glu-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-1.3.1-dev, proj (>= 4.4.7), libjpeg62-dev, libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev | libmysqlclient14-dev
+Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 4.0.2), dpatch, libtiff4-dev, tcl8.3-dev, tk8.3-dev, fftw-dev, libxmu-dev, xlibmesa-gl-dev, libglu1-xorg-dev | xlibmesa-glu-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-1.3.1-dev, proj (>= 4.4.7), libjpeg62-dev, libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev | libmysqlclient14-dev, graphviz
Standards-Version: 3.6.2
Package: grass
@@ -19,7 +19,7 @@
settings around the world, as well as by many government agencies
and environmental consulting companies.
.
- Homepage: http://grass.itc.it
+ Homepage: http://grass.itc.it
Package: grass-doc
Section: science
@@ -34,7 +34,7 @@
.
This package contains HTML documentation for the GRASS system.
.
- Homepage: http://grass.itc.it/gdp/
+ Homepage: http://grass.itc.it/gdp/
Package: libgrass
Section: libs
@@ -51,7 +51,7 @@
These libraries provide the means to access and manipulate GRASS
data sets.
.
- Homepage: http://grass.itc.it
+ Homepage: http://grass.itc.it
Package: libgrass-dev
Section: libdevel
@@ -69,4 +69,4 @@
Install this package if you wish to develop software that manipulates
GRASS data sets.
.
- Homepage: http://grass.itc.it
+ Homepage: http://grass.itc.it
1.4 +2 -0 pkg-grass/debian/grass-doc.dirs
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/grass-doc.dirs?annotate=1.4&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/grass-doc.dirs?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/grass-doc.dirs.diff?r1=1.4&r2=1.3&cvsroot=
-----------------------------------
Index: grass-doc.dirs
===================================================================
RCS file: /cvsroot/pkg-grass/pkg-grass/debian/grass-doc.dirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grass-doc.dirs 12 Sep 2005 07:30:36 -0000 1.3
+++ grass-doc.dirs 14 Mar 2006 15:02:44 -0000 1.4
@@ -1,2 +1,4 @@
usr/share/doc/grass-doc
+usr/share/doc/grass-doc/programming-manual
+usr/share/doc/grass-doc/programming-manual/html
usr/share/man
1.6 +3 -0 pkg-grass/debian/grass-doc.install
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/grass-doc.install?annotate=1.6&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/grass-doc.install?rev=1.6&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/grass-doc.install.diff?r1=1.6&r2=1.5&cvsroot=
-----------------------------------
Index: grass-doc.install
===================================================================
RCS file: /cvsroot/pkg-grass/pkg-grass/debian/grass-doc.install,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grass-doc.install 20 Feb 2006 21:58:48 -0000 1.5
+++ grass-doc.install 14 Mar 2006 15:02:44 -0000 1.6
@@ -1,3 +1,6 @@
usr/lib/grass/docs/html usr/share/doc/grass-doc
usr/lib/grass/man/man1 usr/share/man
usr/lib/grass/docs/nviz usr/share/doc/grass-doc
+programming-manual/db usr/share/doc/grass-doc/programming-manual/html
+programming-manual/gis usr/share/doc/grass-doc/programming-manual/html
+programming-manual/vector usr/share/doc/grass-doc/programming-manual/html
1.28 +33 -11 pkg-grass/debian/rules
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/rules?annotate=1.28&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/rules?rev=1.28&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/rules.diff?r1=1.28&r2=1.27&cvsroot=
-----------------------------------
Index: rules
===================================================================
RCS file: /cvsroot/pkg-grass/pkg-grass/debian/rules,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rules 20 Feb 2006 21:58:48 -0000 1.27
+++ rules 14 Mar 2006 15:02:44 -0000 1.28
@@ -22,8 +22,7 @@
include /usr/share/dpatch/dpatch.make
-#config.status: configure
-config.status: patch configure
+config-stamp: patch
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -48,8 +47,12 @@
--with-postgres-includes=$(shell pg_config --includedir) \
--with-mysql-includes=/usr/include/mysql
+ touch config-stamp
+
+# This target generates arch-dep stuff, unfortunately most doc requires working bins to
+# be properly generated...
build: build-stamp
-build-stamp: config.status
+build-stamp: config-stamp
dh_testdir
$(MAKE)
@@ -57,6 +60,15 @@
touch build-stamp
+# This target generates truly arch-indep stuff
+build-indep: build-indep-stamp
+build-indep-stamp: config-stamp
+ dh_testdir
+
+ $(MAKE) htmldocs
+
+ touch build-indep-stamp
+
clean: clean-patched unpatch
clean-patched:
dh_testdir
@@ -70,7 +82,7 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- dh_clean build-arch-stamp build-indep-stamp configure-stamp
+ dh_clean build-stamp config-stamp build-indep-stamp
rm -f lib/proj/nad2bin
rm -f tools/timer/main.o
@@ -78,7 +90,9 @@
rm -f raster/r.terraflow/IOStream/lib/src/libiostream.a
rm -f debian/grass60.1
rm -f error.log
- rm -rf doxygenhtml lib/vector/html lib/db/html lib/gis/html
+ # clean doxygen documentation (programming man)
+ rm -rf doxygenhtml lib/vector/html lib/db/html lib/gis/html \
+ lib/vector/latex lib/db/latex lib/gis/latex
install: build
dh_testdir
@@ -106,18 +120,26 @@
for m in debian/tmp/usr/lib/grass/man/man1/*.1; do n=`basename $$m .1`; mv $$m debian/tmp/usr/lib/grass/man/man1/$$n.1grass; done
for m in debian/tmp/usr/lib/grass/man/man1/*.1grass; do sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done
- # move binary files out of /usr/lib
- #mkdir -p debian/tmp/usr/share/grass/bwidget
- #mv debian/tmp/usr/lib/grass/bwidget/images debian/tmp/usr/share/grass/bwidget/images
-
# install lintian overrides
install -m 644 debian/libgrass.lintian-overrides debian/libgrass/usr/share/lintian/overrides/libgrass
# install module makefile
install -m 644 include/Make/Module.make debian/libgrass-dev/usr/lib/grass/include/Make/Module.make
+install-indep: build-indep
+ dh_testdir -i
+ dh_testroot -i
+ install -m 644 -d debian/tmp
+ install -m 644 -d debian/tmp/programming-manual/vector/html \
+ debian/tmp/programming-manual/db/html \
+ debian/tmp/programming-manual/gis/html
+
+ install -m 644 lib/vector/html/* debian/tmp/programming-manual/vector/html
+ install -m 644 lib/db/html/* debian/tmp/programming-manual/db/html
+ install -m 644 lib/gis/html/* debian/tmp/programming-manual/gis/html
+
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install install-indep
dh_testdir -i
dh_testroot -i
dh_installchangelogs -i CHANGES
@@ -133,7 +155,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir -a
dh_testroot -a
dh_installchangelogs -a CHANGES
More information about the Pkg-grass-devel
mailing list