[boinc] 01/02: Reorder patches, dropping old and useless patches

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Oct 27 10:21:03 UTC 2014


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit fb1fa5b70022d471341b974ec272ef16fa571ae0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sun Oct 26 09:53:55 2014 +0100

    Reorder patches, dropping old and useless patches
---
 debian/changelog                                   |  1 +
 ...rPython.patch => AdjustBoincTopdirPython.patch} |  0
 debian/patches/Missing_libSched.patch              |  4 +--
 debian/patches/dynamic_libboinc.patch              | 36 ----------------------
 debian/patches/fix-dependencies.patch              | 34 --------------------
 debian/patches/fix-for-debian-bug-646583.patch     | 20 ------------
 .../patches/gui_urls_xml_added_to_Makefile.patch   |  2 +-
 debian/patches/series                              | 27 +++++++---------
 debian/patches/upstream_sztaki_configureEval.patch | 24 ---------------
 9 files changed, 15 insertions(+), 133 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e518225..748478b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 boinc (7.4.23+dfsg-2) UNRELEASED; urgency=medium
 
   * Fix other dependencies on dbg packages.
+  * Reorder debian patches, drop useless and old ones.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 18 Oct 2014 14:34:41 +0200
 
diff --git a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch b/debian/patches/AdjustBoincTopdirPython.patch
similarity index 100%
rename from debian/patches/debian_debian_AdjustBoincTopdirPython.patch
rename to debian/patches/AdjustBoincTopdirPython.patch
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 1d611f8b..7933ce1 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,8 +1,8 @@
 Description: help autotools to find the correct sched dynamic shared library.
 --- a/tools/Makefile.am
 +++ b/tools/Makefile.am
-@@ -43,7 +43,7 @@
-     project.xml
+@@ -44,7 +44,7 @@
+     gui_urls.xml
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
 -AM_LDFLAGS += -static
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
deleted file mode 100644
index abdf0f2..0000000
--- a/debian/patches/dynamic_libboinc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Makefile.incl
-+++ b/Makefile.incl
-@@ -41,22 +41,22 @@
- # dependencies to make sure libs gets compiled before
- # programs linking to them:
- 
--LIBSCHED = $(top_builddir)/sched/libsched.la
-+LIBSCHED = -lsched
- $(LIBSCHED):
- 	cd $(top_builddir)/sched; ${MAKE} libsched.la
--LIBSCHED_FCGI = $(top_builddir)/sched/libsched_fcgi.la
-+LIBSCHED_FCGI = -lsched_fcgi
- $(LIBSCHED_FCGI):
- 	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
--LIBBOINC = $(top_builddir)/lib/libboinc.la
-+LIBBOINC = -lboinc
- $(LIBBOINC):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
--LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
-+LIBBOINC_CRYPT = -lboinc_crypt
- $(LIBBOINC_CRYPT):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
--LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
-+LIBBOINC_FCGI = -lboinc_fcgi
- $(LIBBOINC_FCGI):
- 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
--LIBAPI = $(top_builddir)/api/libboinc_api.la
-+LIBAPI = -lboinc_api
- $(LIBAPI):
- 	cd $(top_builddir)/api; ${MAKE} libboinc_api.la
- 
-@@ -65,3 +65,4 @@
- APPLIBS = $(LIBAPI) $(LIBBOINC)
- FUHLIBS = $(LIBBOINC_CRYPT) $(LIBBOINC) $(RSA_LIBS) $(SSL_LIBS)
- 
-+.PHONY: $(LIBBOINC) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) $(LIBAPI) $(LIBSCHED) $(LIBSCHED_FCGI)
diff --git a/debian/patches/fix-dependencies.patch b/debian/patches/fix-dependencies.patch
deleted file mode 100644
index 8fa3cf9..0000000
--- a/debian/patches/fix-dependencies.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: this should avoid a race condition in parallel builds when the ".a" file
- is accessed prior to the correspondant "$(LN)" call from Makefile.
-
---- boinc-7.4.14+dfsg.orig/Makefile.incl
-+++ boinc-7.4.14+dfsg/Makefile.incl
-@@ -43,22 +43,22 @@ AM_LDFLAGS =
- 
- LIBSCHED = $(top_builddir)/sched/libsched.la
- $(LIBSCHED):
--	cd $(top_builddir)/sched; ${MAKE} libsched.la
-+	cd $(top_builddir)/sched; ${MAKE} libsched.a
- LIBSCHED_FCGI = $(top_builddir)/sched/libsched_fcgi.la
- $(LIBSCHED_FCGI):
--	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
-+	cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.a
- LIBBOINC = $(top_builddir)/lib/libboinc.la
- $(LIBBOINC):
--	cd $(top_builddir)/lib; ${MAKE} libboinc.la
-+	cd $(top_builddir)/lib; ${MAKE} libboinc.a
- LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
- $(LIBBOINC_CRYPT):
--	cd $(top_builddir)/lib; ${MAKE} libboinc_crypt.la
-+	cd $(top_builddir)/lib; ${MAKE} libboinc_crypt.a
- LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
- $(LIBBOINC_FCGI):
--	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
-+	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.a
- LIBAPI = $(top_builddir)/api/libboinc_api.la
- $(LIBAPI):
--	cd $(top_builddir)/api; ${MAKE} libboinc_api.la
-+	cd $(top_builddir)/api; ${MAKE} libboinc_api.a
- 
- 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)
diff --git a/debian/patches/fix-for-debian-bug-646583.patch b/debian/patches/fix-for-debian-bug-646583.patch
deleted file mode 100644
index 0693247..0000000
--- a/debian/patches/fix-for-debian-bug-646583.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: This patch claims to fix a bug in boinc-launching from different directories than /var/lib/boinc-client
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
----
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug-Debian: http://bugs.debian.org/646583
-Bug-Ubuntu: https://launchpad.net/bugs/347651
-Forwarded: not-needed
-Last-Update: <2013-02-03>
-
---- boinc-7.0.47+dfsg.orig/lib/common_defs.h
-+++ boinc-7.0.47+dfsg/lib/common_defs.h
-@@ -224,7 +224,7 @@ struct VERSION_INFO {
- #define CLIENT_AUTH_FILENAME        "client_auth.xml"
- #define LOCK_FILE_NAME              "lockfile"
- #define GRAPHICS_APP_FILENAME       "graphics_app"
--#define GUI_RPC_PASSWD_FILE         "gui_rpc_auth.cfg"
-+#define GUI_RPC_PASSWD_FILE         "/var/lib/boinc-client/gui_rpc_auth.cfg"
- #define SS_CONFIG_FILE              "ss_config.xml"
- 
- #ifdef _WIN32
diff --git a/debian/patches/gui_urls_xml_added_to_Makefile.patch b/debian/patches/gui_urls_xml_added_to_Makefile.patch
index 6ffe645..e3c6985 100644
--- a/debian/patches/gui_urls_xml_added_to_Makefile.patch
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -10,4 +10,4 @@ Description: Adding a missing file to the install script
 +    gui_urls.xml
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
- AM_LDFLAGS += -static -L../lib/.libs -L../sched
+ AM_LDFLAGS += -static
diff --git a/debian/patches/series b/debian/patches/series
index cbf0b25..60efabc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,6 @@
-# patches to get Debian going
-make_project_overcomes_Apache24_security.patch
 # undisputed patches above
 stripchart_debian.patch
-#upstream_sztaki_configureEval.patch
-disable_svn_version.patch
 possible_size_type_error.patch
-debian_debian_AdjustBoincTopdirPython.patch
 some_extra_clang_warnings.patch
 cppcheck_realloc.patch
 MainDocumentWarnings.patch
@@ -13,13 +8,6 @@ more_maxpathlen.patch
 sched_driver_char_buffers.patch
 csh2tcsh.patch
 client_app_maxpathlen.patch
-#debian specific patches
-#boinclib_shared.patch #needed in order to make boinc build correctly otherwise it will FTBFS
-boinclib_shared.patch
-#dynamic_libboinc.patch
-Missing_libSched.patch
-#fix-for-debian-bug-646583.patch
-disable_new_version_check.patch
 lib_cppcheck.patch
 fopen_closing.patch
 rrsim_iterator_cppcheck.patch
@@ -30,10 +18,17 @@ more_clang_warnings.patch
 add-ldflags.patch
 addressing_additional_html_dirs.patch
 gui_urls_xml_added_to_Makefile.patch
-file_upload_handler_in_sched_linking.patch
-disable_silent_rules.patch
 server_status_php.patch
 #db_interface_use.patch
-boinc-server-dynamic-libs.patch
 fix-typo.patch
-fix-dependencies.patch
+# patches to get Debian going
+make_project_overcomes_Apache24_security.patch
+#debian specific patches
+boinclib_shared.patch
+Missing_libSched.patch
+boinc-server-dynamic-libs.patch
+disable_new_version_check.patch
+disable_svn_version.patch
+AdjustBoincTopdirPython.patch
+file_upload_handler_in_sched_linking.patch
+disable_silent_rules.patch
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
deleted file mode 100644
index 4a6908f..0000000
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Unknown
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,6 +305,20 @@
- 
- AC_SUBST([TOP_BUILD_DIR], [`pwd`])
- 
-+dnl We can't just export the value of ${bindir} etc. since it may reference
-+dnl ${prefix}, so we must resolve those references first
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+m4_foreach([dir], [libexecdir], [
-+    x="$dir"
-+    eval y="$x"
-+    while test "x$x" != "x$y"; do
-+        x="$y"
-+        eval y="$x"
-+    done
-+    AC_SUBST([CONFIG_]m4_translit(dir, [a-z], [A-Z]), ["$x"])
-+])
-+
- ## commented this out to turn all maintainer-mode features ON by default,
- ## such as automatic reconfiguring on changes in Makefile.am's and configure.ac
- ## AM_MAINTAINER_MODE

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git



More information about the pkg-boinc-commits mailing list