[med-svn] [Git][med-team/mothur][master] 3 commits: Mention Hamids change in changelog

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / mothur


Commits:
f52967fa by Andreas Tille at 2021-11-08T17:39:03+01:00
Mention Hamids change in changelog

- - - - -
60accb4b by Andreas Tille at 2021-11-08T18:07:26+01:00
Provide fix as patch instead of edit in upstream source

- - - - -
25fe6bfd by Andreas Tille at 2021-11-08T18:18:05+01:00
Upload to unstable

- - - - -


3 changed files:

- Makefile
- debian/changelog
- + debian/patches/fix_linking.patch


Changes:

=====================================
Makefile
=====================================
@@ -118,8 +118,8 @@ endif
 #
     OBJECTS=$(patsubst %.cpp,%.o,$(wildcard $(addsuffix *.cpp,$(subdirs))))
     OBJECTS+=$(patsubst %.c,%.o,$(wildcard $(addsuffix *.c,$(subdirs))))
-    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard source/*.cpp))
-    OBJECTS+=$(patsubst %.c,%.o,$(wildcard source/*.c))
+    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+    OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
 
 mothur : $(OBJECTS) uchime
 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)


=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
-mothur (1.46.1-1) UNRELEASED; urgency=medium
+mothur (1.46.1-1) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * New upstream version
   * Standards-Version: 4.6.0 (routine-update)
   * Fix build with gcc-11
     Closes: #984243
+  * Follow parts of the hints by Aaron M. Ucko
+  * Fix linking
+
+  [ Hamid Nassiby ]
+  * Fix linking
 
- -- Andreas Tille <tille at debian.org>  Thu, 21 Oct 2021 11:22:32 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 08 Nov 2021 18:08:09 +0100
 
 mothur (1.44.3-2) unstable; urgency=medium
 


=====================================
debian/patches/fix_linking.patch
=====================================
@@ -0,0 +1,17 @@
+Author: Hamid Nassiby
+Last-Update: 2021-11-08 18:37:29 +0330
+Description: Fix linking in main Makefile
+
+--- mothur.orig/Makefile
++++ mothur/Makefile
+@@ -118,8 +118,8 @@ endif
+ #
+     OBJECTS=$(patsubst %.cpp,%.o,$(wildcard $(addsuffix *.cpp,$(subdirs))))
+     OBJECTS+=$(patsubst %.c,%.o,$(wildcard $(addsuffix *.c,$(subdirs))))
+-    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+-    OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
++    OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard source/*.cpp))
++    OBJECTS+=$(patsubst %.c,%.o,$(wildcard source/*.c))
+ 
+ mothur : $(OBJECTS) uchime
+ 	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)



View it on GitLab: https://salsa.debian.org/med-team/mothur/-/compare/4195a5525d5e9f787b301fda48cc7a5b06c969bd...25fe6bfd84dfba8a6a23092139f59e83fd2c141b

-- 
View it on GitLab: https://salsa.debian.org/med-team/mothur/-/compare/4195a5525d5e9f787b301fda48cc7a5b06c969bd...25fe6bfd84dfba8a6a23092139f59e83fd2c141b
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/20211108/6c237e91/attachment-0001.htm>