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

Steffen Moeller moeller at debian.org
Sat Jun 18 23:47:06 UTC 2011


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

    Adding further information upon installation.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 6218aa4..880d6cc 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -638,26 +638,6 @@
  endif ## ENABLE_LIBRARIES
  
  .PHONY:
---- boinc-server-6.11.0+r18946.orig/db/Makefile.am
-+++ boinc-server-6.11.0+r18946/db/Makefile.am
-@@ -8,5 +8,16 @@
- pkginclude_HEADERS =  boinc_db.h db_base.h
- endif
- 
-+if ENABLE_SERVER
-+dbdir = $(datadir)/db
-+dist_db_DATA = \
-+	bolt_constraints.sql \
-+	bolt_schema.sql \
-+	bossa_constraints.sql \
-+	bossa_schema.sql \
-+	constraints.sql \
-+	schema.sql
-+endif
-+
- ## other stuff to go into the distribution
--EXTRA_DIST = constraints.sql schema.sql init_db
-+EXTRA_DIST = init_db
 --- boinc-server-6.11.0+r18946.orig/sched/file_deleter.cpp
 +++ boinc-server-6.11.0+r18946/sched/file_deleter.cpp
 @@ -133,7 +133,7 @@
diff --git a/debian/patches/local_sztaki_DBschemaDistributionMakefile.patch b/debian/patches/local_sztaki_DBschemaDistributionMakefile.patch
new file mode 100644
index 0000000..0fb484f
--- /dev/null
+++ b/debian/patches/local_sztaki_DBschemaDistributionMakefile.patch
@@ -0,0 +1,22 @@
+Index: boinc/db/Makefile.am
+===================================================================
+--- boinc.orig/db/Makefile.am	2011-06-19 01:44:17.000000000 +0200
++++ boinc/db/Makefile.am	2011-06-19 01:44:37.000000000 +0200
+@@ -8,5 +8,16 @@
+ pkginclude_HEADERS =  boinc_db.h db_base.h
+ endif
+ 
++if ENABLE_SERVER
++dbdir = $(datadir)/db
++dist_db_DATA = \
++       bolt_constraints.sql \
++       bolt_schema.sql \
++       bossa_constraints.sql \
++       bossa_schema.sql \
++       constraints.sql \
++       schema.sql
++endif
++
+ ## other stuff to go into the distribution
+-EXTRA_DIST = constraints.sql schema.sql init_db
++EXTRA_DIST = init_db
diff --git a/debian/patches/series b/debian/patches/series
index 62008b4..7e237e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 reorderTopMakefileTargets.patch
 local_sztaki_AddTemplateFilesForInstallation.patch
+local_sztaki_DBschemaDistributionMakefile.patch
 local_sztaki_addFilesToMakefileTools.patch
 local_sztaki_simplifyMakefileTools.patch
 local_sztaki_simplifyMakefileSched.patch

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list