[boinc-app-seti] 01/01: Cosmeting changes, adding some rm to clean target, adding a debian/clean file

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Sat Aug 30 18:20:09 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-app-seti.

commit 9c8d4e6f747b1064d55156f1fcd2b5b36627efe2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Aug 30 20:12:57 2014 +0200

    Cosmeting changes, adding some rm to clean target, adding a debian/clean file
---
 debian/clean                                           |  2 ++
 debian/control                                         |  2 +-
 debian/patches/003_dont_use_own_jpeglib_and_glut.patch |  5 -----
 debian/rules                                           | 11 ++++-------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..135eb20
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/extra/app_info.xml
+debian/extra-graphics/app_info.xml
diff --git a/debian/control b/debian/control
index a9cbbf2..7a97010 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Description: SETI at home application for the BOINC client
 
 Package: boinc-app-seti-graphics
 Architecture: any
-Depends: ${misc:Depends},${shlibs:Depends}, boinc-client
+Depends: ${misc:Depends}, ${shlibs:Depends}, boinc-client
 Suggests: boinc-manager
 Conflicts: boinc-app-seti
 Description: SETI at home application for the BOINC client (with graphics)
diff --git a/debian/patches/003_dont_use_own_jpeglib_and_glut.patch b/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
index 8d4542d..025fdb9 100644
--- a/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
+++ b/debian/patches/003_dont_use_own_jpeglib_and_glut.patch
@@ -1,8 +1,3 @@
-
-The commented SAH_CHECK_JPEGLIB in configure.ac prevents that setiathome
-will be linked against libjpeg. If the package should be configured with
-"--enable-graphics" this needs to be uncommented.
-
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -27,7 +27,7 @@
diff --git a/debian/rules b/debian/rules
index f8e3180..320be7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,14 +133,14 @@ override_dh_auto_build:
 	dh_auto_build -O--parallel --builddirectory=nographics
 
 override_dh_auto_clean:
-	# may be seen after invoking binary
-	# rm -f client/boinc_finish_called client/result.sah client/state.sah client/stderr.txt client/wisdom.sah client/work_unit.sah client/boinc_lockfile client/project_specific_defines.h
+	dh_auto_clean
 	rm -rf configure Makefile.in aclocal.m4 assimilator/Makefile.in client/Makefile.in sah_config.h.in splitter_fft/Makefile.in splitter_pfb/Makefile.in tools/Makefile.in
 	rm -rf compile config.guess config.sub depcomp install-sh ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 missing
 	# separate building dirs
 	rm -rf graphics/
 	rm -rf nographics/
-	dh_auto_clean
+	# may be seen after invoking binary
+	rm -f boinc_finish_called result.sah state.sah stderr.txt stderrgfx.txt wisdom.sah work_unit.sah boinc_lockfile project_specific_defines.h boinc_setiathome_*
 
 override_dh_install: 
 	cp -f nographics/client/seti_boinc  nographics/client/setiathome_v7
@@ -150,15 +150,12 @@ override_dh_install:
 	  sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra/app_info.xml
 	cat debian/extra-graphics/app_info.xml.in | perl -ne 'print unless /^#/' | \
 	  sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra-graphics/app_info.xml
-	dh_install
+	dh_install --list-missing
 
 
 override_dh_strip:
 	dh_strip --dbg-package=boinc-app-seti-dbg
 
-override_dh_clean:
-	dh_clean debian/extra/app_info.xml debian/extra-graphics/app_info.xml
-
 
 origDir ?= .
 

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



More information about the pkg-boinc-commits mailing list