Hi, freemat is caught by pcre3 shlibs bump, so I prepared an upload for t-p-u. I'd like to upload in t-p-u, for your approval. Attached the debdiff. Giuseppe Iuculano
diff -u freemat-3.6+dfsg/debian/README.source freemat-3.6+dfsg/debian/README.source
--- freemat-3.6+dfsg/debian/README.source
+++ freemat-3.6+dfsg/debian/README.source
@@ -11,0 +12,6 @@
+
+This package uses dpatch to handle patches against upstream source code; you
+can find additional information about dpatch at
+
+ /usr/share/doc/dpatch/
+
reverted:
--- freemat-3.6+dfsg/debian/README.Debian
+++ freemat-3.6+dfsg.orig/debian/README.Debian
@@ -1,12 +0,0 @@
-freemat for Debian
-------------------
-
-After installing freemat, you should indicate (once) the location of freemat
-data directory (you need freemat-data package) whit this command:
-
-freemat -i /usr/share/freemat
-
-Note that in this mode, freemat will only update its internal
-configuration and then exit.
-
- -- Giuseppe Iuculano <giuseppe@iuculano.it> Thu, 10 Jul 2008 18:10:22 +0200
diff -u freemat-3.6+dfsg/debian/changelog freemat-3.6+dfsg/debian/changelog
--- freemat-3.6+dfsg/debian/changelog
+++ freemat-3.6+dfsg/debian/changelog
@@ -1,3 +1,22 @@
+freemat (3.6+dfsg-5~lenny1) testing-proposed-updates; urgency=low
+
+ * debian/control:
+ + Added Vcs-Git and Vcs-Browser control field
+ + libarpack2-dev is back, added again in Build-depends
+ + Set DM-Upload-Allowed: yes control field
+ * debian/README.source: document dpatch usage, as required by Debian
+ Policy since 3.8.0
+ * debian/patches/06_fix_ftbfs_on_alpha.dpatch: fix FTBFS on alpha
+ * debian/patches/07_fix_FTBFS_with_GCC_4.4.dpatch: Fix FTBFS with GCC 4.4
+ (Closes: #505135)
+ * debian/patches/08_fix_editor_freeze.dpatch: Fix freeze on editor closing,
+ thanks to Chuong Nguyen (LP: #295093)
+ * debian/FreeMat.conf: install a simple conf file to avoid the initial
+ freemat -i command
+ * debian/README.Debian: Removed.
+
+ -- Giuseppe Iuculano <giuseppe@iuculano.it> Fri, 05 Dec 2008 18:12:09 +0100
+
freemat (3.6+dfsg-3) unstable; urgency=high
* Removed libarpack2-dev from Build-Depends due to license issue, this
diff -u freemat-3.6+dfsg/debian/freemat.install freemat-3.6+dfsg/debian/freemat.install
--- freemat-3.6+dfsg/debian/freemat.install
+++ freemat-3.6+dfsg/debian/freemat.install
@@ -2,0 +3 @@
+debian/FreeMat.conf /etc/xdg/FreeMat/
diff -u freemat-3.6+dfsg/debian/control freemat-3.6+dfsg/debian/control
--- freemat-3.6+dfsg/debian/control
+++ freemat-3.6+dfsg/debian/control
@@ -2,10 +2,13 @@
Section: math
Priority: optional
Maintainer: Giuseppe Iuculano <giuseppe@iuculano.it>
-Build-Depends: dpatch, debhelper (>= 5), autotools-dev, autoconf, automake, gfortran, libpcre3-dev, libncurses5-dev, libfftw3-dev, libqt4-dev, libqt4-opengl-dev, libsuitesparse-dev, zlib1g-dev, portaudio19-dev, libglu1-mesa-dev, libffcall1-dev, minpack-dev, pkg-config
+Build-Depends: dpatch, debhelper (>= 5), autotools-dev, autoconf, automake, gfortran, libpcre3-dev, libncurses5-dev, libfftw3-dev, libqt4-dev, libqt4-opengl-dev, libsuitesparse-dev, zlib1g-dev, portaudio19-dev, libglu1-mesa-dev, libffcall1-dev, minpack-dev, pkg-config, libarpack2-dev
Build-Conflicts: libqt3-dev
Standards-Version: 3.8.0
Homepage: http://freemat.sourceforge.net
+Vcs-Git: git://git.debian.org/git/collab-maint/freemat.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/freemat.git;a=summary
+DM-Upload-Allowed: yes
Package: freemat
Architecture: any
diff -u freemat-3.6+dfsg/debian/patches/00list freemat-3.6+dfsg/debian/patches/00list
--- freemat-3.6+dfsg/debian/patches/00list
+++ freemat-3.6+dfsg/debian/patches/00list
@@ -6,0 +7,2 @@
+07_fix_FTBFS_with_GCC_4.4.dpatch
+08_fix_editor_freeze.dpatch
only in patch2:
unchanged:
--- freemat-3.6+dfsg.orig/debian/FreeMat.conf
+++ freemat-3.6+dfsg/debian/FreeMat.conf
@@ -0,0 +1,2 @@
+[General]
+root=/usr/share/freemat
only in patch2:
unchanged:
--- freemat-3.6+dfsg.orig/debian/patches/00list.alpha
+++ freemat-3.6+dfsg/debian/patches/00list.alpha
@@ -0,0 +1 @@
+06_fix_ftbfs_on_alpha.dpatch
only in patch2:
unchanged:
--- freemat-3.6+dfsg.orig/debian/patches/06_fix_ftbfs_on_alpha.dpatch
+++ freemat-3.6+dfsg/debian/patches/06_fix_ftbfs_on_alpha.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_fix_ftbfs_on_alpha.dpatch by Giuseppe Iuculano <giuseppe@iuculano.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Attempt to fix FTBFS on alpha
+
+@DPATCH@
+diff -urNad freemat-3.6+dfsg~/libs/libFreeMat/Print.cpp freemat-3.6+dfsg/libs/libFreeMat/Print.cpp
+--- freemat-3.6+dfsg~/libs/libFreeMat/Print.cpp 2008-11-22 16:38:16.985156431 +0100
++++ freemat-3.6+dfsg/libs/libFreeMat/Print.cpp 2008-11-22 16:40:22.417865139 +0100
+@@ -180,13 +180,13 @@
+ }
+ if (!finiteElementFound) return;
+ if (max_amplitude >= 100)
+- format.scalefact = pow(10.0,floor(log10(max_amplitude)));
++ format.scalefact = pow(double(10.0),double(floor(log10(max_amplitude))));
+ else if (max_amplitude <= -100)
+- format.scalefact = pow(10.0,floor(log10(-max_amplitude)));
++ format.scalefact = pow(double(10.0),double(floor(log10(-max_amplitude))));
+ else if ((max_amplitude <= .1) && (max_amplitude>0))
+- format.scalefact = pow(10.0,floor(log10(max_amplitude)));
++ format.scalefact = pow(double(10.0),double(floor(log10(max_amplitude))));
+ else if ((max_amplitude >= -.1) && (max_amplitude<0))
+- format.scalefact = pow(10.0,floor(log10(-max_amplitude)));
++ format.scalefact = pow(double(10.0),double(floor(log10(-max_amplitude))));
+ else
+ format.scalefact = 1.0;
+ }
only in patch2:
unchanged:
--- freemat-3.6+dfsg.orig/debian/patches/07_fix_FTBFS_with_GCC_4.4.dpatch
+++ freemat-3.6+dfsg/debian/patches/07_fix_FTBFS_with_GCC_4.4.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_fix_FTBFS_with_GCC_4.4.dpatch by Giuseppe Iuculano <giuseppe@iuculano.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS with GCC 4.4: missing #include (Closes: #505135)
+
+@DPATCH@
+diff -urNad freemat-3.6+dfsg~/libs/libFreeMat/IEEEFP.cpp freemat-3.6+dfsg/libs/libFreeMat/IEEEFP.cpp
+--- freemat-3.6+dfsg~/libs/libFreeMat/IEEEFP.cpp 2008-03-14 16:43:10.000000000 +0100
++++ freemat-3.6+dfsg/libs/libFreeMat/IEEEFP.cpp 2008-11-26 09:03:33.049166863 +0100
+@@ -17,6 +17,7 @@
+ *
+ */
+ #include "IEEEFP.hpp"
++#include <cstdio>
+
+ static bool endianDetected = false;
+ static bool bigEndian = false;
only in patch2:
unchanged:
--- freemat-3.6+dfsg.orig/debian/patches/08_fix_editor_freeze.dpatch
+++ freemat-3.6+dfsg/debian/patches/08_fix_editor_freeze.dpatch
@@ -0,0 +1,154 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_editor_freeze.dpatch by Giuseppe Iuculano <giuseppe@iuculano.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix freeze on editor closing, thanks to Chuong Nguyen (LP: #295093)
+
+@DPATCH@
+diff -urNad freemat-3.6+dfsg~/libs/libXP/Editor.cpp freemat-3.6+dfsg/libs/libXP/Editor.cpp
+--- freemat-3.6+dfsg~/libs/libXP/Editor.cpp 2008-03-16 20:33:55.000000000 +0100
++++ freemat-3.6+dfsg/libs/libXP/Editor.cpp 2008-11-29 01:28:54.000000000 +0100
+@@ -116,7 +116,7 @@
+
+ FMTextEdit::FMTextEdit() : QTextEdit() {
+ QSettings settings("FreeMat","FreeMat");
+- indentSize = settings.value("editor/tab_size",3).toInt();
++ indentSize = settings.value("editor/tab_size",4).toInt();
+ indentActive = settings.value("editor/indent_enable",true).toBool();
+ setLineWrapMode(QTextEdit::NoWrap);
+ }
+@@ -346,7 +346,7 @@
+
+ FMIndent::FMIndent() {
+ QSettings settings("FreeMat","FreeMat");
+- indentSize = settings.value("editor/tab_size",3).toInt();
++ indentSize = settings.value("editor/tab_size",4).toInt();
+ }
+
+ FMIndent::~FMIndent() {
+@@ -617,6 +617,20 @@
+ new_font.fromString(font);
+ m_font = new_font;
+ }
++ else {
++ /* Set to the most common monospace font on Windows, Mac and Unix shown at
++ http://www.codestyle.org/css/font-family/sampler-Monospace.shtml */
++ #ifdef Q_WS_WIN
++ QFont new_font("Courier New", 10, QFont::Normal);
++ #else
++ #ifdef Q_WS_MAC
++ QFont new_font("Monaco", 10, QFont::Normal);
++ #else
++ QFont new_font("DejaVu Sans Mono", 10, QFont::Normal);
++ #endif
++ #endif
++ m_font = new_font;
++ }
+ updateFont();
+ isShowToolTip = settings.value("editor/isShowToolTip", true).toBool();
+ dataTipConfigAct->setChecked(isShowToolTip);
+@@ -626,6 +640,8 @@
+ for (int i=0;i<tab->count();i++) {
+ QWidget *p = tab->widget(i);
+ FMEditPane *te = qobject_cast<FMEditPane*>(p);
++ if (!te)
++ return;
+ te->setFont(m_font);
+ te->getEditor()->fontUpdate();
+ }
+@@ -643,12 +659,17 @@
+ QString FMEditor::currentFilename() {
+ QWidget *p = tab->currentWidget();
+ FMEditPane *te = qobject_cast<FMEditPane*>(p);
+- if (!te) {
++/* if (!te) {
+ addTab();
+ p = tab->currentWidget();
+ te = qobject_cast<FMEditPane*>(p);
+ }
+ return te->getFileName();
++*/
++ if (!te)
++ return QString();
++ else
++ return te->getFileName();
+ }
+
+ void FMEditor::setCurrentFilename(QString filename) {
+@@ -702,20 +723,22 @@
+ disconnect(cutAct,SIGNAL(triggered()),0,0);
+ disconnect(copyAct,SIGNAL(triggered()),0,0);
+ disconnect(pasteAct,SIGNAL(triggered()),0,0);
+- connect(cutAct,SIGNAL(triggered()),currentEditor(),SLOT(cut()));
+- connect(copyAct,SIGNAL(triggered()),currentEditor(),SLOT(copy()));
+- connect(pasteAct,SIGNAL(triggered()),currentEditor(),SLOT(paste()));
+ // Disconnect each of the contents changed signals
+ if (prevEdit) {
+ disconnect(prevEdit->document(),SIGNAL(contentsChanged()),0,0);
+ disconnect(prevEdit,SIGNAL(showDataTips(QPoint, QString)),0,0);
+ }
+ // NEED TO DISCONNECT...
+- connect(currentEditor()->document(),SIGNAL(contentsChanged()),this,SLOT(documentWasModified()));
+- connect(currentEditor(),SIGNAL(showDataTips(QPoint, QString)),
++ if (tab->count()>0) {
++ connect(cutAct,SIGNAL(triggered()),currentEditor(),SLOT(cut()));
++ connect(copyAct,SIGNAL(triggered()),currentEditor(),SLOT(copy()));
++ connect(pasteAct,SIGNAL(triggered()),currentEditor(),SLOT(paste()));
++ connect(currentEditor()->document(),SIGNAL(contentsChanged()),this,SLOT(documentWasModified()));
++ connect(currentEditor(),SIGNAL(showDataTips(QPoint, QString)),
+ this,SLOT(showDataTips(QPoint, QString)));
+- updateTitles();
+- prevEdit = currentEditor();
++ updateTitles();
++ prevEdit = currentEditor();
++ }
+ }
+
+ void FMEditor::documentWasModified() {
+@@ -833,7 +856,7 @@
+ else {
+ if (!maybeSave())
+ return;
+- emit EvaluateText("source " + currentFilename() + "\n");
++ emit EvaluateText("source '" + currentFilename() + "'\n");
+ }
+ }
+
+@@ -1356,7 +1379,12 @@
+ }
+
+ bool FMEditor::maybeSave() {
+- if (currentEditor()->document()->isModified()) {
++ QWidget *p = tab->currentWidget();
++ FMEditPane *te = qobject_cast<FMEditPane*>(p);
++ if (!te) { /* empty tab, no need to save */
++ return true;
++ }
++ else if (te->getEditor()->document()->isModified()) {
+ int ret = QMessageBox::warning(this, tr("FreeMat"),
+ "The document " + shownName() + " has been modified.\n"
+ "Do you want to save your changes?",
+diff -urNad freemat-3.6+dfsg~/src/application.cpp freemat-3.6+dfsg/src/application.cpp
+--- freemat-3.6+dfsg~/src/application.cpp 2008-03-16 07:30:39.000000000 +0100
++++ freemat-3.6+dfsg/src/application.cpp 2008-11-29 01:29:05.000000000 +0100
+@@ -414,6 +414,20 @@
+ new_font.fromString(font);
+ m_term->setFont(new_font);
+ }
++ else {
++ /* Set to the most common monospace font on Windows, Mac and Unix shown at
++ http://www.codestyle.org/css/font-family/sampler-Monospace.shtml */
++ #ifdef Q_WS_WIN
++ QFont new_font("Courier New", 10, QFont::Normal);
++ #else
++ #ifdef Q_WS_MAC
++ QFont new_font("Monaco", 10, QFont::Normal);
++ #else
++ QFont new_font("DejaVu Sans Mono", 10, QFont::Normal);
++ #endif
++ #endif
++ m_term->setFont(new_font);
++ }
+ }
+
+ void ApplicationWindow::dirButtonClicked() {
Attachment:
signature.asc
Description: OpenPGP digital signature