[SCM] kwallet-pam packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-43-g721db47
Philip Muškovac
yofel-guest at moszumanska.debian.org
Mon Jan 11 10:42:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwallet-pam.git;a=commitdiff;h=721db47
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 721db4711e3958b87e5b52f591eb19cc1aa2bb47
Author: Philip Muškovac <yofel at gmx.net>
Date: Mon Jan 11 11:41:59 2016 +0100
Drop the broken patch and fix upgradability
---
debian/changelog | 6 ++++--
debian/control | 6 ++++--
debian/libpam-kwallet4.install | 2 +-
debian/libpam-kwallet5.install | 2 +-
debian/patches/fix_install_location.diff | 12 ------------
debian/patches/series | 1 -
6 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d95f9e8..3ebe0ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ kwallet-pam (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
[ Clive Johnston ]
* new upstream release
- * Fix the lib name in kwallet5 install file.
- * New upstream release
+
+ [ Philip Muškovac ]
+ * Drop fix_install_location.diff as it breaks the sddm integration
+ * libpam-kwallet[4] breaks/replaces pam-kwallet[4] << 4:5.5
-- Clive Johnston <clivejo at aol.com> Thu, 07 Jan 2016 17:56:40 +0000
diff --git a/debian/control b/debian/control
index decb860..4e6874b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kwallet-pam.git
Package: libpam-kwallet4
Architecture: any
Depends: socat, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: pam-kwallet (<< 4:5.3.95)
-Breaks: pam-kwallet (<< 4:5.3.95)
+Conflicts: pam-kwallet (<< 4:5.5)
+Breaks: pam-kwallet (<< 4:5.5)
Description: KWallet (KDE 4) integration with PAM
The KDE Wallet system provides a secure way to store passwords and other
secret information, allowing the user to remember only a single KDE Wallet
@@ -29,6 +29,8 @@ Description: KWallet (KDE 4) integration with PAM
Package: libpam-kwallet5
Architecture: any
Depends: socat, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: pam-kwallet5 (<< 4:5.5)
+Breaks: pam-kwallet5 (<< 4:5.5)
Description: KWallet (Kf5) integration with PAM
The KDE Wallet system provides a secure way to store passwords and other
secret information, allowing the user to remember only a single KDE Wallet
diff --git a/debian/libpam-kwallet4.install b/debian/libpam-kwallet4.install
index 647e40f..96b69df 100644
--- a/debian/libpam-kwallet4.install
+++ b/debian/libpam-kwallet4.install
@@ -1 +1 @@
-lib/*/security/libpam_kwallet.so
+lib/*/security/pam_kwallet.so
diff --git a/debian/libpam-kwallet5.install b/debian/libpam-kwallet5.install
index 72ef292..2f03fab 100644
--- a/debian/libpam-kwallet5.install
+++ b/debian/libpam-kwallet5.install
@@ -1 +1 @@
-lib/*/security/libpam_kwallet5.so
+lib/*/security/pam_kwallet5.so
diff --git a/debian/patches/fix_install_location.diff b/debian/patches/fix_install_location.diff
deleted file mode 100644
index 9d5664f..0000000
--- a/debian/patches/fix_install_location.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kwallet-pam/CMakeLists.txt
-===================================================================
---- kwallet-pam.orig/CMakeLists.txt 2015-12-10 14:12:47.823621683 +0100
-+++ kwallet-pam/CMakeLists.txt 2015-12-10 20:45:45.967413893 +0100
-@@ -36,7 +36,6 @@
- endif()
-
- add_library (${library_name} SHARED ${pam_kwallet_SRCS})
--set_target_properties (${library_name} PROPERTIES PREFIX "")
- target_link_libraries (${library_name}
- ${PAM_LIBRARIES}
- ${LIBGCRYPT_LIBRARIES}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5acedc4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_install_location.diff
--
kwallet-pam packaging
More information about the pkg-kde-commits
mailing list