[med-svn] [Git][med-team/libpinchesandcacti][master] 5 commits: Do not mention removed cutest in d/copyright

Andreas Tille (@tille) gitlab at salsa.debian.org
Tue Nov 3 10:42:36 GMT 2026



Andreas Tille pushed to branch master at Debian Med / libpinchesandcacti


Commits:
8dffd3f7 by Andreas Tille at 2026-11-03T11:24:33+01:00
Do not mention removed cutest in d/copyright

- - - - -
a3606b3a by Andreas Tille at 2026-11-03T11:25:11+01:00
Remove cutest from examples

- - - - -
eedafb2b by Andreas Tille at 2026-11-03T11:26:00+01:00
Link the test suite against the packaged CuTest instead of carrying a private copy

- - - - -
5a14fe06 by Andreas Tille at 2026-11-03T11:27:45+01:00
Upload to unstable

- - - - -
0e64d385 by Andreas Tille at 2026-11-03T11:39:59+01:00
Nothing to exclude in latest upstream source

- - - - -


6 changed files:

- debian/changelog
- debian/copyright
- debian/libpinchesandcacti-dev.examples
- debian/rules
- debian/tests/run-unit-test
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libpinchesandcacti (0.0~git20261029.1d38818-1) UNRELEASED; urgency=medium
+libpinchesandcacti (0.0~git20261029.1d38818-1) unstable; urgency=medium
 
   * Change packaging to fork which immediately replaced non-free parts
   * New upstream version
@@ -9,7 +9,7 @@ libpinchesandcacti (0.0~git20261029.1d38818-1) UNRELEASED; urgency=medium
     instead of a separate consumer program
   * Build-/Test-Depends: libcutest-dev
 
- -- Andreas Tille <tille at debian.org>  Thu, 29 Oct 2026 10:47:27 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 03 Nov 2026 11:26:08 +0100
 
 libpinchesandcacti (0.0~git20240507.67138b5+dfsg-1) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
@@ -1,8 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pinchesAndCacti
 Source: https://github.com/ComparativeGenomicsToolkit/pinchesAndCacti
-Files-Excluded:
- externalTools
 
 Files: *
 Copyright: 2009-2026 Benedict Paten <benedictpaten at gmail.com>
@@ -20,11 +18,6 @@ Files: debian/*
 Copyright: 2026 Andreas Tille <tille at debian.org>
 License: MIT
 
-Files: debian/tests/CuTest.*
-Copyright: 2002-2003 Asim Jalis <asimjalis at gmail.com>
-License: Zlib
-Comment: CuTest 1.5, copied from sonLib's externalTools/cutest.
-
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -43,23 +36,3 @@ License: MIT
  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.
-
-License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not
-    be misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source
-    distribution.


=====================================
debian/libpinchesandcacti-dev.examples
=====================================
@@ -1,6 +1,3 @@
 debian/README.test
 debian/tests/run-unit-test
-debian/tests/CuTest.c
-debian/tests/CuTest.h
-debian/tests/CuTest.LICENSE
 tests/*


=====================================
debian/rules
=====================================
@@ -52,8 +52,8 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 		sonLibRootDir=obj/sonLib \
 		BINDIR=obj LIBDIR=obj \
 		CC="$(CC)" AR="$(AR)" RANLIB=ranlib \
-		CPPFLAGS="$(CPPFLAGS) -Iinc -I/usr/include/sonLib -I debian/tests" \
+		CPPFLAGS="$(CPPFLAGS) -Iinc -I/usr/include/sonLib -I/usr/include/cutest" \
 		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		LIBDEPENDS="debian/tests/CuTest.c" \
-		LDLIBS="debian/tests/CuTest.c -l:libsonlib.a -lquicktree -lm -lpthread"
+		LIBDEPENDS= \
+		LDLIBS="-lcutest -l:libsonlib.a -lquicktree -lm -lpthread"
 endif


=====================================
debian/tests/run-unit-test
=====================================
@@ -13,12 +13,14 @@ fi
 cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
 cd "${AUTOPKGTEST_TMP}"
 
-gcc -O2 -Wall -I/usr/include/pinchesAndCacti -I/usr/include/sonLib -I. \
-	*.c -l:libpinchesandcacti.a -l:libsonlib.a -lquicktree \
+gcc -O2 -Wall -I/usr/include/pinchesAndCacti -I/usr/include/sonLib \
+	-I/usr/include/cutest -I. \
+	*.c -l:libpinchesandcacti.a -l:libsonlib.a -lcutest -lquicktree \
 	-lm -lpthread -o allTests-static
 ./allTests-static
 
-gcc -O2 -Wall -I/usr/include/pinchesAndCacti -I/usr/include/sonLib -I. \
-	*.c -lpinchesandcacti -l:libsonlib.a -lquicktree \
+gcc -O2 -Wall -I/usr/include/pinchesAndCacti -I/usr/include/sonLib \
+	-I/usr/include/cutest -I. \
+	*.c -lpinchesandcacti -l:libsonlib.a -lcutest -lquicktree \
 	-lm -lpthread -o allTests-shared
 ./allTests-shared


=====================================
debian/watch
=====================================
@@ -4,5 +4,3 @@ Source: https://github.com/ComparativeGenomicsToolkit/pinchesAndCacti
 Mode: git
 Matching-Pattern: HEAD
 Git-Pretty: 0.0~git%cd.%h
-Dversion-Mangle: auto
-Repack-Suffix: +dfsg



View it on GitLab: https://salsa.debian.org/med-team/libpinchesandcacti/-/compare/225eb9c1be656816fb369b53f0af45b4aa387e59...0e64d385972db223d999693e2cbb3ef5a2efa40e

-- 
View it on GitLab: https://salsa.debian.org/med-team/libpinchesandcacti/-/compare/225eb9c1be656816fb369b53f0af45b4aa387e59...0e64d385972db223d999693e2cbb3ef5a2efa40e
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261103/3c17c95c/attachment-0001.htm>


More information about the debian-med-commit mailing list