[med-svn] [Git][med-team/jellyfish][master] 7 commits: d/jellyfish-examples.lintian-overrides: renamed.

Tue Dec 5 18:28:08 GMT 2023


Étienne Mollier pushed to branch master at Debian Med / jellyfish


Commits:
16289a65 by Étienne Mollier at 2023-12-05T18:43:27+01:00
d/jellyfish-examples.lintian-overrides: renamed.

The file is renamed to d/jellyfish.lintian-overrides.  The content is
also adjusted to reflect that the overriden spelling error moved
package.

- - - - -
38500bf9 by Étienne Mollier at 2023-12-05T18:53:51+01:00
d/clean: new: cleanup build artifacts.

Closes: #1046793

- - - - -
4f4989af by Étienne Mollier at 2023-12-05T18:54:31+01:00
d/rules: cleanup dh_auto_clean override.

This is made possible by the introduction of the d/clean file.

- - - - -
9249da6d by Étienne Mollier at 2023-12-05T19:07:26+01:00
d/libjellyfish-2.0-2.lintian-overrides: fix broken override.

- - - - -
916b291b by Étienne Mollier at 2023-12-05T19:08:25+01:00
d/rules: remove config.h from header package.

This fixes PACKAGE_NAME macro definition collision with potential
autotools consumers in reverse dependencies, per lintian warning.

- - - - -
fa38b897 by Étienne Mollier at 2023-12-05T19:11:11+01:00
d/libjellyfish-2.0-2.lintian-overrides: remove unused override.

- - - - -
7e3306cf by Étienne Mollier at 2023-12-05T19:27:28+01:00
ready to upload to unstable.

- - - - -


6 changed files:

- debian/changelog
- + debian/clean
- − debian/jellyfish-examples.lintian-overrides
- + debian/jellyfish.lintian-overrides
- debian/libjellyfish-2.0-2.lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+jellyfish (2.3.0-17) unstable; urgency=medium
+
+  * d/clean: new: cleanup build artifacts. (Closes: #1046793)
+  * d/rules: cleanup dh_auto_clean override.
+    This is made possible by the introduction of the d/clean file.
+  * d/rules: remove config.h from header package.
+    This fixes PACKAGE_NAME macro definition collision with potential
+    autotools consumers in reverse dependencies, per lintian warning.
+  * d/libjellyfish-2.0-2.lintian-overrides: fix broken override.
+  * d/libjellyfish-2.0-2.lintian-overrides: remove unused override.
+  * d/jellyfish-examples.lintian-overrides: renamed.
+    The file is renamed to d/jellyfish.lintian-overrides.  The content is also
+    adjusted to reflect that the overriden spelling error moved package.
+
+ -- Étienne Mollier <emollier at debian.org>  Tue, 05 Dec 2023 19:11:55 +0100
+
 jellyfish (2.3.0-16) unstable; urgency=medium
 
   [ Étienne Mollier ]


=====================================
debian/clean
=====================================
@@ -0,0 +1,19 @@
+.pybuild/
+tests/compat.sh
+swig/python/__pycache__/
+swig/python/build/temp.*-*-*/
+swig/python/dna_jellyfish.egg-info/
+swig/python/jellyfish*
+swig/perl5/blib/arch/auto/jellyfish/jellyfish.so
+swig/perl5/blib/bin/.exists
+swig/perl5/blib/lib/.exists
+swig/perl5/blib/lib/auto/jellyfish/.exists
+swig/perl5/blib/man1/.exists
+swig/perl5/blib/man3/.exists
+swig/perl5/blib/script/.exists
+swig/perl5/jellyfish.bs
+swig/perl5/pm_to_blib
+swig/perl5/MYMETA.json
+swig/perl5/MYMETA.yml
+swig/perl5/Makefile
+swig/perl5/blib/


=====================================
debian/jellyfish-examples.lintian-overrides deleted
=====================================
@@ -1 +0,0 @@
-jellyfish-examples: spelling-error-in-binary usr/lib/jellyfish/bin/test_all Usefull Useful


=====================================
debian/jellyfish.lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# This happens to be a variable name, literally "use full".
+jellyfish: spelling-error-in-binary Usefull Useful [usr/lib/jellyfish/bin/test_all]


=====================================
debian/libjellyfish-2.0-2.lintian-overrides
=====================================
@@ -1,3 +1,2 @@
 # Upstream decided to use a dynamic library without really intending to make this a development package
-libjellyfish-2.0-2: no-symbols-control-file .*
-libjellyfish-2.0-2: embedded-library usr/lib/*/libjellyfish-*.so.*: libjsoncpp
+libjellyfish-2.0-2: no-symbols-control-file usr/lib/*/libjellyfish-*.so.*


=====================================
debian/rules
=====================================
@@ -58,26 +58,11 @@ override_dh_auto_configure:
 	dh_auto_configure --sourcedirectory=swig/python --buildsystem=pybuild
 	mv /tmp/m4-ax_python_devel.m4 m4
 
-override_dh_clean:
-	dh_clean
+execute_after_dh_clean:
 	if [ -d debian/tmp_save_tests ] ; then \
 	    mv debian/tmp_save_tests/* tests ; \
 	    rmdir debian/tmp_save_tests ; \
 	fi
-	rm -f tests/compat.sh
-	rm -f swig/python/jellyfish* # swig/python/dna_jellyfish.py
-	rm -f swig/perl5/blib/arch/auto/jellyfish/jellyfish.so
-	rm -f swig/perl5/blib/bin/.exists
-	rm -f swig/perl5/blib/lib/.exists
-	rm -f swig/perl5/blib/lib/auto/jellyfish/.exists
-	rm -f swig/perl5/blib/man1/.exists
-	rm -f swig/perl5/blib/man3/.exists
-	rm -f swig/perl5/blib/script/.exists
-	rm -f swig/perl5/jellyfish.bs
-	rm -f swig/perl5/pm_to_blib
-	rm -rf swig/perl5/MYMETA.json swig/perl5/MYMETA.yml swig/perl5/Makefile swig/perl5/blib/
-
-
 
 override_dh_auto_build:
 	mkdir -p debian/tmp_save_tests
@@ -115,3 +100,8 @@ override_dh_missing:
 	# Necessary Perl files are just installed
 	rm -rf debian/tmp/usr/lib/perl/5.*
 	dh_missing
+
+execute_after_dh_install:
+	# Fix PACKAGE_NAME defined in config.h colliding with potential reverse
+	# dependencies autotools invocations, per lintian warning.
+	rm -vf debian/libjellyfish-2.0-dev/usr/include/jellyfish/config.h



View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/compare/445b41425ce1068cdfa8654d93a87ca948cc4663...7e3306cff4f176c59b7f47f206aa2e97b20fd9ab

-- 
View it on GitLab: https://salsa.debian.org/med-team/jellyfish/-/compare/445b41425ce1068cdfa8654d93a87ca948cc4663...7e3306cff4f176c59b7f47f206aa2e97b20fd9ab
You're receiving this email because of your account on salsa.debian.org.


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