New Upstream Snapshot - fontmatrix

Ready changes

Summary

Merged new upstream version: 0.9.100+git20220221.1.d92f2e9+ds (was: 0.9.100+ds).

Resulting package

Built on 2023-01-19T01:29 (took 15m35s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of: 

apt install -t fresh-snapshots fontmatrix-dbgsymapt install -t fresh-snapshots fontmatrix

Lintian Result

Diff

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fd326c2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# /
-/bin
-/templates
-/Doxyfile
-/typotek.kdevelop
-/typotek.kdevelop.pcs
-/typotek.kdevses
-/Makefile
-/fontmatrix.kdevelop
-/fontmatrix.kdevelop.filelist
-/fontmatrix.kdevelop.pcs
-/fontmatrix.kdevses
-
-CMakeCache.txt
-cmake_install.cmake
-CPackConfig.cmake
-CPackSourceConfig.cmake
-Makefile
-CMakeFiles/
-
-# /harfbuzz/
-/harfbuzz/.git
-/harfbuzz/tests
-/harfbuzz/.gitignore
-
-# /src/
-/src/Makefile
-/src/customscene.cpp
-/src/customscene.h
-/src/moc_*.cpp
-/src/qrc_*.cpp
-/src/moc_*.cpp_parameters
-/src/ui_*.h
-/src/*.qm
-/src/mainview.ui_BAK
-/src/Makefile.Release
-/src/Makefile.Debug
-/src/qmake_image_collection.cpp
-/src/fontmatrix_splashscreen.png
-
-# /src/messages/
-/src/messages/about.html~
diff --git a/INSTALL b/INSTALL
index 5382ca2..6d753ba 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Requirements :
 	- CMake (>=2.6.0)
 	- Qt 4.4 (with QtWebKit)
 	- Freetype2 (>=2.3.5)
-*not to mention that you need the developpement packages.
+*not to mention that you need the development packages.
 	
 
 Build instructions are (where $FM_SOURCE_DIR is
diff --git a/README.md b/README.md
index 928df63..1b3a905 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,7 @@ https://www.mail-archive.com/undertype-users@gna.org/maillist.html
 
 The project was originally developed by Pierre Marchand between 2007 and 2011.
 It is currently in maintenance mode and isn't worked on by any actual programmer.
+
+Windows and macOS builds require new contributors. Flatpak build is
+[available on Flathub](https://flathub.org/apps/details/com.github.fontmatrix.Fontmatrix), 
+AppImage build could be created by interested contributors.
diff --git a/debian/changelog b/debian/changelog
index e8bfb2d..0c392cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fontmatrix (0.9.100+git20220221.1.d92f2e9+ds-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Thu, 19 Jan 2023 01:16:00 -0000
+
 fontmatrix (0.9.100+ds-1) unstable; urgency=medium
 
   * New upstream version. (Closes: #579314)
diff --git a/debian/patches/m b/debian/patches/m
index 7918846..5a5751e 100644
--- a/debian/patches/m
+++ b/debian/patches/m
@@ -25,8 +25,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: 2020-02-05
 
---- fontmatrix-0.6.1+git20190730.orig/fontmatrix.1
-+++ fontmatrix-0.6.1+git20190730/fontmatrix.1
+Index: fontmatrix.git/fontmatrix.1
+===================================================================
+--- fontmatrix.git.orig/fontmatrix.1
++++ fontmatrix.git/fontmatrix.1
 @@ -1,19 +1,15 @@
 -.TH "fontmatrix" "1" "Updated 2008-05-18" "Peter Linnell" ""
 +.TH "fontmatrix" "1" "Updated 2020-02-05" "Peter Linnell" ""
@@ -60,7 +62,7 @@ Last-Update: 2020-02-05
  Suppresses display of the splash screen during SCribus start\-up.
 @@ -62,7 +56,6 @@ Scribus \- http://www.scribus.net
  
- Other affiliates may be listed in the footer on http://www.fontmatrix.net/
+ Other affiliates may be listed in the footer on https://github.com/fontmatrix/fontmatrix
  
 -
  .SH "BUGS"
diff --git a/fontmatrix.1 b/fontmatrix.1
index 7a32aa8..9c82f53 100644
--- a/fontmatrix.1
+++ b/fontmatrix.1
@@ -60,13 +60,13 @@ Fontconfig, the library used by Fontmatrix to locate fonts, is normally configur
 .SH "RELATED SOFTWARE AND AFFILIATES"
 Scribus \- http://www.scribus.net
 
-Other affiliates may be listed in the footer on http://www.fontmatrix.net/
+Other affiliates may be listed in the footer on https://github.com/fontmatrix/fontmatrix
 
 
 .SH "BUGS"
 See
 .I 
-https://gna.org/bugs/?group=undertype
+https://github.com/fontmatrix/fontmatrix/issues
 for the Fontmatrix on\-line status tracker, which is used to track bug reports and feature requests.
 .B If you intend to submit a bug report or feature request, please search the bug database first.
 .SH "AUTHORS"
diff --git a/help/en/contributing_testing.html b/help/en/contributing_testing.html
index c7cbf57..67aea05 100644
--- a/help/en/contributing_testing.html
+++ b/help/en/contributing_testing.html
@@ -38,10 +38,7 @@
 <h3>Reporting bugs and requesting features</h3>
 
 <p>You can submit bugs reports to our 
-<a title="Go to https://gna.org/bugs/?func=additem&group=undertype" 
-href="https://gna.org/bugs/?func=additem&group=undertype">bugtracker</a> 
-(no need to register). Don’t worry about the "Undertype" name, as Fontmatrix 
-originally belonged to this bigger project.</p>
+<a href="https://github.com/fontmatrix/fontmatrix/issues">bugtracker</a>.</p>
 
 <p>A good, useful bug report contains:</p>
 
diff --git a/help/en/contributing_translating.html b/help/en/contributing_translating.html
index 9f25add..5cfa0ec 100644
--- a/help/en/contributing_translating.html
+++ b/help/en/contributing_translating.html
@@ -27,9 +27,9 @@
 
 <h3>Translating user interface</h3>
 
-<p>The very first thing you need to translate Fontmatrix into your native language is to get source code from the current developpement branch. To do this, you need a Subversion client (<span class="code">svn</span> being the regular command line client). Then type 
+<p>The very first thing you need to translate Fontmatrix into your native language is to get source code from the current developpement branch. To do this, you need a Git client (<span class="code">git</span> being the regular command line client). Then type 
 
-<p><tt>svn co http://svn.gna.org/svn/undertype/trunk/tools/typotek fontmatrix</tt></p>
+<p><tt>git clone https://github.com/fontmatrix/fontmatrix.git</tt></p>
 
 <p>somewhere in your home directory to fetch source code, so that you always have access to it.</p>
 
diff --git a/help/en/resources.html b/help/en/resources.html
index 7214054..2ad4f36 100644
--- a/help/en/resources.html
+++ b/help/en/resources.html
@@ -11,13 +11,8 @@
 
 <h3>Contacting to developers and fellow users</h3>
 
-<p>If you want to ask questions regarding use of Fontmatrix or, you can either 
-join the <a title="Go to https://mail.gna.org/listinfo/undertype-users/" 
-href="https://mail.gna.org/listinfo/undertype-users/">mailing list</a> 
-or our <a title="Go to http://www.fontmatrix.net/node/33" 
-href="http://www.fontmatrix.net/node/33">IRC channel</a> at Freenode 
-network (we’ve embedded a webchat client under Fast IRC that you can use if 
-you’re really unused to this IRC thing).</p>
+<p>If you want to ask questions regarding use of Fontmatrix, you can
+visit the <a href="https://github.com/fontmatrix/fontmatrix">website</a>.</p>
 
 <p>You can also join a forum at <a href="http://www.libregraphicsworld.org">
 Libre Graphics World</a> website and ask your questions there.</p>
@@ -29,7 +24,7 @@ Libre Graphics World</a> website and ask your questions there.</p>
 <ul>
 	<li><a title="Go to http://openfontlibrary.org/media/view/media/fonts" href="http://openfontlibrary.org/media/view/media/fonts">OpenFont Library</a></li>
 	<li><a title="" href="http://linuxlibertine.sourceforge.net">LinuxLibertine font family</a></li>
-	<li><a title="" href="http://dejavu.sourceforge.net">DejaVu font family</a></li>
+	<li><a title="" href="http://dejavu-fonts.github.io">DejaVu font family</a></li>
 </ul>
 
 </body>
diff --git a/help/en/search_using_bitmap_samples.html b/help/en/search_using_bitmap_samples.html
index 166d7d4..dbcbb66 100644
--- a/help/en/search_using_bitmap_samples.html
+++ b/help/en/search_using_bitmap_samples.html
@@ -15,7 +15,5 @@
 
 <p>Now type in the character that is on the sample and press <b>Search</b> button.</p>
 
-<p>You can also watch a <a href="http://fontmatrix.net/node/44">screencast</a> demonstrating this functionality.</p>
-
 </body>
 </html>
diff --git a/src/fmfontcompareview.cpp b/src/fmfontcompareview.cpp
index e30320d..dbf9b5a 100644
--- a/src/fmfontcompareview.cpp
+++ b/src/fmfontcompareview.cpp
@@ -414,7 +414,7 @@ QColor FMFontCompareView::getColor(int level)
 
 void FMFontCompareView::mousePressEvent(QMouseEvent * e)
 {
-	if ( e->button() == Qt::MidButton )
+	if ( e->button() == Qt::MiddleButton )
 	{
 		mouseStartPoint =  e->pos() ;
 		isPanning = true;
diff --git a/src/fmplayground.cpp b/src/fmplayground.cpp
index f31c9f5..9587928 100644
--- a/src/fmplayground.cpp
+++ b/src/fmplayground.cpp
@@ -73,7 +73,7 @@ void FMPlayGround::mousePressEvent ( QMouseEvent * e )
 {
 	closeLine();
 	mouseStartPoint =  e->pos() ;
-	if ( e->button() == Qt::MidButton )
+	if ( e->button() == Qt::MiddleButton )
 	{
 		isPanning = true;
 		return;
diff --git a/src/fmsampletextview.cpp b/src/fmsampletextview.cpp
index fc2664b..a1f7d5f 100644
--- a/src/fmsampletextview.cpp
+++ b/src/fmsampletextview.cpp
@@ -81,7 +81,7 @@ void FMSampleTextView::mousePressEvent ( QMouseEvent * e )
 	if ( locker )
 		return;
 
-	if ( e->button() == Qt::MidButton )
+	if ( e->button() == Qt::MiddleButton )
 	{
 		mouseStartPoint =  e->pos() ;
 		isPanning = true;
diff --git a/src/iview.cpp b/src/iview.cpp
index b62958f..7d793e2 100644
--- a/src/iview.cpp
+++ b/src/iview.cpp
@@ -124,7 +124,7 @@ void IView::mousePressEvent ( QMouseEvent * e )
 	if ( !scene() )
 		return;
 
-	if ( e->button() == Qt::MidButton )
+	if ( e->button() == Qt::MiddleButton )
 	{
 		mouseStartPoint =  e->pos() ;
 		isPanning = true;
diff --git a/src/messages/about.html b/src/messages/about.html
index 944dc53..6fdd0d3 100644
--- a/src/messages/about.html
+++ b/src/messages/about.html
@@ -11,6 +11,6 @@
 <li>Refining the fonts selection by comparing glyphs in details</li>
 <li>Generating font "books" as PDF.</li>
 </ul>
-<p>Find more at <a href="http://www.fontmatrix.net">fontmatrix.net</a> or from built-in help system.</p>
+<p>Find more at <a href="https://github.com/fontmatrix/fontmatrix">fontmatrix</a> or from built-in help system.</p>
 </body>
 </html>
diff --git a/src/messages/about_cs.html b/src/messages/about_cs.html
index 6993bab..1454bfc 100644
--- a/src/messages/about_cs.html
+++ b/src/messages/about_cs.html
@@ -14,6 +14,6 @@
 <li>pročištění výběru písem porovnáním podrobností glyfů</li>
 <li>vytvoření vzorkovnic s písmy v podobě souboru PDF.</li>
 </ul>
-<p>Další informace naleznete na stránkách <a href="http://www.fontmatrix.net">fontmatrix.net nebo pomocí do programu vestavěného systému nápovědy</a></p>.
+<p>Další informace naleznete na stránkách <a href="https://github.com/fontmatrix/fontmatrix">fontmatrix nebo pomocí do programu vestavěného systému nápovědy</a></p>.
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/messages/about_de.html b/src/messages/about_de.html
index 29a3f38..2a2f283 100644
--- a/src/messages/about_de.html
+++ b/src/messages/about_de.html
@@ -8,6 +8,6 @@
 <p>Fontmatrix richtet sich vor allem an Grafikdesigner und Typographen, die mit Hunderten von Schriften umgehen und dabei endlos lange Schriftenlisten durchsehen müssen. <br/>
 <br>Fontmatrix ermöglicht im wesentlichen drei Dinge:
 <br>die Aktivierung und Deaktivierung von Schriften, die Auszeichnung ("Tagging") von Schriften und die Herstellung von Musterbüchern für Schriften.</p>
-<p>Weiter Informationen finden Sie unter <a href="http://www.fontmatrix.net">fontmatrix.net</a></p>.
+<p>Weiter Informationen finden Sie unter <a href="https://github.com/fontmatrix/fontmatrix">fontmatrix</a></p>.
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/messages/about_fi.html b/src/messages/about_fi.html
index e2e7faa..400f103 100644
--- a/src/messages/about_fi.html
+++ b/src/messages/about_fi.html
@@ -9,6 +9,6 @@
 <li>fonttien luokittelussa</li>
 <li>PDF-fonttikirjan tekemisess&auml;</li>
 </ul>
-<p>Lis&auml;&auml; tietoa l&ouml;ytyy osoitteesta <a href="http://www.fontmatrix.net">fontmatrix.net</a></p>
+<p>Lis&auml;&auml; tietoa l&ouml;ytyy osoitteesta <a href="https://github.com/fontmatrix/fontmatrix">fontmatrix</a></p>
 </body>
 </html>
diff --git a/src/messages/about_fr.html b/src/messages/about_fr.html
index cd53e8c..2148630 100644
--- a/src/messages/about_fr.html
+++ b/src/messages/about_fr.html
@@ -5,6 +5,6 @@
 <body>
 <h2>Fontmatrix</h2>
 <p>Un gestionnaire de polices pour Linux.</p>
-<p>Retrouvez le sur <a href="http://www.fontmatrix.net">fontmatrix.net</a></p>
+<p>Retrouvez le sur <a href="https://github.com/fontmatrix/fontmatrix">fontmatrix</a></p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/messages/about_ru.html b/src/messages/about_ru.html
index 8499e46..4a685f4 100644
--- a/src/messages/about_ru.html
+++ b/src/messages/about_ru.html
@@ -11,6 +11,6 @@
 <li>уточнять этот выбор путем подробного сравнения глифов;</li>
 <li>создавать печатаемые шрифтовые каталоги;</li>
 </ul>
-<p>Подробности вы можете узнать на <a href="http://www.fontmatrix.net">сайте программы</a> и из встроенной справочной системы.</p>
+<p>Подробности вы можете узнать на <a href="https://github.com/fontmatrix/fontmatrix">сайте программы</a> и из встроенной справочной системы.</p>
 </body>
 </html>
diff --git a/src/messages/about_uk.html b/src/messages/about_uk.html
index af553a8..dd48030 100644
--- a/src/messages/about_uk.html
+++ b/src/messages/about_uk.html
@@ -8,6 +8,6 @@
 <p>Програму призначено для заповзятливих розробників графічної продукції та працівників друкарської промисловості, які мають справу з сотнями, а іноді і більшою кількістю шрифтів під час своєї роботи — мандруючи нескінченними списками та діалогами вибору шрифтів.<br/>
 <br>Загалом, Fontmatrix допоможе вам з трьома речами:
 <br>активацією та деактивацією шрифтів, зміною тегів шрифтів та створенням книги шрифтів.</p>
-<p>Дізнатися більше про програму ви можете за адресою <a href="http://www.fontmatrix.net">fontmatrix.net</a></p>
+<p>Дізнатися більше про програму ви можете за адресою <a href="https://github.com/fontmatrix/fontmatrix">fontmatrix</a></p>
 </body>
-</html>
\ No newline at end of file
+</html>

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/e2/26a72e7c4107b518828a02eabcbe2f96ce4abe.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/ca/216206b5756a3be324076347a1ef1bf259aaea.debug

No differences were encountered between the control files of package fontmatrix

Control files of package fontmatrix-dbgsym: lines which differ (wdiff format)

  • Build-Ids: ca216206b5756a3be324076347a1ef1bf259aaea e226a72e7c4107b518828a02eabcbe2f96ce4abe

More details

Full run details

© 2018-2023 Jelmer Vernooij. File a bug. Source code. Published under the GNU GPLv2 or later.