[texmaker] 04/103: Added some (historical patches) that solved #469920 - waiting for upstream to confirm whether the problem is fixed otherwise; patches to fix desktop file; finally upload on behalf of Debian Science Team because e-mail of former maintainer bounces
Andreas Tille
tille at debian.org
Sun Sep 10 17:38:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository texmaker.
commit e05e7767628a36ec469e319200764cf8d53db705
Author: Andreas Tille <tille at debian.org>
Date: Fri May 30 06:08:54 2008 +0000
Added some (historical patches) that solved #469920 - waiting for upstream to confirm whether the problem is fixed otherwise; patches to fix desktop file; finally upload on behalf of Debian Science Team because e-mail of former maintainer bounces
---
debian/changelog | 12 +++-
debian/control | 2 +-
.../10_external_files_inclusion__filechooser.patch | 80 ++++++++++++++++++++++
.../10_external_files_inclusion__texmaker.patch_ | 41 +++++++++++
debian/patches/20_texmaker_desktop.patch | 15 ++++
debian/patches/series | 1 +
debian/rules | 8 ++-
7 files changed, 153 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e2e3770..b245aa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-texmaker (1.7.1-1) UNRELEASED; urgency=low
+texmaker (1.7.1-1) unstable; urgency=low
* Putted TexMaker under team maintenance by Debian Science Team
svn://svn.debian.org/svn/debian-science/typesetting/texmaker/trunk/
+ (E-Mail of former maintainer Joseph Smidt <jsmidt at byu.edu> bounces)
* New upstream version
Closes: #479691
* The shortcut key bug does not even exist in previous version any more
@@ -14,7 +15,8 @@ texmaker (1.7.1-1) UNRELEASED; urgency=low
- Homepage field
* debian/menu: s/Apps/Applications/
* debian/rules
- - added dh_icons and dh_desktop call
+ - added dh_icons and dh_desktop call (and bumped debhelper versioned
+ dependency to (>= 5.0.51)
- replaced "-$(MAKE) distclean" by
"[ ! -f Makefile ] || $(MAKE) distclean"
- symlinks for documentation files to /usr/share/texmaker (see below)
@@ -30,6 +32,12 @@ texmaker (1.7.1-1) UNRELEASED; urgency=low
in debian/rules
Closes: #479692
* Added doc-base entry
+ * debian/patches/10_external_files_inclusion*.patch: keep backup of
+ Ubuntu patch for #469920 (Gianluca Borello) in case new upstream
+ does not really solve the problem. Upstream was contacted and
+ bug will either closed manually or further means will be taken.
+ * Use quilt to fix a lintian warning about deprecated keys in
+ texmaker.desktop
-- Andreas Tille <tille at debian.org> Tue, 27 May 2008 14:21:01 +0200
diff --git a/debian/control b/debian/control
index cc104a4..cfcde60 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
DM-Upload-Allowed: yes
Uploaders: Joseph Smidt <jsmidt at byu.edu>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libqt4-dev (>=4.3), libglib2.0-dev, quilt
+Build-Depends: debhelper (>= 5.0.51), libqt4-dev (>=4.3), libglib2.0-dev, quilt
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/texmaker/trunk/
diff --git a/debian/patches/10_external_files_inclusion__filechooser.patch b/debian/patches/10_external_files_inclusion__filechooser.patch
new file mode 100644
index 0000000..7f031d4
--- /dev/null
+++ b/debian/patches/10_external_files_inclusion__filechooser.patch
@@ -0,0 +1,80 @@
+# Upstream seems to have a different way to solve the problem so do not
+# activate this patch for the moment.
+#
+# Adapted from 10_external_files_inclusion.dpatch by
+# Andrea Colangelo <warp10 at ubuntu.com> which adds a
+# function to calculate relative paths between two files.
+#
+# Took over the patches for filechooser.*, texmaker.cpp needed extra care
+# in new upstream version
+
+diff -urNad texmaker-1.7.1~/filechooser.cpp texmaker-1.7.1/filechooser.cpp
+--- texmaker-1.7.1~/filechooser.cpp 2007-06-05 20:44:16.000000000 +0200
++++ texmaker-1.7.1/filechooser.cpp 2008-03-07 18:08:27.000000000 +0100
+@@ -10,7 +10,8 @@
+ ***************************************************************************/
+
+ #include "filechooser.h"
+-#include <QFileDialog>
++#include <QFileDialog>
++#include <QStringList>
+
+ FileChooser::FileChooser( QWidget *parent, QString name)
+ : QDialog( parent)
+@@ -48,3 +49,45 @@
+ }
+ }
+
++QString FileChooser::relativePath(const QString basepath, const QString & file)
++{
++
++ QFileInfo fi(file);
++ QString filename = fi.fileName();
++ QString path = fi.path();
++ QStringList basedirs = basepath.split("/");
++ QStringList dirs = path.split("/");
++ //QStringList basedirs = QStringList::split("/", basepath, false);
++ //QStringList dirs = QStringList::split("/", path, false);
++
++ uint nDirs = dirs.count();
++
++ while ( dirs.count() > 0 && basedirs.count() > 0 && dirs[0] == basedirs[0] )
++ {
++ dirs.pop_front();
++ basedirs.pop_front();
++ }
++
++ if (nDirs != dirs.count() )
++ {
++ path = dirs.join("/");
++
++ if (basedirs.count() > 0)
++ {
++ for (uint j=0; j < basedirs.count(); ++j)
++ {
++ path = "../" + path;
++ }
++ }
++
++ if ( path.length()>0 && path.right(1) != "/" ) path = path + "/";
++ }
++ else
++ {
++ path = fi.path();
++ }
++
++ return path;
++}
++
++
+diff -urNad texmaker-1.6~/filechooser.h texmaker-1.6/filechooser.h
+--- texmaker-1.6~/filechooser.h 2007-06-05 20:44:24.000000000 +0200
++++ texmaker-1.6/filechooser.h 2008-03-07 18:08:27.000000000 +0100
+@@ -23,6 +23,7 @@
+ Ui::FileChooser ui;
+ QString fileName() const;
+ QString filter,dir;
++ QString relativePath(const QString basepath, const QString & file);
+
+ public slots:
+ void setDir( const QString &di );
diff --git a/debian/patches/10_external_files_inclusion__texmaker.patch_ b/debian/patches/10_external_files_inclusion__texmaker.patch_
new file mode 100644
index 0000000..1908f3f
--- /dev/null
+++ b/debian/patches/10_external_files_inclusion__texmaker.patch_
@@ -0,0 +1,41 @@
+# Upstream seems to have a different way to solve the problem so do not
+# activate this patch for the moment.
+#
+# Adapted from 10_external_files_inclusion.dpatch by
+# Andrea Colangelo <warp10 at ubuntu.com> which adds a
+# function to calculate relative paths between two files.
+#
+# These are the patches for texmaker.cpp which DO NOT APPLY
+# to new upstream version but are stored here in case the fix
+# provided by upstream might have some issues.
+
+diff -urNad texmaker-1.6~/texmaker.cpp texmaker-1.6/texmaker.cpp
+--- texmaker-1.6~/texmaker.cpp 2007-06-05 20:51:01.000000000 +0200
++++ texmaker-1.6/texmaker.cpp 2008-03-07 18:08:27.000000000 +0100
+@@ -2743,7 +2743,7 @@
+ {
+ QString fn=sfDlg->fileName();
+ QFileInfo fi(fn);
+- InsertTag("\\includegraphics[scale=1]{"+fi.baseName()+"."+fi.completeSuffix()+"} ",26,0);
++ InsertTag("\\includegraphics[scale=1]{"+sfDlg->relativePath(currentDir, fn)+fi.baseName()+"."+fi.completeSuffix()+"} ",26,0);
+ }
+ }
+
+@@ -2763,7 +2763,7 @@
+ {
+ QString fn=sfDlg->fileName();
+ QFileInfo fi(fn);
+-InsertTag("\\include{"+fi.baseName()+"}",9,0);
++InsertTag("\\include{"+sfDlg->relativePath(currentDir, fn)+fi.baseName()+"}",9,0);
+ }
+ UpdateStructure();
+ }
+@@ -2784,7 +2784,7 @@
+ {
+ QString fn=sfDlg->fileName();
+ QFileInfo fi(fn);
+-InsertTag("\\input{"+fi.baseName()+"}",7,0);
++InsertTag("\\input{"+sfDlg->relativePath(currentDir, fn)+fi.baseName()+"}",7,0);
+ }
+ UpdateStructure();
+ }
diff --git a/debian/patches/20_texmaker_desktop.patch b/debian/patches/20_texmaker_desktop.patch
new file mode 100644
index 0000000..6b4606c
--- /dev/null
+++ b/debian/patches/20_texmaker_desktop.patch
@@ -0,0 +1,15 @@
+--- texmaker-1.7.1.orig/utilities/texmaker.desktop
++++ texmaker-1.7.1/utilities/texmaker.desktop
+@@ -9,12 +9,10 @@
+ GenericName[fr]=Editeur LaTeX
+ Icon=texmaker
+ MimeType=text/x-tex
+-MiniIcon=texmaker
+ Name=Texmaker
+ Name[fr]=Texmaker
+ Path=
+ StartupNotify=false
+ Terminal=false
+-TerminalOptions=
+ Type=Application
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c4df3fd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+20_texmaker_desktop.patch
diff --git a/debian/rules b/debian/rules
index 90eb06d..4276035 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
# -*- makefile -*-
# debian/rules for texmaker
+include /usr/share/quilt/quilt.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -18,16 +20,16 @@ configure-stamp:
touch configure-stamp
-build: build-stamp
+build: patch build-stamp
-build-stamp: configure-stamp
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git
More information about the debian-science-commits
mailing list