Author: frankie
Date: 2009-02-16 13:05:34 +0000 (Mon, 16 Feb 2009)
New Revision: 1899

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/control
   packages/grass/trunk/debian/rules
Log:
New grass, round 2


Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog       2009-02-16 12:54:31 UTC (rev 
1898)
+++ packages/grass/trunk/debian/changelog       2009-02-16 13:05:34 UTC (rev 
1899)
@@ -6,17 +6,16 @@
   * Removing Tcl Lenny related code in debian/rules. 
   * Some minor clean-ups in debian/rules.
   * Obsolete NEWS file removed.
+  * Removed pre-lenny compatibility build-deps.
   * Debhelper level moved to 7, now using dh_prep.
   * Removed ld.so file installation. Grass programs must be called under Grass 
environment,
     so it is pointless and can be dangerous when different versions are 
installed. This
     is also true for Qgis and its Grass plugin. As consequence postinst and 
postrm files 
     have been removed as obsolete.
 
-  * Merging relevant changes in the stable 6.2.3 tree with the 
-    experimental DebianGis series:
+  * Merging relevant changes in the stable 6.2.3 tree with the experimental 
DebianGis series:
 
        From 6.2.3-3:
-       o Added Vcs-* fields to debian/control.
         o Fixated patch rule.
 
         From 6.2.3-2:
@@ -29,9 +28,10 @@
        o Added the new Homepage field to debian/control.
        o Updated obsolete ${Source-Version} to ${binary:Version}.
        o Fixed lintian error: : debian-rules-ignores-make-clean-error
-       o Moved to new Tcl/Tk policy, introducing default -dev packages 
build-dependencies as alternative
-         and still depending on versioned ones for backports. For backports the
-         Tcl/Tk includes path is found at build time in debian/rules.
+       o Moved to new Tcl/Tk policy, introducing default -dev packages 
+          build-dependencies as alternative and still depending on versioned
+          ones for backports. For backports the Tcl/Tk includes path is 
+          found at build time in debian/rules.
        o Now using mysql_config to get MySQL includes path.
        o Added private library path at dh_shlibdeps call.
 

Modified: packages/grass/trunk/debian/control
===================================================================
--- packages/grass/trunk/debian/control 2009-02-16 12:54:31 UTC (rev 1898)
+++ packages/grass/trunk/debian/control 2009-02-16 13:05:34 UTC (rev 1899)
@@ -1,11 +1,11 @@
-Source: grass-preview
+Source: grass
 Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <fran...@debian.org>, Steve Halasz 
<deb...@adkgis.org>
-Build-depends: flex, bison, libreadline5-dev | libreadline-dev, 
libncurses5-dev, lesstif2-dev, debhelper (>= 5), dpatch, 
- libtiff4-dev, tcl-dev (>= 8.4) | tcl8.4-dev, tk-dev (>= 8.4) | tk8.4-dev, 
libfftw3-dev|fftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
- libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.4.0) | 
libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, 
+Build-depends: flex, bison, libreadline5-dev, libncurses5-dev, lesstif2-dev, 
debhelper (>= 7), dpatch, 
+ libtiff4-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), libfftw3-dev, libxmu-dev, 
libglu1-mesa-dev | libglu1-xorg-dev, 
+ libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.5.0), proj 
(>= 4.4.7), libjpeg62-dev, 
  libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, 
libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
  libcairo2-dev, libwxgtk2.8-dev
 Standards-Version: 3.8.0
@@ -13,11 +13,11 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/
 Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/grass/
 
-Package: grass-preview
+Package: grass
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
-Suggests: grass-preview-doc, gdal-bin, e00compr, avce00, gpstrans, gnuplot, 
grass-doc
+Suggests: grass-doc, gdal-bin, e00compr, avce00, gpstrans, gnuplot, grass-doc
 Description: Geographic Resources Analysis Support System (Technology Preview)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -25,11 +25,8 @@
  visualization. GRASS is currently used in academic and commercial
  settings around the world, as well as by many government agencies
  and environmental consulting companies.
- .
- This is a technology preview version. It could be broken on some respects,
- use `grass' package if you need a stable one. 
 
-Package: grass-preview-doc
+Package: grass-doc
 Section: science
 Architecture: all
 Conflicts: grass-doc
@@ -44,14 +41,11 @@
  and environmental consulting companies.
  .
  This package contains HTML documentation for the GRASS system.
- .
- This is a technology preview version. It could be broken on some respects,
- use `grass-doc' package if you need the stable version documentation. 
 
-Package: grass-preview-dev
+Package: grass-dev
 Section: devel
 Architecture: any
-Depends: ${shlibs:Depends}, grass-preview (= ${binary:Version})
+Depends: ${shlibs:Depends}, grass (= ${binary:Version})
 Suggests: pkg-config
 Description: GRASS GIS (Technology preview) development files
  Commonly referred to as GRASS, this is a Geographic Information
@@ -64,6 +58,3 @@
  This package contains the header files for developing with GRASS.
  Install this package if you wish to develop software that manipulates
  GRASS data sets.
- .
- This is a technology preview version. It could be broken on some respects,
- use `grass-dev' package if you need the stable version documentation. 

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules   2009-02-16 12:54:31 UTC (rev 1898)
+++ packages/grass/trunk/debian/rules   2009-02-16 13:05:34 UTC (rev 1899)
@@ -29,7 +29,7 @@
 
 include /usr/share/dpatch/dpatch.make
 
-config-stamp: patch-stamp
+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) \
@@ -174,7 +174,7 @@
        dh_testroot -i
        dh_installchangelogs -i CHANGES
        dh_installdocs -i
-       dh_install --sourcedir=debian/tmp -i
+       dh_install -i
        dh_strip -i
        dh_compress -i
        dh_fixperms -i
@@ -190,7 +190,7 @@
        dh_installchangelogs -a CHANGES
        dh_installdocs  -a
        dh_installexamples  -a
-       dh_install --sourcedir=debian/tmp -a
+       dh_install -a
        dh_installman -p$(PKG_NAME) debian/$(BASE_NAME).1 -a
        dh_strip -a
        dh_compress -a


_______________________________________________
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