[texmaker] 13/103: Solving 'hyphen-used-as-minus-sign' and 'desktop-entry-contains-encoding-key'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository texmaker.

commit 041d999e34f0ba8e417bbd7bb01d714430720db4
Author: Ruben Molina <rmolina at udea.edu.co>
Date:   Sat Sep 6 05:06:14 2008 +0000

    Solving 'hyphen-used-as-minus-sign' and 'desktop-entry-contains-encoding-key'
---
 debian/changelog                         |  4 +++-
 debian/patches/20_texmaker_desktop.patch | 14 +++++++++++---
 debian/texmaker.1                        |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c8e087..3411805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ texmaker (1.7.1-3) UNRELEASED; urgency=low
     into the debian-science SVN repository (Closes: #494291)
   * Add ghostscript to Recommends. Favor it over gs-*
   * Fix LaTeX spelling on doc-base and description
+  * Fix hyphen-used-as-minus-sign in texmaker.1
+  * Update 20_texmaker_desktop.patch to remove the deprecated Encoding key
   
   [ Andreas Tille ]
   * Removed obsolete packages from Depends: gs-gpl, gs-esp, gs-afpl,
@@ -12,7 +14,7 @@ texmaker (1.7.1-3) UNRELEASED; urgency=low
   * Removed Joseph Smidt because his mail address bounces
   * Added Ruben Molina to Uploaders
 
- -- Andreas Tille <tille at debian.org>  Sat, 06 Sep 2008 00:24:41 +0200
+ -- Ruben Molina <rmolina at udea.edu.co>  Sat, 06 Sep 2008 00:02:06 -0500
 
 texmaker (1.7.1-2.1) unstable; urgency=low
 
diff --git a/debian/patches/20_texmaker_desktop.patch b/debian/patches/20_texmaker_desktop.patch
index 6b4606c..44cbc75 100644
--- a/debian/patches/20_texmaker_desktop.patch
+++ b/debian/patches/20_texmaker_desktop.patch
@@ -1,6 +1,14 @@
---- texmaker-1.7.1.orig/utilities/texmaker.desktop
-+++ texmaker-1.7.1/utilities/texmaker.desktop
-@@ -9,12 +9,10 @@
+Index: texmaker-1.7.1/utilities/texmaker.desktop
+===================================================================
+--- texmaker-1.7.1.orig/utilities/texmaker.desktop	2006-12-28 11:50:30.000000000 -0500
++++ texmaker-1.7.1/utilities/texmaker.desktop	2008-09-05 23:42:18.000000000 -0500
+@@ -3,18 +3,15 @@
+ Comment=
+ Comment[fr]=
+ DocPath=
+-Encoding=UTF-8
+ Exec=texmaker
+ GenericName=LaTeX Editor
  GenericName[fr]=Editeur LaTeX
  Icon=texmaker
  MimeType=text/x-tex
diff --git a/debian/texmaker.1 b/debian/texmaker.1
index f428ac6..6007836 100644
--- a/debian/texmaker.1
+++ b/debian/texmaker.1
@@ -12,10 +12,10 @@ is a clean, highly configurable LaTeX editor with good hot key support and exten
 develop documents with LaTeX, in just one application. It has some nice featuressuch as syntax highlighting, insertion of 370 mathematical symbols with only one
 click, a structure view of the document for easier navigation. 
 
--master 	With this option, the document will be automatically defined
+\-master 	With this option, the document will be automatically defined
 		 as a "master" document.
 
--line xx 	With this option, Texmaker will ask you if you want to jump
+\-line xx 	With this option, Texmaker will ask you if you want to jump
 		to the xx line after loading the document
 
      See the user manuels under the 'Help' directory for documentation on the 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git