diff --git a/debian-11-cockpit/suite/bullseye/debian/changelog b/debian-11-cockpit/suite/bullseye/debian/changelog
index 250e05c938b564848eafcb0322d3ec34f83b6af4..b8b52fa70c5cafe0b41513ab022cd30dd2c62941 100644
--- a/debian-11-cockpit/suite/bullseye/debian/changelog
+++ b/debian-11-cockpit/suite/bullseye/debian/changelog
@@ -1,8 +1,16 @@
-cockpit (260-1rcnee0~bullseye+20220109) bullseye; urgency=low
+cockpit (261-1rcnee0~bullseye+20220125) bullseye; urgency=low
* Rebuild for repos.rcn-ee.com
- -- Robert Nelson <robertcnelson@gmail.com> Sun, 09 Jan 2022 13:54:47 -0600
+ -- Robert Nelson <robertcnelson@gmail.com> Tue, 25 Jan 2022 17:08:00 -0600
+
+cockpit (261-1) unstable; urgency=medium
+
+ * New upstream release:
+ - storage: Unmounting or deleting a busy filesystem is now supported
+ - shell: Allow adding ssh keys with passphrase
+
+ -- Martin Pitt <mpitt@debian.org> Mon, 24 Jan 2022 17:49:33 +0100
cockpit (260-1) unstable; urgency=medium
diff --git a/debian-11-cockpit/suite/bullseye/debian/cockpit-ws.postinst b/debian-11-cockpit/suite/bullseye/debian/cockpit-ws.postinst
index 69f5774c1ae6920ad620d95bb5f58fc403e83156..63a109b7039842f836f0c0bd72711c38434561c7 100644
--- a/debian-11-cockpit/suite/bullseye/debian/cockpit-ws.postinst
+++ b/debian-11-cockpit/suite/bullseye/debian/cockpit-ws.postinst
@@ -24,8 +24,8 @@ fi
# set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them
if [ "$1" = "configure" ] && [ -z "$2" ]; then
mkdir -p /etc/motd.d /etc/issue.d
- ln -s /run/cockpit/motd /etc/motd.d/cockpit
- ln -s /run/cockpit/motd /etc/issue.d/cockpit.issue
+ ln -s ../../run/cockpit/motd /etc/motd.d/cockpit
+ ln -s ../../run/cockpit/motd /etc/issue.d/cockpit.issue
fi
# check for deprecated PAM config
diff --git a/debian-11-cockpit/suite/bullseye/debian/control b/debian-11-cockpit/suite/bullseye/debian/control
index d87fd2443f40a27ab502ceadb6d6f057e6423a35..a85a850be6becc22155e1ec4153e76fa92df24db 100644
--- a/debian-11-cockpit/suite/bullseye/debian/control
+++ b/debian-11-cockpit/suite/bullseye/debian/control
@@ -60,13 +60,6 @@ Depends: ${misc:Depends},
glib-networking
Provides: cockpit-ssh
Breaks: cockpit-ws (<< 181.x),
-# 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
- cockpit-dashboard (<< 233),
- cockpit-networkmanager (<< 233),
- cockpit-storaged (<< 233),
- cockpit-system (<< 233),
- cockpit-tests (<< 233),
- cockpit-docker (<< 233),
Replaces: cockpit-dashboard (<< 170.x), cockpit-ws (<< 181.x)
Description: Cockpit bridge server-side component
The Cockpit bridge component installed server side and runs commands on
@@ -86,7 +79,7 @@ Package: cockpit-networkmanager
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends},
- cockpit-bridge (>= ${bridge:minversion}),
+ cockpit-bridge (>= ${source:Version}),
network-manager (>= 1.6)
Description: Cockpit user interface for networking
The Cockpit components for interacting with networking configuration.
@@ -95,7 +88,7 @@ Package: cockpit-pcp
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- cockpit-bridge (>= ${bridge:minversion}),
+ cockpit-bridge (>= ${source:Version}),
pcp
Description: Cockpit PCP integration
Cockpit support for reading PCP metrics and loading PCP archives.
@@ -104,7 +97,7 @@ Package: cockpit-packagekit
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends},
- cockpit-bridge (>= ${bridge:minversion}),
+ cockpit-bridge (>= ${source:Version}),
packagekit
Description: Cockpit user interface for packages
The Cockpit component for installing packages, via PackageKit.
@@ -115,7 +108,7 @@ Multi-Arch: foreign
Depends: ${misc:Depends},
udisks2 (>= 2.7),
libblockdev-mdraid2,
- cockpit-bridge (>= ${bridge:minversion}),
+ cockpit-bridge (>= ${source:Version}),
python3,
python3-dbus
Description: Cockpit user interface for storage
@@ -125,7 +118,7 @@ Package: cockpit-system
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends},
- cockpit-bridge (>= ${bridge:minversion}),
+ cockpit-bridge (>= ${source:Version}),
libpwquality-tools,
openssl,
Recommends: sudo | policykit-1
diff --git a/debian-11-cockpit/suite/bullseye/debian/rules b/debian-11-cockpit/suite/bullseye/debian/rules
index a14848d16904ab610a50e3e4564c01d7ebd590f2..97f21a9eeb598d426a55581e45a392f9655c5eb5 100755
--- a/debian-11-cockpit/suite/bullseye/debian/rules
+++ b/debian-11-cockpit/suite/bullseye/debian/rules
@@ -52,6 +52,3 @@ endif
dh_install --fail-missing -Xusr/src/debug
make install-tests DESTDIR=debian/cockpit-tests
-
-override_dh_gencontrol:
- dh_gencontrol -- -Vbridge:minversion="$(shell tools/min-base-version)"
diff --git a/debian-11-cockpit/version.sh b/debian-11-cockpit/version.sh
index ee01bb8bcf007c71c07d465f17c2c6e9b9d45f3b..6ce47ef7aad75a6737b3ec37a52db8135bb5c3d9 100644
--- a/debian-11-cockpit/version.sh
+++ b/debian-11-cockpit/version.sh
@@ -7,7 +7,7 @@ mirror="http://http.debian.net/debian"
package_name="cockpit"
debian_pkg_name="${package_name}"
-package_version="260"
+package_version="261"
package_source="${debian_pkg_name}_${package_version}.orig.tar.xz"
src_dir="${package_name}-${package_version}"
@@ -21,4 +21,4 @@ debian_untar="${package_name}_${debian_version}.debian.tar.xz"
debian_patch=""
local_patch="rcnee0"
-bullseye_version="~bullseye+20220109"
+bullseye_version="~bullseye+20220125"