[med-svn] [Git][med-team/dssp][master] 4 commits: New upstream version 4.2.0a

[Maarten L. Hekkelman (@mhekkel-guest)]

Maarten L. Hekkelman pushed to branch master at Debian Med / dssp


Commits:
fb26b565 by Maarten L. Hekkelman at 2022-12-31T10:25:40+01:00
New upstream version 4.2.0a
- - - - -
4e304399 by Maarten L. Hekkelman at 2022-12-31T10:29:31+01:00
new version

- - - - -
e1b4016e by Maarten L. Hekkelman at 2023-01-02T09:52:51+01:00
New upstream version 4.2.1
- - - - -
02087582 by Maarten L. Hekkelman at 2023-01-02T09:53:29+01:00
Update upstream source from tag 'upstream/4.2.1'

Update to upstream version '4.2.1'
with Debian dir 7adf734a515204ae9b8e4d5459317c4ac94adbe0

- - - - -


5 changed files:

- CMakeLists.txt
- changelog
- debian/changelog
- src/mkdssp.cpp
- test/unit-test-dssp.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -25,7 +25,7 @@
 cmake_minimum_required(VERSION 3.15)
 
 # set the project name
-project(mkdssp VERSION 4.2.0 LANGUAGES CXX)
+project(mkdssp VERSION 4.2.1 LANGUAGES CXX)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 


=====================================
changelog
=====================================
@@ -1,3 +1,7 @@
+Version 4.2.1
+- The previous version was a bit overly strict
+- Introduce a --quiet flag.
+
 Version 4.2.0
 - Changes for packaging
 - New mmCIF DSSP output, added several categories


=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+dssp (4.2.1-1) unstable; urgency=medium
+
+  * New upstream.
+
+ -- Maarten L. Hekkelman <maarten at hekkelman.com>  Mon, 02 Jan 2023 09:53:03 +0100
+
+dssp (4.2.0a-1) unstable; urgency=medium
+
+  * Now with new source... 
+
+ -- Maarten L. Hekkelman <maarten at hekkelman.com>  Sat, 31 Dec 2022 10:29:08 +0100
+
 dssp (4.2.0-3) unstable; urgency=medium
 
   * Pushing.


=====================================
src/mkdssp.cpp
=====================================
@@ -81,6 +81,7 @@ int d_main(int argc, const char *argv[])
 		mcfp::make_option("help,h", "Display help message"),
 		mcfp::make_option("version", "Print version"),
 		mcfp::make_option("verbose,v", "verbose output"),
+		mcfp::make_option("quiet", "Reduce verbose output to a minimum"),
 
 		mcfp::make_hidden_option<int>("debug,d", "Debug level (for even more verbose output)"));
 
@@ -112,7 +113,10 @@ int d_main(int argc, const char *argv[])
 		exit(1);
 	}
 
-	cif::VERBOSE = config.count("verbose");
+	if (config.count("quiet"))
+		cif::VERBOSE = -1;
+	else
+		cif::VERBOSE = config.count("verbose");
 
 	// --------------------------------------------------------------------
 
@@ -138,11 +142,8 @@ int d_main(int argc, const char *argv[])
 	}
 
 	cif::file f = cif::pdb::read(in);
-	if (not f.is_valid())
-	{
-		std::cerr << "Could not validate file" << std::endl;
-		exit(1);
-	}
+	if (cif::VERBOSE >= 0 and not f.is_valid())
+		std::cerr << "Warning, the input file is not valid. Run with --verbose to see why." << std::endl;
 
 	// --------------------------------------------------------------------
 


=====================================
test/unit-test-dssp.cpp
=====================================
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE(ut_mmcif_2)
 
 	std::stringstream test;
 
-	annotateDSSP(f.front(), dssp, true, test);
+	annotateDSSP(f.front(), dssp, true, false, test);
 
 	cif::file rf(gTestDir / "1cbs-dssp.cif");
 



View it on GitLab: https://salsa.debian.org/med-team/dssp/-/compare/4703d039ac86aa36011eb2c9b772f5f2da63a88a...020875829eed7dc92570a39966545037c7711193

-- 
View it on GitLab: https://salsa.debian.org/med-team/dssp/-/compare/4703d039ac86aa36011eb2c9b772f5f2da63a88a...020875829eed7dc92570a39966545037c7711193
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/20230102/5535dde6/attachment-0001.htm>