diffstat for cryptsetup-1.6.6 cryptsetup-1.6.6 changelog | 10 ++++++++++ rules | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff -Nru cryptsetup-1.6.6/debian/changelog cryptsetup-1.6.6/debian/changelog --- cryptsetup-1.6.6/debian/changelog 2015-01-22 20:49:31.000000000 +0000 +++ cryptsetup-1.6.6/debian/changelog 2015-05-27 15:14:34.000000000 +0000 @@ -1,3 +1,13 @@ +cryptsetup (2:1.6.6-5endless1) master; urgency=medium + + * debian/rules: + - Remove /usr/sbin symlink creation of cryptdisks_start/stop since + it causes conflicts on merged /usr systems. See + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767921. + [endlessm/eos-shell#4905] + + -- Dan Nicholson Wed, 27 May 2015 08:10:22 -0700 + cryptsetup (2:1.6.6-5) unstable; urgency=high * debian/cryptdisks.functions: fix the precheck for ubuntu+upstart diff -Nru cryptsetup-1.6.6/debian/rules cryptsetup-1.6.6/debian/rules --- cryptsetup-1.6.6/debian/rules 2014-12-11 18:36:10.000000000 +0000 +++ cryptsetup-1.6.6/debian/rules 2015-05-27 15:14:53.000000000 +0000 @@ -115,8 +115,6 @@ install -m 0755 debian/scripts/luksformat $(CURDIR)/debian/cryptsetup-bin/usr/sbin/ install -m 0755 debian/scripts/cryptdisks_start $(CURDIR)/debian/cryptsetup/sbin/ install -m 0755 debian/scripts/cryptdisks_stop $(CURDIR)/debian/cryptsetup/sbin/ - dh_link -pcryptsetup sbin/cryptdisks_start usr/sbin/cryptdisks_start - dh_link -pcryptsetup sbin/cryptdisks_stop usr/sbin/cryptdisks_stop install -m 0755 debian/scripts/decrypt_* $(CURDIR)/debian/cryptsetup/lib/cryptsetup/scripts/ install -m 0755 debian/scripts/passdev $(CURDIR)/debian/cryptsetup/lib/cryptsetup/scripts/ install -m 0755 debian/askpass $(CURDIR)/debian/cryptsetup/lib/cryptsetup/