Bug#979369: libsdl2 FTBFS with DEB_BUILD_OPTIONS=nocheck

2021-01-06 Thread Gianfranco Costamagna
Pushed on git!

thanks
G.



Bug#979369: libsdl2 FTBFS with DEB_BUILD_OPTIONS=nocheck

2021-01-05 Thread Simon McVittie
Control: tags -1 + pending

On Tue, 05 Jan 2021 at 19:23:11 +0100, Helmut Grohne wrote:
> Please consider applying the attached patch.

Thanks, pushed to the experimental branch. I'm preparing a new upstream
release there, but the commits can easily be cherry-picked for unstable
if the new upstream release turns out not to be usable yet.

smcv



Bug#979369: libsdl2 FTBFS with DEB_BUILD_OPTIONS=nocheck

2021-01-05 Thread Helmut Grohne
Source: libsdl2
Version: 2.0.12+dfsg1-4
Severity: important
Tags: ftbfs patch

libsdl2 fails to build from source when built with
DEB_BUILD_OPTIONS=nocheck. debian/rules conditionalizes doxygen with
this option (which doesn't make much sense). In the end, dh_install
fails to find the files that doxygen should have generated. I'm
attaching a patch that simply removes the conditional.

While at it, I also noticed that doxygen's jquery.js is replaced with
libjs-jquery's. Unfortunately, what is named jquery.js is not jquery.js.
It's an amalgamation of multiple javascript libraries that happened to
start out as jquery but now include more. As such replacing it breaks
doxygen's javascript code. I'm quite simply dropping the replacement as
well.

Please consider applying the attached patch.

Helmut
--- libsdl2-2.0.12+dfsg1/debian/changelog
+++ libsdl2-2.0.12+dfsg1/debian/changelog
@@ -1,3 +1,11 @@
+libsdl2 (2.0.12+dfsg1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove wrong check of nocheck profile. (Closes: #-1)
+  * Don't replace jquery.js: What is named jquery, is not jquery.
+
+ -- Helmut Grohne   Tue, 05 Jan 2021 17:21:43 +0100
+
 libsdl2 (2.0.12+dfsg1-4) unstable; urgency=medium
 
   * Team upload
--- libsdl2-2.0.12+dfsg1/debian/control
+++ libsdl2-2.0.12+dfsg1/debian/control
@@ -116,7 +116,6 @@
 Build-Profiles: 
 Depends:
  ${misc:Depends},
- libjs-jquery
 Breaks:
  libsdl2-dev (<< 2.0.4+dfsg-1)
 Replaces:
--- libsdl2-2.0.12+dfsg1/debian/rules
+++ libsdl2-2.0.12+dfsg1/debian/rules
@@ -48,8 +48,6 @@
 override_dh_auto_configure:
dh_auto_configure -- $(confflags)
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-
 override_dh_auto_build-indep:
GZIP="-9n" tar czf debian/examples.tar.gz test --owner=0 --group=0 
--mode=go=rX,u+rw,a-s --clamp-mtime --mtime="@$(SOURCE_DATE_EPOCH)" --sort=name
doxygen docs/doxyfile
@@ -57,17 +55,12 @@
find output -name "*.md5" -delete
find output -type d -empty -delete
 
-   find output -name "jquery.js" -delete
-   dh_link -plibsdl2-doc usr/share/javascript/jquery/jquery.js 
usr/share/doc/libsdl2-doc/html/jquery.js
-
 # Force examples to be installed in libsdl2-doc, it does not happen with compat
 # level v11 despite having the file debian/libsdl2-doc.examples (it gets
 # installed as part of libsdl2-dev instead)
 override_dh_installexamples-indep:
dh_installexamples -i --doc-main-package=libsdl2-doc
 
-endif # !nocheck
-
 override_dh_auto_build-arch:
dh_auto_build -- V=1