[med-svn] [Git][med-team/librcsb-core-wrapper][master] Accept patch from Ubuntu to fix build. Closes: #973249

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / librcsb-core-wrapper


Commits:
3e093667 by Michael R. Crusoe at 2020-11-30T10:10:49+01:00
Accept patch from Ubuntu to fix build. Closes: #973249

Thanks to Steve Langasek <steve.langasek at ubuntu.com>

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/generated-includes
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+librcsb-core-wrapper (1.005-9) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Accept patch from Ubuntu to fix build. Closes: #973249
+    Thanks to Steve Langasek <steve.langasek at ubuntu.com>
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Mon, 30 Nov 2020 10:09:24 +0100
+
 librcsb-core-wrapper (1.005-8) unstable; urgency=medium
 
   * Source upload to enable testing migration


=====================================
debian/patches/generated-includes
=====================================
@@ -0,0 +1,19 @@
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Description: fix up include path for generated header file that's moved
+ The makefile renames the .tab.c and .tab.h files to .c and .h, but does 
+ not fix up references from the .tab.h header from within the .c file.  
+ I'm surprised this ever worked, but it doesn't work now.
+Last-Update: 2020-10-27
+
+Index: librcsb-core-wrapper-1.005/cif-parser/Makefile
+===================================================================
+--- librcsb-core-wrapper-1.005.orig/cif-parser/Makefile
++++ librcsb-core-wrapper-1.005/cif-parser/Makefile
+@@ -181,6 +181,7 @@
+ 	sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
+ 	mv $(^:.y=.tab.c) $(^:.y=.c)
+ 	mv $(^:.y=.tab.h) $(^:.y=.h)
++	sed -i -e's/\.tab\.h/\.h/' $(^:.y=.c)
+ 	libtool --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o obj/$(*)Parser.o
+ 
+ obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o $(SRC_DIR)/%Parser.h


=====================================
debian/patches/series
=====================================
@@ -16,3 +16,4 @@ gcc5.patch
 xerces32.patch
 gcc-8.patch
 python3.patch
+generated-includes



View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/-/commit/3e093667f8b0108752a3a6517ca6ff8d7e29037a

-- 
View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/-/commit/3e093667f8b0108752a3a6517ca6ff8d7e29037a
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/20201130/bd857925/attachment-0001.html>