octave2.1: merge new debian version

[Ming Hua]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

MOM: http://people.ubuntu.com/~scott/ongoing-merge/octave2.1
MOTU: minghua
Status: to be merged

I'm currently working on a merged package. Please expect an
updated package to be uploaded to the archive in the near future.

   affects /distros/ubuntu/octave2.1
   assignee motumergers
   subscribe minghua

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDk4D7L3Y7AxCxq2URAt1QAKCIuiIX6B1UtWIrEUb5V+EjbaG4jgCdGYsj
kxAqNwKsQV8l5aa65nV4kr8=
=O8ZH
-----END PGP SIGNATURE-----

[Ming Hua (minghua)]

The MoM didn't give the correct debdiff for previous merge. This is the debdiff for previous merge, with the following diffstat:

 debian/patches/01_gcc4.patch | 69 69 + 0 - 0 !
 glob/alloca.c | 518 518 + 0 - 0 !
 glob/configure.bat | 26 26 + 0 - 0 !
 octave2.1-2.1.71/debian/changelog | 32 32 + 0 - 0 !
 octave2.1-2.1.71/debian/control | 2 1 + 1 - 0 !
 octave2.1-2.1.71/debian/rules | 10 9 + 1 - 0 !
 6 files changed, 655 insertions(+), 2 deletions(-)

[Ming Hua (minghua)]

I believe this should be a sync regardless the big ubuntu debdiff.

The changes in debian/rules and the dpatch are both leftover from the gcc-4.0 fix that is no longer needed (supposedly already in debian package).

The two files in glob/ and the added flex and bison Build-Depends look also like some fix for gcc-4.0 FTFBS according to the changelog, and should be no longer needed.

I've built the debian sid version 2.1.72-6 in dapper pbuilder, and tested it. It seems to be working fine.

[Lucas Nussbaum (lucas)]

So let's sync it!

[Ming Hua (minghua)]

On Wed, Jan 11, 2006 at 11:03:07PM -0000, LucasNussbaum wrote:
> Comment:
> So let's sync it!

Yes, that's what I have been trying to do. Both zakame and crimsun have
requested the sync (at different time), the earlier one by zakame was
probably two weeks ago. For some unknown reason the request never went
though, and crimsun told me that he plan to add octave2.1 to his next
sync batch request to elmo.

So hopefully it will be sync'ed soon.

Ming
2006.01.12