diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.gitignore | 1 | ||||
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 34 | ||||
| -rw-r--r-- | debian/lrc.excludes | 6 | ||||
| -rw-r--r-- | debian/patches/0005-fix_link_lib_failed.patch | 4 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/xtrkcad-common.lintian-overrides | 1 |
10 files changed, 48 insertions, 25 deletions
diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..45afc37 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1 @@ +files
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index f927e75..559194e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +xtrkcad (1:5.3.1GA-1) UNRELEASED; urgency=medium + + * debian/rules: + - Add -std=gnu17 to CFLAGS to fix FTBFS with GCC-15 (Closes: #1098175). + * debian/copyright: + - Replace old FSF address. + - Rewrite to make lrc happy. + * debian/control: + - Bump Standards-Version to 4.7.2.0. + - Change Vcs-Git from git to https. + * debian/patches/0005-fix_link_lib_failed.patch: + - Fix Last-Update + * overrides: + - Remove now useless debian/source/lintian-overrides. + - Remove source-is-missing from debian/xtrkcad-common.lintian-overrides. + + -- Jörg Frings-Fürst <debian@jff.email> Fri, 24 Oct 2025 20:00:44 +0200 + xtrkcad (1:5.3.0GA-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 21463b0..05adb8f 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,9 @@ Build-Depends: libzip-dev, pandoc Rules-Requires-Root: no -Standards-Version: 4.7.0.0 +Standards-Version: 4.7.2.0 Homepage: http://xtrkcad.org/ -Vcs-Git: git://git.jff.email/xtrkcad.git +Vcs-Git: https://git.jff.email/cgit/xtrkcad.git Vcs-Browser: https://git.jff.email/cgit/xtrkcad.git Package: xtrkcad diff --git a/debian/copyright b/debian/copyright index 836e54f..88ce0f3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Source: http://sourceforge.net/projects/xtrkcad-fork/ Files: * Copyright: 2003 Sillub Technology 2005-2015 Troy D. Hanson - 2005-2022 Dave Bullis + 2005-2024 Dave Bullis 2006-2024 Martin Fischer 2007 Bob Blackwell License: GPL-2+ @@ -78,7 +78,7 @@ License: Expat Files: app/tools/dirent.* Copyright: 1997-2003 Kevlin Henney -License: permissive +License: Kevlin-Henney Files: app/wlib/gtklib/uthash.h Copyright: 2005-2014 Troy D. Hanson @@ -124,9 +124,8 @@ License: GPL-2+ 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 + License along with this package; If not, see + https://www.gnu.org/licenses/. . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file @@ -173,14 +172,6 @@ License: Expat TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -License: permissive - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose is hereby granted without fee, provided - that this copyright and permissions notice appear in all copies and - derivatives. - . - This software is supplied "as is" without express or implied warranty. - License: public-domain THIS WORK IS IN PUBLIC DOMAIN: The person or persons who have associated work with this document @@ -222,8 +213,7 @@ License: LGPL-2+ 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 + License along with this library; If not, see https://www.gnu.org/licenses/. . 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". @@ -241,9 +231,7 @@ License: GPL-2 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 + License along with this package; If not, see https://www.gnu.org/licenses/. . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file @@ -309,3 +297,13 @@ License: APAFML 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. + +License: Kevlin-Henney + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose is hereby granted without fee, provided + that this copyright and permissions notice appear in all copies and + derivatives. + . + This software is supplied "as is" without express or implied warranty. + . + But that said, if there are any problems please get in touch. diff --git a/debian/lrc.excludes b/debian/lrc.excludes new file mode 100644 index 0000000..60bbe05 --- /dev/null +++ b/debian/lrc.excludes @@ -0,0 +1,6 @@ +LICENSE +app/tools/halibut/LICENCE +app/wlib/mswlib/getline/LICENSE +app/doc/warranty.but +distribution/posix/xtrkcad.spec +app/doc/warranty.but diff --git a/debian/patches/0005-fix_link_lib_failed.patch b/debian/patches/0005-fix_link_lib_failed.patch index 23deba2..3ea9bf2 100644 --- a/debian/patches/0005-fix_link_lib_failed.patch +++ b/debian/patches/0005-fix_link_lib_failed.patch @@ -2,8 +2,8 @@ Description: fix_xtrkcad_build_failure Author: Yue Gui <yuemeng.gui@gmail.com> Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087474 Forwarded: not-needed -Last-Update: 2024-11-14 <YYYY-MM-DD, last update of the meta-information, optional> ---- +Last-Update: 2024-11-14 +- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/CMake/FindLibzip.cmake +++ b/CMake/FindLibzip.cmake diff --git a/debian/patches/series b/debian/patches/series index 2017ae8..ae4b507 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ #0001-usr_gtk-3.patch -0901-implicit-function-declaration.patch +#0901-implicit-function-declaration.patch #0900-spelling-errors.patch 0005-fix_link_lib_failed.patch diff --git a/debian/rules b/debian/rules index e58c57d..59a33ff 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,8 @@ # hardening export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--allow-multiple-definition +export CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -std=gnu17 + %: dh $@ diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index aec63b9..0000000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -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 467e3d1..362d6fb 100644 --- a/debian/xtrkcad-common.lintian-overrides +++ b/debian/xtrkcad-common.lintian-overrides @@ -1,2 +1 @@ national-encoding -source-is-missing [app/doc/xtrkcad-manual-5.3.0.html] |