d/watch, d/copyright: Update to reflect new repacking; include libdxfrw as component...

diff --git a/debian/copyright b/debian/copyright
index b9727b2954ab78e69031797a415534e85a28c6e3..5897632ee3aa06c69f87bb057b6cc96d9861e1cc 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,19 +2,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: solvespace
 Source: https://github.com/solvespace/solvespace
 Comment: Excluding vendored third-party libs available in Debian,
-  minified javascript, vendored unifot,  Windows-only binaries, and
+  minified javascript, vendored unifont,  Windows-only binaries, and
   prebuilt documentation
 Files-Excluded:
-  extlib/angle
-  extlib/cairo
-  extlib/eigen
-  extlib/freetype
-  extlib/libpng
-  extlib/mimalloc/bin
-  extlib/mimalloc/docs
-  extlib/pixman
-  extlib/si
-  extlib/zlib
+  extlib/*
   res/fonts/unifont.hex.gz
   res/threejs/three-*
 
@@ -43,15 +34,10 @@ Files: debian/missing_sources/res/threejs/hammer-2.0.8.js
 Copyright: 2016, Jorik Tangelder
 License: Expat
 
-Files: extlib/libdxfrw/*
+Files: libdxfrw/*
 Copyright: 2011-2015, José F. Soriano (Rallaz) <rallazz@gmail.com>
 License: GPL-2.0+
 
-Files: extlib/mimalloc/*
-Copyright: 2018-2021, Microsoft Research
-  2019, Daan Leijen
-License: Expat
-
 Files: src/importidf.cpp
 Copyright: 2020, Paul Kahler.
 License: GPL-3.0+

diff --git a/debian/watch b/debian/watch
index fb1457470e335bab9e9fddafe78b01859da1e453..8603603c46e381fedd0c8d13280156ee8163af22 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,9 +1,17 @@
 version=5
 
 opts="filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/solvespace-$1.tar.gz/, \
-      repacksuffix=+ds1, \
+         repacksuffix=+dfsg, \
       uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/, \
-      dversionmangle=s/\+ds\d+$//" \
+      dversionmangle=s/\+dfsg\d+$//" \
 https://github.com/solvespace/solvespace/tags \
 (?:.*?/)?v?(\d\S+)\.tar\.gz
-
+opts=\
+component=libdxfrw,\
+compression=gz,\
+mode=git,\
+pgpmode=none,\
+pretty=libdxfrw-%cd.%h \
+  https://github.com/solvespace/libdxfrw \
+  HEAD \
+  ignore