[texmaker] 18/103: New upstream version
Andreas Tille
tille at debian.org
Sun Sep 10 17:38:26 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 878325fcc25d19d4452a1924434b9f9559479dcc
Author: Andreas Tille <tille at debian.org>
Date: Fri May 29 09:31:28 2009 +0000
New upstream version
---
debian/changelog | 13 ++++
debian/control | 4 +-
.../10_external_files_inclusion__filechooser.patch | 80 ----------------------
.../10_external_files_inclusion__texmaker.patch_ | 41 -----------
debian/patches/10_spell_dict.patch | 24 -------
debian/patches/20_texmaker_desktop.patch | 11 ---
debian/patches/series | 2 -
debian/rules | 12 +++-
debian/texmaker.docs | 1 -
debian/texmaker.install | 7 +-
10 files changed, 27 insertions(+), 168 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3202882..5273f7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+texmaker (1.9.1-1) unstable; urgency=low
+
+ * New upstream version
+ * debian/control:
+ - debhelper (>= 7)
+ - libqt4-dev (>=4.5.1) (required by upstream
+ - Standards-Version: 3.8.1, no changes needed
+ * debian/texmaker.install: adapt to changes in upstream directory
+ layout
+ * No quilt patches any more because applied upstream
+
+ -- Andreas Tille <tille at debian.org> Thu, 28 May 2009 14:38:43 +0200
+
texmaker (1.8-1) unstable; urgency=low
[ Ruben Molina ]
diff --git a/debian/control b/debian/control
index 178a5ca..c99ca17 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
Ruben Molina <rmolina at udea.edu.co>
-Build-Depends: debhelper (>= 5.0.51), libqt4-dev (>=4.3), libglib2.0-dev, quilt
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), libqt4-dev (>=4.5.1), libglib2.0-dev
+Standards-Version: 3.8.1
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/
Homepage: http://www.xm1math.net/texmaker/
diff --git a/debian/patches/10_external_files_inclusion__filechooser.patch b/debian/patches/10_external_files_inclusion__filechooser.patch
deleted file mode 100644
index 7f031d4..0000000
--- a/debian/patches/10_external_files_inclusion__filechooser.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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_
deleted file mode 100644
index 1908f3f..0000000
--- a/debian/patches/10_external_files_inclusion__texmaker.patch_
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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/10_spell_dict.patch b/debian/patches/10_spell_dict.patch
deleted file mode 100644
index 42758a7..0000000
--- a/debian/patches/10_spell_dict.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix the path on dicDir, and enhances an error message.
-===================================================================
---- texmaker-1.7.1.orig/spellerdialog.cpp
-+++ texmaker-1.7.1/spellerdialog.cpp
-@@ -55,7 +55,7 @@
- c = editor->textCursor();
- QFileInfo fi(SpellDic);
- if (fi.exists() && fi.isReadable()) spellingInit();
--else ui.labelMessage->setText("<b>"+tr("Error : Can't open the dictionary")+"</b>");
-+else ui.labelMessage->setText("<b>"+tr("Error : Can't open the dictionary ")+SpellDic+"\nYou can set the dictionary in Options / Configure Texmaker / Editor.</b>");
- }
-
- SpellerDialog::~SpellerDialog(){
---- texmaker-1.7.1.orig/texmaker.cpp
-+++ texmaker-1.7.1/texmaker.cpp
-@@ -2269,7 +2269,7 @@
- author=config->value("Quick/Author","").toString();
-
- #if defined( Q_WS_X11 )
--QString dicDir=PREFIX"/share/texmaker/";
-+QString dicDir=PREFIX"/share/myspell/dicts/";
- #endif
- #if defined( Q_WS_MACX )
- QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";
diff --git a/debian/patches/20_texmaker_desktop.patch b/debian/patches/20_texmaker_desktop.patch
deleted file mode 100644
index 0966015..0000000
--- a/debian/patches/20_texmaker_desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-desktop-entry-contains-encoding-key
-===================================================================
---- texmaker-1.8.orig/utilities/texmaker.desktop
-+++ texmaker-1.8/utilities/texmaker.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
--Encoding=UTF-8
- Exec=texmaker
- GenericName=LaTeX Editor
- GenericName[fr]=Editeur LaTeX
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5d1469d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-20_texmaker_desktop.patch
-10_spell_dict.patch
diff --git a/debian/rules b/debian/rules
index 4276035..f5d4952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# -*- makefile -*-
# debian/rules for texmaker
-include /usr/share/quilt/quilt.make
+# include /usr/share/quilt/quilt.make
CFLAGS = -Wall -g
@@ -20,7 +20,8 @@ configure-stamp:
touch configure-stamp
-build: patch build-stamp
+# build: patch build-stamp
+build: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -29,7 +30,7 @@ build-stamp: configure-stamp
touch build-stamp
-clean: unpatch
+clean: # unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -78,5 +79,10 @@ binary-arch: build install
dh_md5sums
dh_builddeb
+get-orig-source:
+ # Hmmm, somehow it does not yet work to us bzipeed source files -
+ # perhaps somebody else is more clever than me
+ echo "Try `bzcat texmaker-1.9.1.tar.bz2 | gzip -9 - > texmaker_1.9.1.orig.tar.gz` to get the orig.tar.gz"
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/texmaker.docs b/debian/texmaker.docs
index 88e772b..e61af01 100644
--- a/debian/texmaker.docs
+++ b/debian/texmaker.docs
@@ -1,2 +1 @@
utilities/AUTHORS
-utilities/README_DIC_fr_FR.txt
diff --git a/debian/texmaker.install b/debian/texmaker.install
index 0e69fac..6e7b260 100644
--- a/debian/texmaker.install
+++ b/debian/texmaker.install
@@ -1,11 +1,10 @@
texmaker usr/bin
-utilities/*.html usr/share/doc/texmaker/html
-utilities/*.css usr/share/doc/texmaker/html
utilities/*.gif usr/share/doc/texmaker/html
-utilities/doc*.png usr/share/doc/texmaker/html
+doc/* usr/share/doc/texmaker/html
+dictionaries/*.txt usr/share/doc/texmaker/dictionaries
utilities/[a-ce-su-z]*.png usr/share/texmaker
utilities/[a-km-z]*.txt usr/share/texmaker
-utilities/*.qm usr/share/texmaker
+locale/* usr/share/texmaker
utilities/texmaker16x16.png usr/share/icons/hicolor/16x16/apps/
utilities/texmaker22x22.png usr/share/icons/hicolor/22x22/apps/
utilities/texmaker32x32.png usr/share/icons/hicolor/32x32/apps/
--
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