[DebianGIS-dev] r1232 - in packages/debian-gis: config debian tasks

[pere at alioth.debian.org]

Author: pere
Date: 2007-10-20 10:25:30 +0000 (Sat, 20 Oct 2007)
New Revision: 1232

Modified:
   packages/debian-gis/config/control
   packages/debian-gis/debian/control
   packages/debian-gis/debian/control.stub
   packages/debian-gis/debian/rules
   packages/debian-gis/tasks/workstation
Log:
Apply patch from Andreas Tille.

Modified: packages/debian-gis/config/control
===================================================================
--- packages/debian-gis/config/control	2007-10-20 10:23:20 UTC (rev 1231)
+++ packages/debian-gis/config/control	2007-10-20 10:25:30 UTC (rev 1232)
@@ -1,7 +1,7 @@
-Package: gis-common
+Package: gis-config
 Architecture: all
 Depends: adduser, debconf (>= 0.5), menu
-Description: Debian GIS Project common package
+Description: Debian GIS Project config package
  This package builds the basic infra structure of all meta packages
  for the Debian GIS Custom Debian Distribution.
 

Modified: packages/debian-gis/debian/control
===================================================================
--- packages/debian-gis/debian/control	2007-10-20 10:23:20 UTC (rev 1231)
+++ packages/debian-gis/debian/control	2007-10-20 10:25:30 UTC (rev 1232)
@@ -3,21 +3,21 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>
-Build-Depends-Indep: debhelper (>= 4), cdd-dev
+Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.4.4)
 Standards-Version: 3.7.2
 
-Package: gis-common
+Package: gis-config
 Architecture: all
-Depends: adduser, debconf (>= 1.2), menu (>= 2.1.14)
-Description: Debian GIS Project common package
+Depends: adduser, debconf (>= 0.5), menu
+Description: Debian GIS Project config package
  This package builds the basic infra structure of all meta packages
  for the Debian GIS Custom Debian Distribution.
 
 
 Package: gis-workstation
 Architecture: all
-Depends: gis-common (= 0.0.1), avce00, drawmap, e00compr, earth3d, gdal-bin, geoip-bin, gmt, gpsbabel, gpsdrive, gpsman, gpsmanshp, gpx2shp, grace6, grass, grass-doc, iceweasel, kflog, mapnik-utils, mapserver-bin, mozilla-plugin-gnash, ogdi-bin, openscenegraph, pgadmin3, php5-mapscript, phppgadmin, postgis, postgresql-8.2-postgis, proj, python-mapnik, r-base, r-cran-mapdata, r-cran-maps, thuban, viking
-Suggests: googleearth-package, gosmore, gpsd, gpsd-clients, gpstrans, josm, mapnik-viewer, openjump, osm-tools, osmarendrer, qgis, qgis-plugin-grass, r-cran-mapproj, renderathome, swfdec-mozilla
+Recommends: avce00, drawmap, e00compr, earth3d, gdal-bin, geoip-bin, gmt, gosmore, gpsbabel, gpsd, gpsd-clients, gpsdrive, gpsman, gpsmanshp, gpstrans, gpx2shp, grace6, grass, grass-doc, iceweasel, kflog, mapnik-utils, mapserver-bin, mozilla-plugin-gnash, ogdi-bin, openscenegraph, pgadmin3, php5-mapscript, phppgadmin, postgis, postgresql-8.2-postgis, proj, python-mapnik, qgis, qgis-plugin-grass, r-base, r-cran-mapdata, r-cran-maps, swfdec-mozilla, thuban, viking
+Suggests: googleearth-package, josm, mapnik-viewer, openjump, osm-tools, osmarendrer, r-cran-mapproj, renderathome
 Description: Geographic Information Systems (GIS) workstation
  This task sets up your system to be a GIS workstation to process
  geographical information and make maps.

Modified: packages/debian-gis/debian/control.stub
===================================================================
--- packages/debian-gis/debian/control.stub	2007-10-20 10:23:20 UTC (rev 1231)
+++ packages/debian-gis/debian/control.stub	2007-10-20 10:25:30 UTC (rev 1232)
@@ -3,8 +3,6 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>
-Build-Depends-Indep: debhelper (>= 4), cdd-dev
+Build-Depends-Indep: debhelper (>= 4), cdd-dev (>= 0.4.4)
 Standards-Version: 3.7.2
 
-Package: gis
-Architecture: all

Modified: packages/debian-gis/debian/rules
===================================================================
--- packages/debian-gis/debian/rules	2007-10-20 10:23:20 UTC (rev 1231)
+++ packages/debian-gis/debian/rules	2007-10-20 10:25:30 UTC (rev 1232)
@@ -1,79 +1,3 @@
 #!/usr/bin/make -f
-# debian/rules for Debian-GIS
-# GNU copyright 2006 GIS Maintainer, GPL.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-cdd=gis
-pkgsrc=debian-$(cdd)
-
-build: debian/build-stamp
-debian/build-stamp:
-	dh_testdir
-
-	cdd-gen-control -s testing -c -m -i -t
-	#/usr/bin/docbook-to-man debian/meta-$(cdd).sgml > meta-$(cdd).1
-
-	touch debian/build-stamp
-
-clean: debian/control tasks/* debian/control.stub
-	dh_testdir
-	dh_testroot
-	rm -f debian/build-stamp
-
-	cdd-clean-helper
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-	dh_installman
-	cdd-install-helper
-	dh_install
-	dh_installdebconf
-#	dh_installinfo
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-dist:
-	distdir=$(pkgsrc)-`cat VERSION` ; \
-	rm -rf $${distdir} ; \
-	mkdir $${distdir} ; \
-	chmod 777 $${distdir} ; \
-	rsync -a --exclude $${distdir} --exclude CVS --exclude .svn * $${distdir} ; \
-	ln -s control.stub $${distdir}/debian/control ; \
-	GZIP=-9 tar -czf ../$(pkgsrc)_`cat VERSION`.tar.gz $${distdir} ; \
-	rm -rf $${distdir}
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+include /usr/share/cdd-dev/rules

Modified: packages/debian-gis/tasks/workstation
===================================================================
--- packages/debian-gis/tasks/workstation	2007-10-20 10:23:20 UTC (rev 1231)
+++ packages/debian-gis/tasks/workstation	2007-10-20 10:25:30 UTC (rev 1232)
@@ -1,4 +1,4 @@
-Task: gis-workstation
+Task: Workstation
 Description: Geographic Information Systems (GIS) workstation
  This task sets up your system to be a GIS workstation to process
  geographical information and make maps.