[med-svn] [Git][med-team/librcsb-core-wrapper][master] 2 commits: Fix clean target

Andreas Tille (@tille) gitlab at salsa.debian.org
Thu Dec 19 15:41:21 GMT 2024 


Andreas Tille pushed to branch master at Debian Med / librcsb-core-wrapper


Commits:
e50cba17 by Andreas Tille at 2024-12-19T15:28:28+01:00
Fix clean target

- - - - -
f4e1c28e by Andreas Tille at 2024-12-19T16:35:32+01:00
Make sure make 4.4.1 will not stumble upon missing includes Closes: #1089265

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/make-4.4.1.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+librcsb-core-wrapper (1.005-13) UNRELEASED; urgency=medium
+
+  * Fix clean target
+    Closes: #1046372
+  * Make sure make 4.4.1 will not stumble upon missing includes
+    Closes: #1089265
+
+ -- Andreas Tille <tille at debian.org>  Thu, 19 Dec 2024 14:54:46 +0100
+
 librcsb-core-wrapper (1.005-12) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/make-4.4.1.patch
=====================================
@@ -0,0 +1,104 @@
+Author: Andreas Tille <tille at debian.org
+Last-Update: 2024-12-19
+Bug-Debian: https://bugs.debian.org/1089265
+Description: Make sure make 4.4.1 will not stumble upon missing includes
+
+--- a/common/Makefile
++++ b/common/Makefile
+@@ -25,7 +25,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ ALL_DEP_LIBS =
+--- a/cif-file-util/Makefile
++++ b/cif-file-util/Makefile
+@@ -25,7 +25,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ ALL_DEP_LIBS =
+--- a/cif-file/Makefile
++++ b/cif-file/Makefile
+@@ -25,7 +25,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ TABLES_LIB    = $(M_LIB_DIR)/tables.a
+--- a/cif-parser/Makefile
++++ b/cif-parser/Makefile
+@@ -25,7 +25,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # flex/bison flags
+ CifParser_YACC_FLAGS = $(YACCFLAGS) -p cifparser_
+--- a/dict-obj-file/Makefile
++++ b/dict-obj-file/Makefile
+@@ -28,7 +28,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ CIF_FILE_UTIL_LIB = $(M_LIB_DIR)/cif-file-util.a
+--- a/pdbml-parser/Makefile
++++ b/pdbml-parser/Makefile
+@@ -32,7 +32,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries for the pdbml-parser
+ DICT_OBJ_FILE_LIB = $(M_LIB_DIR)/dict-obj-file.a
+--- a/regex/Makefile
++++ b/regex/Makefile
+@@ -27,7 +27,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ ALL_DEP_LIBS =
+--- a/tables/Makefile
++++ b/tables/Makefile
+@@ -25,7 +25,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ COMMON_LIB = $(M_LIB_DIR)/common.a
+--- a/wrapper/Makefile
++++ b/wrapper/Makefile
+@@ -37,7 +37,7 @@ LINCLUDES = -I$(L_INCL_DIR) -I$(M_INCL_D
+ #----------------------------------------------------------------------------
+ # Include the appropriate compiler/platform definitions ...
+ #----------------------------------------------------------------------------
+-include ../etc/Makefile.platform
++-include ../etc/Makefile.platform
+ 
+ # Dependent libraries
+ PDBML_PARSER_LIB  = ../$(M_LIB_DIR)/pdbml-parser.a


=====================================
debian/patches/series
=====================================
@@ -18,3 +18,4 @@ gcc-8.patch
 python3.patch
 generated-includes
 INSTALL-is-cifinstall.patch
+make-4.4.1.patch


=====================================
debian/rules
=====================================
@@ -14,7 +14,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 override_dh_auto_build: override_dh_auto_build-nopy override_dh_auto_build-py
 
 override_dh_auto_build-nopy:
-	dh_auto_build
+	dh_auto_build --no-parallel
 	$(MAKE) doc
 
 override_dh_auto_build-py: override_dh_auto_build-nopy
@@ -38,3 +38,5 @@ override_dh_makeshlibs:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf wrapper/python/build
+	find . -name obj -type d | xargs rm -rf
+	rm -rf .pybuild



View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/-/compare/8b59410aea8cf5434193111cab05b294e3e8cf20...f4e1c28e198f0591919eaa58211e918dbcad4b51

-- 
View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/-/compare/8b59410aea8cf5434193111cab05b294e3e8cf20...f4e1c28e198f0591919eaa58211e918dbcad4b51
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/20241219/0d5b29d7/attachment-0001.htm>

More information about the debian-med-commit mailing list