[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-335-gea8b6a6

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 8362fe2db59bfeb1a16d3610542cc4207d03f889
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 19 01:40:00 2011 +0200

    Added template files for Makefile.am.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 86f79ac..6218aa4 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -1,18 +1,3 @@
---- boinc-server-6.11.0+r18946.orig/Makefile.am
-+++ boinc-server-6.11.0+r18946/Makefile.am
-@@ -37,6 +37,12 @@
- 	stripchart                                  \
-     INSTALL										
- 
-+nobase_dist_data_DATA =  \
-+		templates/crontab \
-+		templates/httpd.conf \
-+		templates/logrotate.conf \
-+		templates/readme
-+
- if INSTALL_HEADERS
- pkginclude_HEADERS = \
-     version.h
 --- boinc-server-6.11.0+r18946.orig/Makefile.incl
 +++ boinc-server-6.11.0+r18946/Makefile.incl
 @@ -6,8 +6,6 @@
diff --git a/debian/patches/local_sztaki_AddTemplateFilesForInstallation.patch b/debian/patches/local_sztaki_AddTemplateFilesForInstallation.patch
new file mode 100644
index 0000000..5f0f5b0
--- /dev/null
+++ b/debian/patches/local_sztaki_AddTemplateFilesForInstallation.patch
@@ -0,0 +1,17 @@
+Index: boinc/Makefile.am
+===================================================================
+--- boinc.orig/Makefile.am	2011-06-19 01:35:52.000000000 +0200
++++ boinc/Makefile.am	2011-06-19 01:37:02.000000000 +0200
+@@ -40,6 +40,12 @@
+ 	stripchart                                  \
+     INSTALL										
+ 
++nobase_dist_data_DATA =  \
++	templates/crontab \
++	templates/httpd.conf \
++	templates/logrotate.conf \
++	templates/readme
++
+ if INSTALL_HEADERS
+ pkginclude_HEADERS = \
+     version.h \
diff --git a/debian/patches/series b/debian/patches/series
index 6f3b163..62008b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 reorderTopMakefileTargets.patch
+local_sztaki_AddTemplateFilesForInstallation.patch
 local_sztaki_addFilesToMakefileTools.patch
 local_sztaki_simplifyMakefileTools.patch
 local_sztaki_simplifyMakefileSched.patch

-- 
BOINC packaging