Hi,

I have patched debian-gis package source to let it work with cdd-dev
nicely.  It required some changes to cdd-dev which are in version
0.4.4 which will be uploaded today (so find it tomorrow in sid or grab
it from svn).

The attached diff contains the suggested changes.  Feel free to ask
in case of any question.

Kind regards

            Andreas.

-- 
http://fam-tille.de
diff -urbN debian-gis.orig/Makefile debian-gis/Makefile
--- debian-gis.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ debian-gis/Makefile	2007-08-24 13:34:46.000000000 +0200
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdd-dev/Makefile
diff -urbN debian-gis.orig/common/common debian-gis/common/common
--- debian-gis.orig/common/common	2007-10-20 11:13:38.000000000 +0200
+++ debian-gis/common/common	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#!/bin/sh
-## Prints some info about that package and lets auto-apt work
-dpkg --status `basename $0` | \
-     grep -v ^Priority | \
-     grep -v ^Section | \
-     grep -v ^Installed-Size
diff -urbN debian-gis.orig/common/control debian-gis/common/control
--- debian-gis.orig/common/control	2007-10-20 11:13:38.000000000 +0200
+++ debian-gis/common/control	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-Package: gis-common
-Architecture: all
-Depends: adduser, debconf (>= 0.5), menu
-Description: Debian GIS Project common package
- This package builds the basic infra structure of all meta packages
- for the Debian GIS Custom Debian Distribution.
-
diff -urbN debian-gis.orig/config/conf debian-gis/config/conf
--- debian-gis.orig/config/conf	1970-01-01 01:00:00.000000000 +0100
+++ debian-gis/config/conf	2007-10-19 23:21:36.000000000 +0200
@@ -0,0 +1,9 @@
+## This is a configuration file for Debian-med Custom Debian Distribution
+## It is read after /etc/cdd/cdd.conf and can override or add variables
+
+## This variable is replaced by a debconf question
+## UPDATEUSERMENU=yes
+
+## Some CDDs do not build their name generic like Debian-#CDD# so
+## we need the correct name here
+CDDNAME="Debian GIS"
diff -urbN debian-gis.orig/config/config debian-gis/config/config
--- debian-gis.orig/config/config	1970-01-01 01:00:00.000000000 +0100
+++ debian-gis/config/config	2007-10-19 18:02:07.000000000 +0200
@@ -0,0 +1,6 @@
+#!/bin/sh
+## Prints some info about that package and lets auto-apt work
+dpkg --status `basename $0` | \
+     grep -v ^Priority | \
+     grep -v ^Section | \
+     grep -v ^Installed-Size
diff -urbN debian-gis.orig/config/config.1 debian-gis/config/config.1
--- debian-gis.orig/config/config.1	1970-01-01 01:00:00.000000000 +0100
+++ debian-gis/config/config.1	2007-10-20 11:20:15.000000000 +0200
@@ -0,0 +1,19 @@
+.TH gis-config 1 "Oct 18, 2007" "Debian GIS"
+.SH NAME
+.B gis-config
+.B gis-<meta_package_name>
+\- package information and auto-apt helper
+
+.SH SYNOPSIS
+.B gis-config
+.B gis-<meta_package_name>
+
+.SH DESCRIPTION
+Print just a simple information page about every gis-* package
+of the Debian GIS Custom Debian Distribution.  Each metapackage has a 
+.I /usr/bin/gis-<meta_package_name>
+file which should print some usefull informations and could be serve
+as auto-apt helper.
+
+.SH AUTHOR
+Andreas Tille <[EMAIL PROTECTED]>.
diff -urbN debian-gis.orig/config/control debian-gis/config/control
--- debian-gis.orig/config/control	1970-01-01 01:00:00.000000000 +0100
+++ debian-gis/config/control	2007-10-19 18:12:59.000000000 +0200
@@ -0,0 +1,7 @@
+Package: gis-config
+Architecture: all
+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.
+
diff -urbN debian-gis.orig/debian/90-config debian-gis/debian/90-config
--- debian-gis.orig/debian/90-config	1970-01-01 01:00:00.000000000 +0100
+++ debian-gis/debian/90-config	2007-10-19 23:49:02.000000000 +0200
@@ -0,0 +1,10 @@
+/*
+ * $Id: apt.conf 452 2007-08-27 17:56:18Z tille $ 
+ */
+/*
+ * APT configuration file for -config package
+ */
+
+DPkg {
+	Post-Invoke {"test -f /var/run/-config.usermenu && if [ -x /usr/sbin/cdd-update-usermenus ] ; then /usr/sbin/cdd-update-usermenus  ; fi ; rm -f /var/run/-config.usermenu";};
+}
diff -urbN debian-gis.orig/debian/control debian-gis/debian/control
--- debian-gis.orig/debian/control	2007-10-20 11:13:38.000000000 +0200
+++ debian-gis/debian/control	2007-10-20 00:59:53.000000000 +0200
@@ -3,21 +3,21 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
-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.
diff -urbN debian-gis.orig/debian/control.stub debian-gis/debian/control.stub
--- debian-gis.orig/debian/control.stub	2007-10-20 11:13:38.000000000 +0200
+++ debian-gis/debian/control.stub	2007-10-20 00:42:47.000000000 +0200
@@ -3,8 +3,6 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <[EMAIL PROTECTED]>
-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
diff -urbN debian-gis.orig/debian/rules debian-gis/debian/rules
--- debian-gis.orig/debian/rules	2007-10-20 11:13:38.000000000 +0200
+++ debian-gis/debian/rules	2007-10-19 17:47:19.000000000 +0200
@@ -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
diff -urbN debian-gis.orig/tasks/workstation debian-gis/tasks/workstation
--- debian-gis.orig/tasks/workstation	2007-10-20 11:13:38.000000000 +0200
+++ debian-gis/tasks/workstation	2007-10-19 23:50:12.000000000 +0200
@@ -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.
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to