[pkg-kolab] r858 - kolabd/branches/2.2/debian/patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Sun May 25 10:26:02 UTC 2008 

Author: mparent-guest
Date: 2008-05-25 10:25:56 +0000 (Sun, 25 May 2008)
New Revision: 858

Modified:
   kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch
Log:
Changes in Makefile.* makes this patch simpler.


Modified: kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch	2008-05-25 10:25:14 UTC (rev 857)
+++ kolabd/branches/2.2/debian/patches/50-postfix-hashes.dpatch	2008-05-25 10:25:56 UTC (rev 858)
@@ -4,19 +4,21 @@
 ## DP: Postfix hashes templates
 
 @DPATCH@
-diff -urNad kolabd-2.1.99+20080314.dfsg~/Makefile.am kolabd-2.1.99+20080314.dfsg/Makefile.am
---- kolabd-2.1.99+20080314.dfsg~/Makefile.am	2008-04-03 23:34:07.000000000 +0200
-+++ kolabd-2.1.99+20080314.dfsg/Makefile.am	2008-04-03 23:34:27.000000000 +0200
-@@ -43,6 +43,8 @@
+diff -urNad kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.am kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.am
+--- kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.am	2008-04-30 14:48:47.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.am	2008-05-25 12:14:20.000000000 +0200
+@@ -39,7 +39,9 @@
+ dist_kolabconfig_DATA = $(kolabconfig_FILES)
  
  
- kolabtemplate_FILES = templates/amavisd.conf.template \
-+	templates/access.template \
+-kolabtemplate_FILES = templates/amavisd.conf.template \
++kolabtemplate_FILES = templates/access.template \
++	templates/amavisd.conf.template \
 +	templates/canonical.template \
  	templates/clamd.conf.template \
  	templates/cyrus.conf.template \
  	templates/DB_CONFIG.slapd.template \
-@@ -64,6 +66,7 @@
+@@ -61,6 +63,7 @@
  	templates/ldapvirtual.cf.template \
  	templates/kolab_smtpdpolicy.conf.template \
  	templates/php.ini.template \
@@ -24,85 +26,21 @@
  	templates/resmgr.conf.template \
  	templates/saslauthd.conf.template \
  	templates/session_vars.php.template \
-@@ -325,6 +328,18 @@
- CLEANFILES += namespace/kolab
- EXTRA_DIST += namespace/kolab.in
+diff -urNad kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.in kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.in
+--- kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258~/Makefile.in	2008-05-21 17:35:44.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg.obsolete.0.329789713797258/Makefile.in	2008-05-25 12:15:38.000000000 +0200
+@@ -190,7 +190,9 @@
  
-+templates/access.template: templates/access.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/access.template.in >$@
-+CLEANFILES += templates/access.template
-+EXTRA_DIST += templates/access.template.in
-+
-+templates/canonical.template: templates/canonical.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/canonical.template.in >$@
-+CLEANFILES += templates/canonical.template
-+EXTRA_DIST += templates/canonical.template.in
-+
- templates/clamd.conf.template: templates/clamd.conf.template.in
- 	@$(mkinstalldirs) templates
- 	$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
-@@ -451,6 +466,12 @@
- CLEANFILES += templates/rc.conf.template
- EXTRA_DIST += templates/rc.conf.template.in
- 
-+templates/relocated.template: templates/relocated.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/relocated.template.in >$@
-+CLEANFILES += templates/relocated.template
-+EXTRA_DIST += templates/relocated.template.in
-+
- templates/resmgr.conf.template: templates/resmgr.conf.template.in
- 	@$(mkinstalldirs) templates
- 	$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
-diff -urNad kolabd-2.1.99+20080314.dfsg~/Makefile.in kolabd-2.1.99+20080314.dfsg/Makefile.in
---- kolabd-2.1.99+20080314.dfsg~/Makefile.in	2008-04-03 23:34:07.000000000 +0200
-+++ kolabd-2.1.99+20080314.dfsg/Makefile.in	2008-04-03 23:34:27.000000000 +0200
-@@ -177,6 +177,8 @@
- 	namespace/libexec/services.in namespace/libexec/showlog.in \
- 	namespace/libexec/showuser.in namespace/libexec/start.in \
- 	namespace/libexec/stop.in namespace/kolab.in \
-+	templates/access.template.in \
-+	templates/canonical.template.in \
- 	templates/clamd.conf.template.in \
- 	templates/cyrus.conf.template.in \
- 	templates/DB_CONFIG.slapd.template.in \
-@@ -196,6 +198,7 @@
- 	templates/main.cf.template.in templates/master.cf.template.in \
- 	templates/kolab_smtpdpolicy.conf.template.in \
- 	templates/php.ini.template.in templates/rc.conf.template.in \
-+	templates/relocated.template.in \
- 	templates/resmgr.conf.template.in \
- 	templates/saslauthd.conf.template.in \
- 	templates/session_vars.php.template.in \
-@@ -218,6 +221,8 @@
- 	namespace/libexec/newconfig namespace/libexec/services \
- 	namespace/libexec/showlog namespace/libexec/showuser \
- 	namespace/libexec/start namespace/libexec/stop namespace/kolab \
-+	templates/access.template \
+ kolabconfigdir = $(kolabconfdir)
+ dist_kolabconfig_DATA = $(kolabconfig_FILES)
+-kolabtemplate_FILES = templates/amavisd.conf.template \
++kolabtemplate_FILES = templates/access.template \
++	templates/amavisd.conf.template \
 +	templates/canonical.template \
- 	templates/clamd.conf.template templates/cyrus.conf.template \
- 	templates/DB_CONFIG.slapd.template \
- 	templates/fbview.conf.template \
-@@ -233,6 +238,7 @@
- 	templates/master.cf.template \
- 	templates/kolab_smtpdpolicy.conf.template \
- 	templates/php.ini.template templates/rc.conf.template \
-+	templates/relocated.template \
- 	templates/resmgr.conf.template \
- 	templates/saslauthd.conf.template \
- 	templates/session_vars.php.template \
-@@ -272,6 +278,8 @@
  	templates/clamd.conf.template \
  	templates/cyrus.conf.template \
  	templates/DB_CONFIG.slapd.template \
-+	templates/access.template \
-+	templates/canonical.template \
- 	templates/fbview.conf.template \
- 	templates/freebusy.conf.template \
- 	templates/freshclam.conf.template \
-@@ -290,6 +298,7 @@
+@@ -212,6 +214,7 @@
  	templates/ldapvirtual.cf.template \
  	templates/kolab_smtpdpolicy.conf.template \
  	templates/php.ini.template \
@@ -110,32 +48,6 @@
  	templates/resmgr.conf.template \
  	templates/saslauthd.conf.template \
  	templates/session_vars.php.template \
-@@ -1035,6 +1044,14 @@
- 	$(do_subst) <$(srcdir)/namespace/kolab.in >$@
- 	chmod a+x namespace/kolab
- 
-+templates/access.template: templates/access.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/access.template.in >$@
-+
-+templates/canonical.template: templates/canonical.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/canonical.template.in >$@
-+
- templates/clamd.conf.template: templates/clamd.conf.template.in
- 	@$(mkinstalldirs) templates
- 	$(do_subst) <$(srcdir)/templates/clamd.conf.template.in >$@
-@@ -1119,6 +1136,10 @@
- 	@$(mkinstalldirs) templates
- 	$(do_subst) <$(srcdir)/templates/rc.conf.template.in >$@
- 
-+templates/relocated.template: templates/relocated.template.in
-+	@$(mkinstalldirs) templates
-+	$(do_subst) <$(srcdir)/templates/relocated.template.in >$@
-+
- templates/resmgr.conf.template: templates/resmgr.conf.template.in
- 	@$(mkinstalldirs) templates
- 	$(do_subst) <$(srcdir)/templates/resmgr.conf.template.in >$@
 diff -urNad kolabd-2.1.99+20080314.dfsg~/templates/access.template.in kolabd-2.1.99+20080314.dfsg/templates/access.template.in
 --- kolabd-2.1.99+20080314.dfsg~/templates/access.template.in	1970-01-01 01:00:00.000000000 +0100
 +++ kolabd-2.1.99+20080314.dfsg/templates/access.template.in	2008-04-03 23:34:27.000000000 +0200

More information about the pkg-kolab-devel mailing list