[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-336-g0d7e82a
Steffen Moeller
moeller at debian.org
Mon Jun 20 21:22:36 UTC 2011
The following commit has been merged in the SZTAKI branch:
commit 0d7e82adea2b0eadfaece23d01dabafde7189dfe
Author: Steffen Moeller <moeller at debian.org>
Date: Mon Jun 20 23:14:35 2011 +0200
Removal of LIBBOINC_VERSION
diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 880d6cc..0d7964b 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -1,34 +1,5 @@
---- boinc-server-6.11.0+r18946.orig/Makefile.incl
-+++ boinc-server-6.11.0+r18946/Makefile.incl
-@@ -6,8 +6,6 @@
- # ignore any LIBS set by configure
- LIBS=
-
--LIBBOINC_VERSION = @LIBBOINC_VERSION@
--
- MYSQL_LIBS = @MYSQL_LIBS@
- MYSQL_CFLAGS = @MYSQL_CFLAGS@
- PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -56,7 +54,5 @@
- $(LIBAPI):
- cd $(top_builddir)/api; ${MAKE} libboinc_api.la
-
--SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
--SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
- APPLIBS = $(LIBAPI) $(LIBBOINC)
-
--- boinc-server-6.11.0+r18946.orig/configure.ac
+++ boinc-server-6.11.0+r18946/configure.ac
-@@ -7,8 +7,7 @@
-
- dnl Set the BOINC version here. You can also use the set-version script.
- AC_INIT(BOINC, 6.11.0)
--LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
--AC_SUBST([LIBBOINC_VERSION])
-+AC_CONFIG_MACRO_DIR([m4])
-
- AC_CANONICAL_TARGET
-
@@ -480,7 +493,6 @@
dnl ---------- decide wether to build the graphical boinc-api libs or not
@@ -340,83 +311,6 @@
endif
man_MANS = $(CLIENT_MANS) $(CLIENTGUI_MANS) $(SERVER_MANS)
---- boinc-server-6.11.0+r18946.orig/lib/Makefile.am
-+++ boinc-server-6.11.0+r18946/lib/Makefile.am
-@@ -133,60 +133,26 @@
- libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
- libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
--libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
--libboinc_la_LIBADD =
-+libboinc_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libboinc_la_LIBADD = -ldl
-
- libboinc_crypt_la_SOURCES = crypt.cpp
- libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
--libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
--libboinc_crypt_la_LIBADD = $(LIBCURL)
--
-+libboinc_crypt_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libboinc_crypt_la_LIBADD = libboinc.la $(SSL_LIBS)
-
- if ENABLE_FCGI
- lib_LTLIBRARIES += libboinc_fcgi.la
-+
- libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources)
- libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
--libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
--libboinc_fcgi_la_LIBADD =
-+libboinc_fcgi_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libboinc_fcgi_la_LIBADD = -lfcgi -ldl
- endif
- # end of "if ENABLE_FCGI"
-
--# Some OSs may not prefix libraries with lib.
--# For example OS2
--if OS_OS2
--LIBBOINC_STATIC=boinc.${LIBEXT}
--LIBBOINC_CRYPT_STATIC=boinc_crypt.${LIBEXT}
--LIBBOINC_FCGI_STATIC=boinc_fcgi.${LIBEXT}
--else
--LIBBOINC_STATIC=libboinc.${LIBEXT}
--LIBBOINC_CRYPT_STATIC=libboinc_crypt.${LIBEXT}
--LIBBOINC_FCGI_STATIC=libboinc_fcgi.${LIBEXT}
--endif
--
--
--if BUILD_STATIC_LIBS
--all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
--if ENABLE_FCGI
--all_local += $(LIBBOINC_FCGI_STATIC)
--endif
--endif
--
--all-local: $(all_local)
--
--$(LIBBOINC_STATIC): libboinc.la
-- rm -f $(LIBBOINC_STATIC)
-- $(LN) .libs/$(LIBBOINC_STATIC) .
--
--$(LIBBOINC_CRYPT_STATIC): libboinc_crypt.la
-- rm -f $(LIBBOINC_CRYPT_STATIC)
-- $(LN) .libs/$(LIBBOINC_CRYPT_STATIC)
--
--$(LIBBOINC_FCGI_STATIC): libboinc_fcgi.la
-- rm -f $(LIBBOINC_FCGI_STATIC)
-- $(LN) .libs/$(LIBBOINC_FCGI_STATIC) .
--
- endif
- # end of "if ENABLE_LIBRARIES"
-
-@@ -205,5 +171,5 @@
- msg_test_LDADD = $(LIBBOINC)
- crypt_prog_SOURCES = crypt_prog.cpp
- crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
--crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT_STATIC) $(SSL_LIBS)
-+crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(SSL_LIBS)
-
--- boinc-server-6.11.0+r18946.orig/tools/make_project
+++ boinc-server-6.11.0+r18946/tools/make_project
@@ -209,8 +204,8 @@
@@ -583,61 +477,6 @@
-for important additional instructions.
-'''%locals()
+print "Done creating project."
---- boinc-server-6.11.0+r18946.orig/api/Makefile.am
-+++ boinc-server-6.11.0+r18946/api/Makefile.am
-@@ -35,12 +35,14 @@
-
- lib_LTLIBRARIES = libboinc_api.la
- libboinc_api_la_SOURCES = $(api_files)
--libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
-+libboinc_api_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libboinc_api_la_LIBADD = ../lib/libboinc.la $(PTHREAD_LIBS)
- if BUILD_GRAPHICS_API
- lib_LTLIBRARIES += libboinc_graphics2.la
- libboinc_graphics2_la_SOURCES = $(graphics2_files)
- libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir)/lib
--libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
-+libboinc_graphics2_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libboinc_graphics2_la_LIBADD = libboinc_api.la ../lib/libboinc.la $(GLUT_LIBS) -ljpeg $(PTHREAD_LIBS)
- endif #BUILD_GRAPHICS_API
-
- if INSTALL_HEADERS
-@@ -51,35 +53,6 @@
- gutil.h
- endif ## INSTALL_HEADERS
-
--# Some OSs may not prefix libraries with lib.
--# For example OS2
--if OS_OS2
--LIBBOINC_API_STATIC=boinc_api.${LIBEXT}
--LIBBOINC_GRAPHICS2_STATIC=boinc_graphics2.${LIBEXT}
--else
--LIBBOINC_API_STATIC=libboinc_api.${LIBEXT}
--LIBBOINC_GRAPHICS2_STATIC=libboinc_graphics2.${LIBEXT}
--endif
--
--
--if BUILD_STATIC_LIBS
--all_local = $(LIBBOINC_API_STATIC)
--if BUILD_GRAPHICS_API
--all_local += $(LIBBOINC_GRAPHICS2_STATIC)
--endif
--endif
--
--all-local: $(all_local)
--
--$(LIBBOINC_API_STATIC): libboinc_api.la
-- rm -f $(LIBBOINC_API_STATIC)
-- $(LN) .libs/$(LIBBOINC_API_STATIC) .
--
--$(LIBBOINC_GRAPHICS2_STATIC): libboinc_graphics2.la
-- rm -f $(LIBBOINC_GRAPHICS2_STATIC)
-- $(LN) .libs/$(LIBBOINC_GRAPHICS2_STATIC) .
--
--
- endif ## ENABLE_LIBRARIES
-
- .PHONY:
--- 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/series b/debian/patches/series
index 7e237e3..a63e243 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream_sztaki_libboinc_removal.patch
reorderTopMakefileTargets.patch
local_sztaki_AddTemplateFilesForInstallation.patch
local_sztaki_DBschemaDistributionMakefile.patch
diff --git a/debian/patches/upstream_sztaki_libboinc_removal.patch b/debian/patches/upstream_sztaki_libboinc_removal.patch
new file mode 100644
index 0000000..1f362be
--- /dev/null
+++ b/debian/patches/upstream_sztaki_libboinc_removal.patch
@@ -0,0 +1,170 @@
+Index: boinc/Makefile.incl
+===================================================================
+--- boinc.orig/Makefile.incl 2011-06-20 23:08:25.000000000 +0200
++++ boinc/Makefile.incl 2011-06-20 23:08:31.000000000 +0200
+@@ -6,8 +6,6 @@
+ # ignore any LIBS set by configure
+ LIBS=
+
+-LIBBOINC_VERSION = @LIBBOINC_VERSION@
+-
+ MYSQL_LIBS = @MYSQL_LIBS@
+ MYSQL_CFLAGS = @MYSQL_CFLAGS@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+@@ -56,7 +54,5 @@
+ $(LIBAPI):
+ cd $(top_builddir)/api; ${MAKE} libboinc_api.la
+
+-SERVERLIBS = $(LIBSCHED) $(LIBBOINC_CRYPT) $(LIBBOINC) $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
+-SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
+ APPLIBS = $(LIBAPI) $(LIBBOINC)
+
+Index: boinc/api/Makefile.am
+===================================================================
+--- boinc.orig/api/Makefile.am 2011-06-20 23:08:25.000000000 +0200
++++ boinc/api/Makefile.am 2011-06-20 23:08:31.000000000 +0200
+@@ -35,12 +35,14 @@
+
+ lib_LTLIBRARIES = libboinc_api.la
+ libboinc_api_la_SOURCES = $(api_files)
+-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
++libboinc_api_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
++libboinc_api_la_LIBADD = ../lib/libboinc.la $(PTHREAD_LIBS)
+ if BUILD_GRAPHICS_API
+ lib_LTLIBRARIES += libboinc_graphics2.la
+ libboinc_graphics2_la_SOURCES = $(graphics2_files)
+ libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir)/lib
+-libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
++libboinc_graphics2_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
++libboinc_graphics2_la_LIBADD = libboinc_api.la ../lib/libboinc.la $(GLUT_LIBS) -ljpeg $(PTHREAD_LIBS)
+ endif #BUILD_GRAPHICS_API
+
+ if INSTALL_HEADERS
+@@ -51,35 +53,6 @@
+ gutil.h
+ endif ## INSTALL_HEADERS
+
+-# Some OSs may not prefix libraries with lib.
+-# For example OS2
+-if OS_OS2
+-LIBBOINC_API_STATIC=boinc_api.${LIBEXT}
+-LIBBOINC_GRAPHICS2_STATIC=boinc_graphics2.${LIBEXT}
+-else
+-LIBBOINC_API_STATIC=libboinc_api.${LIBEXT}
+-LIBBOINC_GRAPHICS2_STATIC=libboinc_graphics2.${LIBEXT}
+-endif
+-
+-
+-if BUILD_STATIC_LIBS
+-all_local = $(LIBBOINC_API_STATIC)
+-if BUILD_GRAPHICS_API
+-all_local += $(LIBBOINC_GRAPHICS2_STATIC)
+-endif
+-endif
+-
+-all-local: $(all_local)
+-
+-$(LIBBOINC_API_STATIC): libboinc_api.la
+- rm -f $(LIBBOINC_API_STATIC)
+- $(LN) .libs/$(LIBBOINC_API_STATIC) .
+-
+-$(LIBBOINC_GRAPHICS2_STATIC): libboinc_graphics2.la
+- rm -f $(LIBBOINC_GRAPHICS2_STATIC)
+- $(LN) .libs/$(LIBBOINC_GRAPHICS2_STATIC) .
+-
+-
+ endif ## ENABLE_LIBRARIES
+
+ .PHONY:
+Index: boinc/configure.ac
+===================================================================
+--- boinc.orig/configure.ac 2011-06-20 23:08:25.000000000 +0200
++++ boinc/configure.ac 2011-06-20 23:09:14.000000000 +0200
+@@ -8,8 +8,6 @@
+ dnl Set the BOINC version here. You can also use the set-version script.
+ AC_INIT(BOINC, 6.12.32)
+ AC_CONFIG_MACRO_DIR([m4])
+-LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
+-AC_SUBST([LIBBOINC_VERSION])
+
+ AC_CANONICAL_TARGET
+
+Index: boinc/lib/Makefile.am
+===================================================================
+--- boinc.orig/lib/Makefile.am 2011-06-20 23:08:25.000000000 +0200
++++ boinc/lib/Makefile.am 2011-06-20 23:13:59.000000000 +0200
+@@ -141,60 +141,27 @@
+ libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
+ libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libboinc_la_LIBADD =
++libboinc_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
++libboinc_la_LIBADD = -ldl
+
+ libboinc_crypt_la_SOURCES = crypt.cpp
+ libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+-libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libboinc_crypt_la_LIBADD =
++libboinc_crypt_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
++libboinc_crypt_la_LIBADD = libboinc.la $(SSL_LIBS)
+
+
+ if ENABLE_FCGI
+ lib_LTLIBRARIES += libboinc_fcgi.la
++
+ libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources)
+ libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+-libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libboinc_fcgi_la_LIBADD =
++libboinc_fcgi_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
++libboinc_fcgi_la_LIBADD = -lfcgi -ldl
+ endif
+ # end of "if ENABLE_FCGI"
+
+-# Some OSs may not prefix libraries with lib.
+-# For example OS2
+-if OS_OS2
+-LIBBOINC_STATIC=boinc.${LIBEXT}
+-LIBBOINC_CRYPT_STATIC=boinc_crypt.${LIBEXT}
+-LIBBOINC_FCGI_STATIC=boinc_fcgi.${LIBEXT}
+-else
+-LIBBOINC_STATIC=libboinc.${LIBEXT}
+-LIBBOINC_CRYPT_STATIC=libboinc_crypt.${LIBEXT}
+-LIBBOINC_FCGI_STATIC=libboinc_fcgi.${LIBEXT}
+-endif
+-
+-
+-if BUILD_STATIC_LIBS
+-all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
+-if ENABLE_FCGI
+-all_local += $(LIBBOINC_FCGI_STATIC)
+-endif
+-endif
+-
+-all-local: $(all_local)
+-
+-$(LIBBOINC_STATIC): libboinc.la
+- rm -f $(LIBBOINC_STATIC)
+- $(LN) .libs/$(LIBBOINC_STATIC) .
+-
+-$(LIBBOINC_CRYPT_STATIC): libboinc_crypt.la
+- rm -f $(LIBBOINC_CRYPT_STATIC)
+- $(LN) .libs/$(LIBBOINC_CRYPT_STATIC) .
+-
+-$(LIBBOINC_FCGI_STATIC): libboinc_fcgi.la
+- rm -f $(LIBBOINC_FCGI_STATIC)
+- $(LN) .libs/$(LIBBOINC_FCGI_STATIC) .
+-
+ endif
+ # end of "if ENABLE_LIBRARIES"
+
+@@ -213,5 +180,4 @@
+ msg_test_LDADD = $(LIBBOINC)
+ crypt_prog_SOURCES = crypt_prog.cpp
+ crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
+-crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
+-
++crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(SSL_LIBS)
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list