Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1

10 files changed, 197 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 7f10bb0..80354fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xtrkcad (1:5.3.0GA-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1057286, #1074722):
+  * debian/control:
+    - Add Build-Depends:
+      + inkscape
+      + libfreeimage-dev
+      + pandoc
+    - Change to new repository URL.
+    - Change Standards-Version to 4.7.0.0 (No changes needed).
+    - Add myself as Maintainer and Daniel E. Markle as Uploader.
+      (Closes: #1057287)
+  * debian/xtrkcad.install:
+    - Add CHANGELOG.txt, Readme.txt
+  * debian/copyright:
+    - Add year 2024 to myself.
+    - Rebase for the new release.
+  * debian/changlog:
+    - Remove trailing whitespace.
+  * debian/rules:
+    - Remove trailing whitespace.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 03 Jul 2024 21:32:38 +0200
+
 xtrkcad (1:5.2.0Beta2.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -8,7 +32,7 @@ xtrkcad (1:5.2.0Beta2.1-1) unstable; urgency=medium
     - xtrkcad.desktop
   * debian/control:
     - Add new Build-Depend libzip-dev
-  * debian/rules: 
+  * debian/rules:
     - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error
       "multiple definition" (Closes: #958005).
   * Refresh patches:
diff --git a/debian/control b/debian/control
index f9621c4..21463b0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,23 @@
 Source: xtrkcad
 Section: editors
 Priority: optional
-Maintainer: Daniel E. Markle <dmarkle@ashtech.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Uploaders:
- Mike Gabriel <sunweaver@debian.org>,
- Jörg Frings-Fürst <debian@jff.email>
+ Daniel E. Markle <dmarkle@ashtech.net>,
+ Mike Gabriel <sunweaver@debian.org>
 Build-Depends:
  cmake,
  debhelper-compat (= 13),
+ inkscape,
+ libfreeimage-dev,
  libgtk2.0-dev,
- libzip-dev
+ libzip-dev,
+ pandoc
 Rules-Requires-Root: no
-Standards-Version: 4.5.0
+Standards-Version: 4.7.0.0
 Homepage: http://xtrkcad.org/
-Vcs-Git: git://jff.email/opt/git/xtrkcad.git
-Vcs-Browser: https://jff.email/cgit/xtrkcad.git/
+Vcs-Git: git://git.jff.email/xtrkcad.git
+Vcs-Browser: https://git.jff.email/cgit/xtrkcad.git
 
 Package: xtrkcad
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index dcd7cfe..836e54f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,8 +6,8 @@ Source: http://sourceforge.net/projects/xtrkcad-fork/
 Files: *
 Copyright: 2003      Sillub Technology
            2005-2015 Troy D. Hanson
-           2005-2007 Dave Bullis
-           2006-2017 Martin Fischer
+           2005-2022 Dave Bullis
+           2006-2024 Martin Fischer
            2007      Bob Blackwell
 License: GPL-2+
 
@@ -21,12 +21,41 @@ Files: app/bin/cblock.c
 Copyright: 2002-2017 Robert Heller D/B/A Deepwoods Software
 License: GPL-2+
 
+Files: app/bin/include/dirent.h
+Copyright: 2006-2012 Toni Ronkko
+License: Expat
+
+Files: app/cJSON/cJSON.*
+Copyright: 2009-2017 Dave Gamble and cJSON contributors
+License: Expat
+
+Files: app/bin/include/utlist.h
+       app/bin/uthash.h
+Copyright: 2007-2018 Troy D. Hanson
+License: BSD-1-Clause
+
+Files: CMake/FindGTKUnixPrint.cmake
+Copyright: 2012      Raphael Kubo da Costa <rakuco@webkit.org>
+           2014      Igalia S.L.
+License: BSD-2-Clause
+
+Files: app/lib/xdg-open
+Copyright: 2009-2010 Fathi Boudra <fabo@freedesktop.org>
+           2009-2010 Rex Dieter <rdieter@fedoraproject.org>
+           2006      Kevin Krammer <kevin.krammer@gmx.at>
+           2006 Jeremy White <jwhite@codeweavers.com>
+License: Expat
+
 Files: app/bin/i18n.*
        app/i18n/stripmsg.c
        app/i18n/fi.po
 Copyright: 2007-2008 Mikko Nissinen
 License: GPL-2+
 
+Files: distribution/fedora/xtrkcad.spec
+Copyright: 2022 Phil Cameron <pecameron1 -at- gmail.com>
+License: GPL-2 
+
 Files: app/i18n/pt_BR.po
 Copyright: 2009      Daniel Spagnol
 License: GPL-2+
@@ -39,6 +68,10 @@ Files: app/tools/halibut/*
 Copyright: 1999-2007 Simon Tatham
 License: Expat
 
+Files: app/tools/halibut/licence.c
+Copyright: 1999-2007 Simon Tatham
+License: APAFML
+
 Files: app/tools/halibut/charset/macenc.c
 Copyright: 2008      Ben Harris
 License: Expat
@@ -62,20 +95,19 @@ License: GPL-2+
 Files: app/wlib/mswlib/gwin32.c
 Copyright: 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald
            1998-1999 Tor Lillqvist
-License: GPL-2+
+License: LGPL-2+
 
 Files: app/wlib/mswlib/simple-gettext.c
 Copyright: 1995-2005 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: app/lib/icon.svg
-       app/bin/bitmaps/SVG/tipofday.svg
 Copyright: Jakub Steiner
 License: public-domain
 
 Files: debian/*
 Copyright: 2015      Daniel E. Markle <dmarkle@ashtech.net>
-           2016-2020 Jörg Frings-Fürst <debian@jff.email>
+           2016-2024 Jörg Frings-Fürst <debian@jff.email>
            2016-2017 Mike Gabriel <sunweaver@debian.org>
 License: GPL-2+
 
@@ -177,3 +209,103 @@ License: public-domain
  otherwise exploited by anyone for any purpose, commercial or non-commercial,
  and in any way, including by methods that have not yet been invented or
  conceived.
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: GPL-2
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation version
+ 2 of the License.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: APAFML
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.",
+ .
+ Halibut contains font metrics derived from the "Font Metrics for PDF
+ Core 14 Fonts", which carry the following copyright notice and licence:
+ .
+ Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1993, 1997
+ Adobe Systems Incorporated.  All Rights Reserved.
+ .
+ This file and the 14 PostScript(R) AFM files it accompanies may be
+ used, copied, and distributed for any purpose and without charge,
+ with or without modification, provided that all copyright notices
+ are retained; that the AFM files are not distributed without this
+ file; that all modifications to this file or any of the AFM files
+ are prominently noted in the modified file(s); and that this
+ paragraph is not modified. Adobe Systems has no responsibility or
+ obligation to support the use of the AFM files.
diff --git a/debian/not-installed b/debian/not-installed
index 6e2f846..8e2c9b4 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -6,3 +6,8 @@ usr/share/pixmaps/xtrkcad.png
 usr/share/applications/xtrkcad.desktop
 usr/share/xtrkcad/xdg-open 
 usr/share/xtrkcad/COPYING
+usr/share/locale/cy_GB/LC_MESSAGES/xtrkcad.mo
+usr/share/locale/ru/LC_MESSAGES/xtrkcad.mo
+usr/share/xtrkcad/applications/xtrkcad.xml
+usr/share/xtrkcad/xtrkcad-setup
+usr/share/xtrkcad/xtrkcad.upd
diff --git a/debian/patches/0001-usr_gtk-3.patch b/debian/patches/0001-usr_gtk-3.patch
new file mode 100644
index 0000000..afe0689
--- /dev/null
+++ b/debian/patches/0001-usr_gtk-3.patch
@@ -0,0 +1,13 @@
+Index: trunk/CMakeLists.txt
+===================================================================
+--- trunk.orig/CMakeLists.txt
++++ trunk/CMakeLists.txt
+@@ -64,7 +64,7 @@ if(APPLE)
+ endif()
+ 
+ IF(UNIX)
+-    PKG_CHECK_MODULES(GTK REQUIRED "gtk+-2.0")
++    PKG_CHECK_MODULES(GTK REQUIRED "gtk+-3.0")
+ ENDIF()
+ 
+ IF(APPLE)
diff --git a/debian/patches/series b/debian/patches/series
index c6c3550..0f9e10d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0900-spelling-errors.patch
+#0001-usr_gtk-3.patch
+#0900-spelling-errors.patch
diff --git a/debian/rules b/debian/rules
index fe59e52..e58c57d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 # hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND =  -Wl,--allow-multiple-definition 
+export DEB_LDFLAGS_MAINT_APPEND =  -Wl,--allow-multiple-definition
 
 %:
 	dh $@
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..aec63b9
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1 @@
+source-is-missing [app/doc/xtrkcad-manual-5.3.0.html]
diff --git a/debian/xtrkcad-common.lintian-overrides b/debian/xtrkcad-common.lintian-overrides
index 362d6fb..467e3d1 100644
--- a/debian/xtrkcad-common.lintian-overrides
+++ b/debian/xtrkcad-common.lintian-overrides
@@ -1 +1,2 @@
 national-encoding
+source-is-missing [app/doc/xtrkcad-manual-5.3.0.html]
diff --git a/debian/xtrkcad.install b/debian/xtrkcad.install
index b7f9538..73fef3e 100644
--- a/debian/xtrkcad.install
+++ b/debian/xtrkcad.install
@@ -1,4 +1,6 @@
 usr/share/xtrkcad/applications/xtrkcad.desktop           usr/share/applications
 usr/share/xtrkcad/logo.bmp       usr/share/doc/xtrkcad
 usr/share/xtrkcad/pixmaps/xtrkcad.png	usr/share/doc/xtrkcad
+usr/share/xtrkcad/CHANGELOG.txt		usr/share/doc/xtrkcad
+usr/share/xtrkcad/Readme.txt		usr/share/doc/xtrkcad
 usr/bin/*