[pkg-kolab] r1559 - kolabd/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2011-11-19 12:40:28 +0000 (Sat, 19 Nov 2011)
New Revision: 1559

Added:
   kolabd/trunk/debian/install
Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/compat
   kolabd/trunk/debian/control
   kolabd/trunk/debian/links
   kolabd/trunk/debian/rules
Log:
* Moved to debhelper compat level 8 and dh_install
* updated Standards-Version to 3.9.2: no changes



Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2011-11-19 12:10:39 UTC (rev 1558)
+++ kolabd/trunk/debian/changelog	2011-11-19 12:40:28 UTC (rev 1559)
@@ -19,6 +19,8 @@
     only documented: manual steps are needed.
   * Drop old Breaks/Replaces on kolab-freebusy, kolab-resource-handlers (no more
     in oldstable=lenny)
+  * Moved to debhelper compat level 8 and dh_install
+  * updated Standards-Version to 3.9.2: no changes
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 19 Nov 2011 13:08:21 +0100
 

Modified: kolabd/trunk/debian/compat
===================================================================
--- kolabd/trunk/debian/compat	2011-11-19 12:10:39 UTC (rev 1558)
+++ kolabd/trunk/debian/compat	2011-11-19 12:40:28 UTC (rev 1559)
@@ -1 +1 @@
-7
+8

Modified: kolabd/trunk/debian/control
===================================================================
--- kolabd/trunk/debian/control	2011-11-19 12:10:39 UTC (rev 1558)
+++ kolabd/trunk/debian/control	2011-11-19 12:40:28 UTC (rev 1559)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8)
+Standards-Version: 3.9.2
 Homepage: http://www.kolab.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabd/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolabd/trunk/

Added: kolabd/trunk/debian/install
===================================================================
--- kolabd/trunk/debian/install	                        (rev 0)
+++ kolabd/trunk/debian/install	2011-11-19 12:40:28 UTC (rev 1559)
@@ -0,0 +1,7 @@
+kolab_sslcert.sh usr/share/kolabd/scripts/
+kolab_ca.sh usr/share/kolabd/scripts/
+kolab.globals etc/kolab/
+rootDSE.ldif etc/kolab/
+templates/*.template /etc/kolab/templates/
+kolab2.schema etc/ldap/schema/
+debian/apache.conf etc/kolab/

Modified: kolabd/trunk/debian/links
===================================================================
--- kolabd/trunk/debian/links	2011-11-19 12:10:39 UTC (rev 1558)
+++ kolabd/trunk/debian/links	2011-11-19 12:40:28 UTC (rev 1559)
@@ -1 +1,4 @@
 etc/kolab/apache.conf etc/apache2/sites-available/kolab
+usr/share/kolabd/scripts/kolab_ca.sh /usr/sbin/kolab_ca
+usr/share/kolabd/scripts/kolab_ca.sh /usr/sbin/kolab_ca.sh
+usr/share/kolabd/scripts/kolab_sslcert.sh /usr/sbin/kolab_sslcert

Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules	2011-11-19 12:10:39 UTC (rev 1558)
+++ kolabd/trunk/debian/rules	2011-11-19 12:40:28 UTC (rev 1559)
@@ -23,32 +23,11 @@
 	dh_testroot
 	dh_prep 
 	dh_installdirs
+	dh_install
 
-	# scripts for /usr/bin and /usr/sbin
-	install -D -m 755 kolab_sslcert.sh debian/kolabd/usr/sbin/kolab_sslcert 
-	install -D -m 755 kolab_ca.sh debian/kolabd/usr/sbin/kolab_ca.sh
-
-	# Files for /etc/kolab
-	install -D -m 644 kolab.globals debian/kolabd/etc/kolab/kolab.globals
-	# This file is obsolete we use kolabconf for it
-#	install -D -m 755 kolab debian/kolabd/etc/kolab/kolab
-	# unneeded simple script
-#	install -D -m 755 workaround.sh debian/kolabd/etc/kolab/workaround.sh
-	install -D -m 644 rootDSE.ldif debian/kolabd/etc/kolab/rootDSE.ldif
-
 	# Kolab bootstrapping templates
-	for i in templates/*.template ; do install -D -m 644 $$i debian/kolabd/etc/kolab/$$i ; done
 	rm $(addprefix debian/kolabd/etc/kolab/templates/,clamd.* freshclam.* httpd.* local.cf.template)
 
-	# LDAP schemas
-	install -D -m 644 kolab2.schema debian/kolabd/etc/ldap/schema/kolab2.schema
-
-	#apache config
-	install -D -m 644 debian/apache.conf debian/kolabd/etc/kolab/apache.conf
-
-#	# Commented out because of copyright issues, needs further investigation
-#	install -D -m 644 rfc2739.schema debian/kolabd/usr/share/kolabd/schema/rfc2739.schema
-
 binary-indep: build install
 	dh_testdir
 	dh_testroot