[boinc] 01/05: Fixing many lintian warnings

[Gianfranco Costamagna]

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

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

commit 3c49e5657789e257c8bce7db1f149bde6ef7a272
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Aug 21 16:35:56 2013 +0200

    Fixing many lintian warnings
---
 debian/manpages/update-boinc-applinks.xml |    6 +++---
 debian/patches/add-ldflags.patch          |    8 ++++++++
 debian/patches/series                     |    1 +
 debian/rules                              |   16 ++++++++++++----
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/debian/manpages/update-boinc-applinks.xml b/debian/manpages/update-boinc-applinks.xml
index 3241000..1af896d 100644
--- a/debian/manpages/update-boinc-applinks.xml
+++ b/debian/manpages/update-boinc-applinks.xml
@@ -8,7 +8,7 @@
  This file is licensed under the terms of the GNU General Public License,
  Version 2 or any later version published by the Free Software Foundation.
 
- Copyright © 2006, 2008 Debian BOINC Maintainers
+ Copyright © 2006, 2013 Debian BOINC Maintainers
 -->
 
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
@@ -37,7 +37,7 @@
     </author>
     <copyright>
       <year>2006</year>
-      <year>2008</year>
+      <year>2013</year>
       <holder>&dhgroupname;</holder>
     </copyright>
     &dhdate;
@@ -147,7 +147,7 @@
 
   <refsect1>
     <title>COPYRIGHT</title>
-    <para>Copyright © 2006, 2008 &dhgroupname;.</para>
+    <para>Copyright © 2006, 2013 &dhgroupname;.</para>
     <para>
       This is free software; you can redistribute it and/or modify it under the
       terms of the &gnu; General Public License, Version 2 or any later version
diff --git a/debian/patches/add-ldflags.patch b/debian/patches/add-ldflags.patch
new file mode 100644
index 0000000..cbb4061
--- /dev/null
+++ b/debian/patches/add-ldflags.patch
@@ -0,0 +1,8 @@
+--- boinc-7.2.10+dfsg.orig/samples/wrapper/Makefile
++++ boinc-7.2.10+dfsg/samples/wrapper/Makefile
+@@ -37,4 +37,4 @@ REGEXP_OBJS = \
+ 	regexp_report.o
+ 
+ wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
+-	g++ $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
++	g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip $(LDFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 5c2be49..b4ffa0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,3 +62,4 @@ filesys_error_message.patch
 de.po.patch
 more_clang_warnings.patch
 #mmap_mem_only.patch
+add-ldflags.patch
diff --git a/debian/rules b/debian/rules
index 804a026..4930041 100755
--- a/debian/rules
+++ b/debian/rules
@@ -202,7 +202,10 @@ override_dh_clean:
 	dh_clean
 	rm -rf config.log
 	rm -rf clientscr/.libs override_dh_auto_install
-	rm -rf debian/boinc-app-examples debian/boinc-server-maker debian/boinc-app-examples.substvars debian/boinc-server-maker.substvars
+	rm -rf debian/boinc-app-examples debian/boinc-app-examples.substvars
+	rm -rf debian/boinc-server-maker debian/boinc-server-maker.substvars
+	rm -rf debian/boinc-server-dbg   debian/boinc-server-dbg.substvars
+	rm -rf *.debhelper
 	rm -rf debian/tmp autoreconf-stamp build-*-stamp install-*-stamp
 	rm -fr debian/boinc-amd-opencl debian/boinc-screensaver # for cases when this is not in debian/control
 	rm -f debian/boinc-screensaver.substvars debian/boinc-amd-opencl.substvars # dito
@@ -257,8 +260,8 @@ override_dh_auto_build: update-boinc-applinks.1
 	#$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
 ifneq (,$(ENABLE_SERVER_TEST))
 	# FIXME For some reasons unzip build fails if hardening flags are enabled.
-	$(MAKE) -C zip CFLAGS="$(CFLAGS_plain)" CXXFLAGS="$(CXXFLAGS_plain)"
-	$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain)" CXXFLAGS="$(CXXFLAGS_plain)"
+	$(MAKE) -C zip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
+	$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
 endif
 	$(MAKE)
 
@@ -368,7 +371,6 @@ endif
 	do \
 		egrep -l "^#!.*env..*python" $$i/* | xargs -r sed -i '1s%#!.*%#!/usr/bin/python%' ; \
 	done
-#	-chmod +x $(CURDIR)/debian/boinc-server-maker/usr/share/boinc-server/sched/transitioner_catchup.php ; \
 
 override_dh_install:
 	# boinc apps are built only together with the server
@@ -403,6 +405,12 @@ override_dh_fixperms:
 	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
+ifneq (,$(ENABLE_SERVER_TEST))
+	chmod +x \
+	  debian/boinc-server-maker/usr/lib/boinc-server-maker/sched/transitioner_catchup.php \
+	  debian/boinc-server-maker/usr/share/boinc-server-maker/db/init_db \
+	  debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops/delete_job_files
+endif
 
 override_dh_compress:
 	dh_compress -Xsamples -X.cpp

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