[DebianGIS-dev] DebianGis CVS update: mapserver/debian changelog control

[DebianGis CVS Commit]

  User: pere    
  Date: 05/11/04 23:49:42

  Modified:    debian   changelog control
  Log:
  Update changelog, build-conflicts and prepare for release.
  
  Revision  Changes    Path
  1.38      +8 -5      mapserver/debian/changelog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?annotate=1.38&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?rev=1.38&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog.diff?r1=1.38&r2=1.37&cvsroot=
  
  -----------------------------------
  
  Index: changelog
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/changelog,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- changelog	4 Nov 2005 21:26:05 -0000	1.37
  +++ changelog	4 Nov 2005 23:49:42 -0000	1.38
  @@ -1,12 +1,15 @@
  -mapserver (4.6.1-4) UNRELEASED; urgency=low
  +mapserver (4.6.1-4) unstable; urgency=low
   
     * Add Swedish translation by Daniel Nylander. (Closes: #333097)
  -  * Change build depend from libcurl3-dev to libcurl3-gnutls-dev,
  -    to cope with the recent change with libcurl.  Patch from
  -    Jon Saints.  (Closes: #336834)
  +  * Change build depend from libcurl3-dev to
  +    'libcurl3-gnutls-dev | libcurl3-dev', to cope with the recent
  +    change with libcurl and still be easy to backport to sarge.
  +    Based on patch from Jon Saints.  (Closes: #336834)
  +  * Build-conflict on libcurl3-openssl-dev, to make sure the requested
  +    curl library is used by the autobuilders.
     * Set priority extra for php4-mapscript, to match override files.
   
  - -- Petter Reinholdtsen <pere at debian.org>  Fri,  4 Nov 2005 21:07:32 +0100
  + -- Petter Reinholdtsen <pere at debian.org>  Fri,  4 Nov 2005 23:29:24 +0100
   
   mapserver (4.6.1-3) unstable; urgency=low
   
  
  
  
  1.24      +2 -1      mapserver/debian/control
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/control?annotate=1.24&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/control?rev=1.24&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/control.diff?r1=1.24&r2=1.23&cvsroot=
  
  -----------------------------------
  
  Index: control
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/control,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- control	4 Nov 2005 21:26:06 -0000	1.23
  +++ control	4 Nov 2005 23:49:42 -0000	1.24
  @@ -4,7 +4,8 @@
   Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
   Uploaders: Thomas Sondag <thomas at microdop.org>, Schuyler Erle <schuyler at nocat.net>, Petter Reinholdtsen <pere at debian.org>
   Standards-Version: 3.6.2.1
  -Build-Depends: debhelper (>= 4), dpatch, libcurl3-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>=2.0.9), libjpeg62-dev, libgdal1-dev, proj, libwww-dev, postgresql-dev (>= 7.3.3-1), php4-dev, swig, python-dev
  +Build-Depends: debhelper (>= 4), dpatch, libcurl3-gnutls-dev | libcurl3-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>=2.0.9), libjpeg62-dev, libgdal1-dev, proj, libwww-dev, postgresql-dev (>= 7.3.3-1), php4-dev, swig, python-dev
  +Build-conflicts: libcurl3-openssl-dev
   
   Package: php4-mapscript
   Section: web