Squashed 'modules/rmf/dependency/RMF/' changes from 1ea066254f..4f61a…

…4e2e8 4f61a4e2e8 Prepare for 1.6.1 release 924eebd825 Add PPA to new-release instructions git-subtree-dir: modules/rmf/dependency/RMF git-subtree-split: 4f61a4e2e800fd9835207a47812c7f5847caaafb
salilab · May 13, 2024 · 031dafb · 031dafb
1 parent f5c9553
commit 031dafb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/modules/rmf/dependency/RMF/CMakeLists.txt b/modules/rmf/dependency/RMF/CMakeLists.txt
@@ -140,7 +140,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 # Version information
 set (RMF_VERSION_MAJOR 1)
 set (RMF_VERSION_MINOR 6)
-set (RMF_VERSION_MICRO 0)
+set (RMF_VERSION_MICRO 1)
 math (EXPR RMF_VERSION "${RMF_VERSION_MAJOR} * 100000 + ${RMF_VERSION_MINOR} * 100 + ${RMF_VERSION_MICRO}")
 
 set(RMF_SOVERSION "${RMF_VERSION_MAJOR}.${RMF_VERSION_MINOR}" CACHE INTERNAL "" FORCE)

diff --git a/modules/rmf/dependency/RMF/ChangeLog.md b/modules/rmf/dependency/RMF/ChangeLog.md
@@ -1,6 +1,14 @@
 Change Log {#changelog}
 ==========
 
+# 1.6.1 - 2024-05-13 # {#changelog_1_6_1}
+- .deb packages for RMF for Ubuntu are now provided via the
+  [Ubuntu PPA](https://launchpad.net/~salilab/+archive/ubuntu/ppa) mechanism.
+- `rmf_cat` now checks that all of the files it has been asked to concatenate
+  have the same structure and static frame, and exits with an error if they
+  don't. A new `--force` option is provided to override this check.
+- Bugfix: fixes to build with Boost 1.85
+
 # 1.6.0 - 2023-12-14 # {#changelog_1_6_0}
 - RPM packages for RMF for RedHat Linux (and clones such as Alma or Rocky)
   and for Fedora are now provided by the

diff --git a/modules/rmf/dependency/RMF/tools/RMF.spec b/modules/rmf/dependency/RMF/tools/RMF.spec
@@ -25,7 +25,7 @@
 %endif
 
 Name:          RMF
-Version:       1.6.0
+Version:       1.6.1
 Release:       1%{?dist}
 License:       Apache 2.0
 Summary:       Library to support reading and writing of RMF files
@@ -193,6 +193,9 @@ ${RPM_BUILD_ROOT}%{_prefix}/bin/rmf3_dump --version
 %{_libdir}/libRMF*.so
 
 %changelog
+* Mon May 13 2024 Ben Webb <ben@salilab.org>   1.6.1-1
+- Update for 1.6.1 release.
+
 * Thu Dec 14 2023 Ben Webb <ben@salilab.org>   1.6.0-1
 - Update for 1.6.0 release.
 

diff --git a/modules/rmf/dependency/RMF/tools/debian/changelog b/modules/rmf/dependency/RMF/tools/debian/changelog
@@ -1,3 +1,9 @@
+rmf (1.6.1-1~@CODENAME@) @CODENAME@; urgency=low
+
+  * RMF 1.6.1 release
+
+ -- IMP Developers <imp@salilab.org>  Mon, 13 May 2024 15:24:48 -0700
+
 rmf (1.6.0-2~@CODENAME@) @CODENAME@; urgency=low
 
   * Add install tests

diff --git a/modules/rmf/dependency/RMF/tools/new-release.txt b/modules/rmf/dependency/RMF/tools/new-release.txt
@@ -1,6 +1,7 @@
 To make a new release:
 
-- Update ChangeLog.md and tools/RMF.spec with release date and features.
+- Update ChangeLog.md tools/RMF.spec tools/debian/changelog with release
+  date and features.
 - Add version number as RMF_VERSION_(MAJOR,MINOR,MICRO) to CMakeLists.txt.
 - git push origin develop
 - Make sure all CI passes
@@ -15,5 +16,6 @@ To make a new release:
 - Check that Zenodo is updated (should be automatic)
 - Build an SRPM from the spec file tools/RMF.spec and the .tar.gz from
   the GitHub release page, and upload to COPR
+- Build Debian source packages and upload to PPA
 - Open PR on conda-forge to update the conda package
 - Update the Homebrew package and build bottles