[med-svn] [Git][med-team/praat][master] 7 commits: fix ftbfs with gcc 10

Étienne Mollier gitlab at salsa.debian.org
Sat May 2 16:01:46 BST 2020 


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


Commits:
a543dab7 by Etienne Mollier at 2020-05-02T14:06:35+02:00
fix ftbfs with gcc 10

- - - - -
b7a2025a by Etienne Mollier at 2020-05-02T14:07:26+02:00
routine-update: Add salsa-ci file

- - - - -
3dee22f2 by Etienne Mollier at 2020-05-02T14:07:34+02:00
Use secure URI in Homepage field.

Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html

- - - - -
71da8edd by Etienne Mollier at 2020-05-02T14:07:37+02:00
Remove obsolete fields Contact, Name from debian/upstream/metadata (already present in machine-readable debian/copyright).
- - - - -
8c9a98a1 by Etienne Mollier at 2020-05-02T15:09:18+02:00
put information about yahoo group to d/copyright

it looks like it is the place it is now intended to be since
linters said that was redundant in d/u/metadata.

- - - - -
aff4b733 by Etienne Mollier at 2020-05-02T15:18:01+02:00
6.1.13-2 ready for upload I guess

- - - - -
9301bb05 by Etienne Mollier at 2020-05-02T16:13:57+02:00
remove -Wl,--as-needed linker flags

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/fix-ftbfs-gcc-10.patch
- debian/patches/series
- debian/rules
- + debian/salsa-ci.yml
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+praat (6.1.13-2) unstable; urgency=medium
+
+  * Team upload.
+  * changed a call for isupper(3) to iswupper(3) (Closes: #957704)
+  * Add salsa-ci file (routine-update)
+  * Use secure URI in Homepage field.
+  * Remove obsolete fields Contact, Name from debian/upstream/metadata
+    (already present in machine-readable debian/copyright).
+  * Moved Contact information into debian/copyright.
+
+ -- Etienne Mollier <etienne.mollier at mailoo.org>  Sat, 02 May 2020 14:07:38 +0200
+
 praat (6.1.13-1) unstable; urgency=medium
 
   * New upstream version 6.1.13


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 12),
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/praat
 Vcs-Git: https://salsa.debian.org/med-team/praat.git
-Homepage: http://www.praat.org
+Homepage: https://www.praat.org
 Rules-Requires-Root: no
 
 Package: praat


=====================================
debian/copyright
=====================================
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Program for speech analysis and synthesis
 Upstream-Contact: Paul Boersma <paul.boersma at uva.nl>
+                  https://uk.groups.yahoo.com/neo/groups/praat-users/info
 Source: http://www.fon.hum.uva.nl/praat/download_sources.html
 
 Files: *


=====================================
debian/patches/fix-ftbfs-gcc-10.patch
=====================================
@@ -0,0 +1,22 @@
+Description: fix ftbfs with migration to gcc-10
+ Options are either to import ctypes.h or move to wide-char support for the
+ incriminated function call.  Given work advertised on Unicode support
+ (specifically UTF-16) on Praat home page, the second option has been chosen:
+         http://www.fon.hum.uva.nl/praat/manual/Unicode.html
+Author: Étienne Mollier <etienne.mollier at mailoo.org>
+Bug-Debian: https://bugs.debian.org/957704
+Forwarded: no
+Last-Update: 2020-05-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- praat.orig/external/espeak/espeak_io.cpp
++++ praat/external/espeak/espeak_io.cpp
+@@ -190,7 +190,7 @@
+ 		// copy 4 bytes: version number
+ 		// copy 4 bytes: sample rate
+ 		while (fgets (line, sizeof (line), manifestf)) {
+-			if (! isupper (line [0])) continue;
++			if (! iswupper (line [0])) continue;
+ 			unsigned int index;
+ 			sscanf(& line [2], "%x", & index);
+ 			fseek (phondataf, index, SEEK_SET);


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 use-ldflags.patch
 remove-time-date-macros.patch
 fix-procrustes-unit-test.patch
+fix-ftbfs-gcc-10.patch


=====================================
debian/rules
=====================================
@@ -50,8 +50,7 @@ override_dh_auto_configure:
 	# Get rid of the
 	# dpkg-shlibdeps: warning: dependency on lib??? could be avoided if "debian/praat/usr/bin/praat" were not uselessly linked against it (they use none of its symbols).
 	# warnings and useless dependencies
-	sed 's/^LIBS = /& -Wl,--as-needed /'	\
-		makefiles/makefile.defs.linux.pulse > makefile.defs
+	cp makefiles/makefile.defs.linux.pulse makefile.defs
 	# Add hardening flags
 	cat debian/mk-vars-hardening >> makefile.defs
 
@@ -64,14 +63,13 @@ sendpraat: sys/sendpraat.c
 	$(CC) $(shell dpkg-buildflags --get CPPFLAGS)		\
 		$(shell dpkg-buildflags --get CFLAGS)		\
 		$(shell dpkg-buildflags --get LDFLAGS)		\
-		-Wl,--as-needed -std=gnu99 -DSTAND_ALONE -DUNIX	\
+		-std=gnu99 -DSTAND_ALONE -DUNIX			\
 		-o sendpraat sys/sendpraat.c			\
 		$(shell $(PKG_CONFIG) --cflags --libs gtk+-2.0)
 
 override_dh_auto_build: sendpraat praat.1 praat_nogui.1 sendpraat.1 praat-open-files.1
 	dh_auto_build
-	sed 's/^LIBS = /& -Wl,--as-needed /'	\
-		makefiles/makefile.defs.linux.nogui > makefile.defs
+	cp makefiles/makefile.defs.linux.nogui makefile.defs
 	# Add hardening flags
 	cat debian/mk-vars-hardening >> makefile.defs
 	rm -f melder/*.o sys/*.o fon/SoundRecorder.o fon/praat_Sound.o	\


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,3 @@
-Name: praat
-Contact: https://uk.groups.yahoo.com/neo/groups/praat-users/info
 FAQ: >
  http://www.fon.hum.uva.nl/praat/manual/FAQ__Frequently_Asked_Questions_.html
 Reference:



View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/1e8332facb3e502b9decc0ddd00b3a8046a4c79a...9301bb056cd61c37612bb9e56f7f6421389aee65

-- 
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/1e8332facb3e502b9decc0ddd00b3a8046a4c79a...9301bb056cd61c37612bb9e56f7f6421389aee65
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/20200502/813cad43/attachment-0001.html>

More information about the debian-med-commit mailing list