[Pkg-octave-commit] r1187 - in octave/trunk/debian: . in

[Rafael Laboissiere]

tags 434415 pending
tags 435275 pending
tags 463039 pending
thanks

Author: rafael
Date: 2008-02-06 07:43:45 +0000 (Wed, 06 Feb 2008)
New Revision: 1187

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/control
Log:
* Dropped conflict/replace/provide for octave2.9
* Added bug closing statements to the changelog

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-05 20:12:15 UTC (rev 1186)
+++ octave/trunk/debian/changelog	2008-02-06 07:43:45 UTC (rev 1187)
@@ -6,12 +6,19 @@
       override set by the Debian Installer
     + Generate dummy octave2.9* packages that depend on the corresponding
       octave3.0 ones. For this to work, we have to reintroduce the epoch in
-      the package version number.
+      the package version number.  Also, do not conflict/replace/provide
+      the octave2.9* anymore (closes: #463039).  Thanks to Steve Langasek
+      for the discussion and the suggestions.
   * debian/in/control, debian/rules: Switched from g77 to gfortran.
     + Changed the build-dependencies on refblas3-dev and lapack3-dev to
       libblas-dev and liblapack-dev, respectively
     + Changed the recommendation on atlas3-base to libatlas3gf-base
     + Thanks to Pascal Dupuis for the original patch
+    + Thanks to this change, the octave3.0-headers pacakge do not depend
+      gcc-3.4 anymore (closes: #435275)
+    + The F77_FUNC_ macro in config.h does have the double underscore
+      that appeared in version 2.9.12-2+b3 of the octave2.9-headers
+      package (closes: #434415)
 
   [ Thomas Weber ]
   * debian/compat: switch to level 6
@@ -23,7 +30,7 @@
     + debian/in/PACKAGE-emacsen.dirs
     + debian/in/PACKAGE.dirs
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 09 Jan 2008 22:36:44 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 06 Feb 2008 08:41:29 +0100
 
 octave2.1 (1:2.1.73-16) unstable; urgency=low
 

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2008-02-05 20:12:15 UTC (rev 1186)
+++ octave/trunk/debian/in/control	2008-02-06 07:43:45 UTC (rev 1187)
@@ -30,9 +30,9 @@
  octave[V_2_1:2.1:][V_3_0:3.0:]-htmldoc,
  octave[V_2_1:2.1:][V_3_0:3.0:]-headers (= ${binary:Version}),
  octave[V_2_1:2.1:][V_3_0:3.0:]-emacsen
-Replaces: octave (<= 2.0.16-2)[V_3_0:,octave2.9:]
-Conflicts: octave (<= 2.0.16-2)[V_3_0:,octave2.9:]
-Provides: octave[V_3_0:,octave2.9:]
+Replaces: octave (<= 2.0.16-2)
+Conflicts: octave (<= 2.0.16-2)
+Provides: octave
 Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -47,9 +47,9 @@
 Architecture: all
 Section: doc
 Suggests: octave[V_2_1:2.1:][V_3_0:3.0:], xpdf | pdf-viewer
-Conflicts: octave-doc (<< 2.1)[V_3_0:,octave2.9-doc:]
-Provides: octave-doc[V_3_0:,octave2.9-doc:]
-Replaces: octave-doc[V_3_0:,octave2.9-doc:]
+Conflicts: octave-doc (<< 2.1)
+Provides: octave-doc
+Replaces: octave-doc
 Description: PDF documentation on the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -64,9 +64,9 @@
 Architecture: all
 Section: doc
 Suggests: octave[V_2_1:2.1:][V_3_0:3.0:], lynx | www-browser
-Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc[V_3_0:,octave2.9-htmldoc:]
-Replaces: octave-htmldoc[V_3_0:,octave2.9-htmldoc:]
-Provides: octave-htmldoc[V_3_0:,octave2.9-htmldoc:]
+Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc
+Replaces: octave-htmldoc
+Provides: octave-htmldoc
 Description: HTML documentation on the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -84,9 +84,9 @@
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
  libblas-dev, liblapack-dev, libfftw3-dev,
  ${m68k:Depends}
-Conflicts: octave-headers (<< 2.1)[V_3_0:,octave2.9-headers:]
-Provides: octave-headers[V_3_0:,octave2.9-headers:]
-Replaces: octave-headers[V_3_0:,octave2.9-headers:]
+Conflicts: octave-headers (<< 2.1)
+Provides: octave-headers
+Replaces: octave-headers
 Description: header files for the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -103,9 +103,9 @@
 Architecture: all
 Depends: octave[V_2_1:2.1:][V_3_0:3.0:], emacs22 | xemacs21 | emacsen,
  debianutils (>= 1.6)
-Conflicts: octave2.0-emacsen[V_3_0:,octave2.9-emacsen:]
-Replaces: octave (<= 2.0.16-2)[V_3_0:,octave2.9-emacsen:]
-Provides: octave-emacsen[V_3_0:,octave2.9-emacsen:]
+Conflicts: octave2.0-emacsen
+Replaces: octave (<= 2.0.16-2)
+Provides: octave-emacsen
 Description: Emacs support for the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
@@ -117,9 +117,9 @@
 Package: octave[V_2_1:2.1:][V_3_0:3.0:]-info
 Architecture: all
 Depends: info (>= 3.12) | info-browser
-Conflicts: octave2.0-info[V_3_0:,octave2.9-info:]
-Replaces: octave (<= 2.0.16-2)[V_3_0:,octave2.9-info:]
-Provides: octave-info[V_3_0:,octave2.9-info:]
+Conflicts: octave2.0-info
+Replaces: octave (<= 2.0.16-2)
+Provides: octave-info
 Description: GNU Info documentation on the GNU Octave language ([V_2_1:2.1:][V_3_0:3.0:] branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line