From 0abfcdc161b7363d0dda0ea6452552d09c5c4a47 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 1 Mar 2013 18:49:54 +0000 Subject: [PATCH 1/2] ne more shells file --- lam-packaging/RPM/ldap-account-manager.spec | 1 - lam-packaging/debian/rules | 2 -- 2 files changed, 3 deletions(-) diff --git a/lam-packaging/RPM/ldap-account-manager.spec b/lam-packaging/RPM/ldap-account-manager.spec index 48359310..f2fee435 100644 --- a/lam-packaging/RPM/ldap-account-manager.spec +++ b/lam-packaging/RPM/ldap-account-manager.spec @@ -124,7 +124,6 @@ fi /var/lib/%{lam_dir}/config/pdf/.htaccess /var/lib/%{lam_dir}/config/profiles/.htaccess /var/lib/%{lam_dir}/config/language -/var/lib/%{lam_dir}/config/shells %dir %attr(700, %{lam_uid}, %{lam_gid}) /var/lib/%{lam_dir}/config/pdf %dir %attr(700, %{lam_uid}, %{lam_gid}) /var/lib/%{lam_dir}/config/profiles /var/lib/%{lam_dir}/config/templates/pdf/.htaccess diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules index 12481f86..2478af83 100755 --- a/lam-packaging/debian/rules +++ b/lam-packaging/debian/rules @@ -72,8 +72,6 @@ binary-indep: build install install -D --mode=644 debian/lam.apache.conf debian/ldap-account-manager/etc/ldap-account-manager/apache.conf install -D --mode=644 config/config.cfg_sample debian/ldap-account-manager/etc/ldap-account-manager/config.cfg dh_link /etc/ldap-account-manager/config.cfg /var/lib/ldap-account-manager/config/config.cfg - install -D --mode=644 config/shells debian/ldap-account-manager/etc/ldap-account-manager/shells - dh_link /etc/ldap-account-manager/shells /var/lib/ldap-account-manager/config/shells dh_installdebconf dh_installdeb dh_gencontrol From fd31ed066dd665aa282db0eab94d0d5e62df30c0 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 1 Mar 2013 19:10:32 +0000 Subject: [PATCH 2/2] --- lam-packaging/debian/copyright | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lam-packaging/debian/copyright b/lam-packaging/debian/copyright index b31b32df..cfdef36e 100644 --- a/lam-packaging/debian/copyright +++ b/lam-packaging/debian/copyright @@ -23,6 +23,7 @@ time. * lib/modules/passwordSelfReset.inc * lib/modules/ppolicy.inc * lib/modules/ppolicyUser.inc +* lib/modules/qmailGroup.inc * lib/modules/qmailUser.inc * lib/modules/rfc2307bisAutomount.inc * lib/modules/rfc2307bisPosixGroup.inc @@ -62,7 +63,7 @@ All other files are licensed under the conditions below. along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -The complete license can be found in the file COPYING. +The complete license can be found in the file /usr/share/common-licenses/GPL-2. Some parts of this package have other, compatible licences. These are: @@ -140,6 +141,8 @@ C: For more details on the GNU Lesser General Public License, see http://www.gnu.org/copyleft/lesser.html + See also /usr/share/common-licenses/LGPL-2. + D: