Thomas Weber <tweber@debian.org> writes: > the current packaging can be found at > http://anonscm.debian.org/gitweb/?p=users/tweber/octave.git;a=summary > It is based on the octave.git repository we have on git.debian.org. > Unless anybody sees some real problem with the repo, I intend to push to > our normal repository soon. Uploads will go to experimental. Thanks for your work. I have been able to build the package, and I successfully tested it against a simple Dynare example. I have a few small issues: - dh_autoreconf_clean is not run by the clean rule. As a consequence, modified autotools-generated files are left in the build tree. A patch is attached. If this is intentional, it would be useful to add a clarification comment in debian/rules. - I cannot run git-buildpackage without the --git-ignore-new option, because some files tracked by git are deleted by debian/clean. A similar issue is discussed in this old thread: http://www.mail-archive.com/debian-ocaml-maint@lists.debian.org/msg22803.html ...and the conclusion is that a patch would be more appropriate for removing generated files from upstream tarball. An alternative solution would be to use "git update-index --assume-unchanged", but this is local to a working copy and does not propagate to remote repositories if my understanding is correct. - The current changelog entry does not list all the bugs closed in git log messages, but I guess this is only because git-dch has not yet been run > There are quite some TODOs, but for an experimental upload, none of them > are showblockers: [...] > - Add the conflicts necessary to replace octave3.2 The only real conflicts seem to concern the alternatives set up by octave3.2, octave3.2-headers and octave3.2-info. Since the conflict is going to be permanent, we have to use Conflicts and not Breaks (policy 7.4). A patch is attached. The solution would be different if we planned to provide a dummy transitional octave3.2 only depending on octave 3.4, but I don't think this is what we want for two reasons: - the new octave package does not provide octave 3.2 (it provides a different version), so the dependency would be misleading to the user - this would immediately break all octave-forge packages that have not been yet recompiled with octave 3.4. That's all for the moment, I’ll have a look at the other TODOs later. Best,
From e2158f6d98f14fe9bf37f2ce153cdce2866359ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr> Date: Tue, 6 Dec 2011 12:41:48 +0100 Subject: [PATCH 1/2] Run dh_autoreconf_clean in clean rule Git-Dch: Ignore --- debian/rules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/rules b/debian/rules index 2486b01..5247434 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ export DH_OPTIONS dh $@ --with autoreconf --parallel clean: - dh clean + dh clean --with autoreconf # override normal dh_auto_configure call to pass OpenMP flag to it (#631831) # and while we are at it, disable the rpath (thanks lintian) -- 1.7.7.1
From 981238686fc7e1333c11e8ce5a140b7366c160e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 6 Dec 2011 13:58:51 +0100
Subject: [PATCH 2/2] Add Conflicts with octave3.2* packages
---
debian/control | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/debian/control b/debian/control
index c33cead..bcc16a4 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Recommends: gnuplot, libatlas3gf-base
Suggests: octave-info,
octave-doc,
octave-htmldoc,
+Conflicts: octave3.2
Description: GNU Octave language for numerical computations
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
@@ -92,6 +93,7 @@ Description: HTML documentation on the GNU Octave language
Package: octave-info
Architecture: all
Depends: info, ${misc:Depends}
+Conflicts: octave3.2-info
Section: doc
Description: GNU Info documentation on the GNU Octave language
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
@@ -120,6 +122,7 @@ Depends: liboctave0 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:
libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
libhdf5-serial-dev (>= 1.8.4),
libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++
+Conflicts: octave3.2-headers
Section: libdevel
Description: Development files for the GNU Octave language
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
--
1.7.7.1
-- Sébastien Villemot Researcher in Economics & Debian Maintainer http://www.dynare.org/sebastien Phone: +33-1-40-77-49-90 - GPG Key: 4096R/381A7594
Attachment:
pgpr2kf9HYICW.pgp
Description: PGP signature