[boinc] 03/03: Fix dependencies on dbg packages, move to multiarch, move to arch:any because of the multiarch switch and because some header files contains arch dependent information
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Fri Oct 17 15:23:11 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to annotated tag debian/7.4.23+dfsg-1
in repository boinc.
commit 7015818a8973f33e59d5a4a87973f052e138118b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Oct 17 14:28:52 2014 +0200
Fix dependencies on dbg packages, move to multiarch, move to arch:any because of the multiarch switch and because some header files contains arch dependent information
---
debian/boinc-client.install | 4 ++--
debian/changelog | 13 +++++++++++++
debian/control.in | 22 ++++++++++------------
debian/libboinc-app-dev.install | 2 +-
debian/libboinc-app7.install | 6 +++---
debian/libboinc7.install | 8 ++++----
debian/rules | 6 +-----
7 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/debian/boinc-client.install b/debian/boinc-client.install
index 6e87ebe..14fe92e 100644
--- a/debian/boinc-client.install
+++ b/debian/boinc-client.install
@@ -3,7 +3,7 @@ debian/conffiles/* etc/boinc-client
debian/extra/bash/* etc/bash_completion.d
debian/extra/udev-cpu_share usr/share/boinc-client
debian/extra/update-boinc-applinks usr/bin
-usr/bin/boinc usr/bin
-usr/bin/boinccmd usr/bin
+usr/bin/boinc
+usr/bin/boinccmd
usr/bin/switcher usr/lib/boinc-client
usr/share/locale/*/BOINC-Client.mo
diff --git a/debian/changelog b/debian/changelog
index 40e17b7..599c3cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+boinc (7.4.23+dfsg-1) unstable; urgency=medium
+
+ * New upstream release candidate.
+ * Relaxing dependencies between packages, to allow binNMUs
+ (Closes: #765670).
+ * Remove useless -dbg packages dependencies.
+ * Make boinc multiarch compatible:
+ - switch dev packages to arch:any
+ - remove disabled multiarch tweaks in rules file.
+ - tweak .install files to point to the triplet lib directory
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 17 Oct 2014 14:49:21 +0200
+
boinc (7.4.22+dfsg-3exp1) experimental; urgency=medium
* Upload to experimental, with the boinc-server-* packages.
diff --git a/debian/control.in b/debian/control.in
index 6d29440..86d72c9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -112,7 +112,7 @@ Package: boinc
@Architecture: any
@Depends: adduser,
@ ca-certificates,
-@ libboinc7 (>= ${source:Version}),
+@ libboinc7 (= ${binary:Version}),
@ ${misc:Depends},
@ ${python:Depends},
@ ${shlibs:Depends}
@@ -190,9 +190,9 @@ Package: boinc
@
@Package: boinc-dev
@Section: oldlibs
- at Architecture: all
+ at Architecture: any
@Priority: extra
- at Depends: libboinc-app-dev (= ${source:Version}), ${misc:Depends}
+ at Depends: libboinc-app-dev (= ${binary:Version}), ${misc:Depends}
@Description: development files to build applications for BOINC projects (transitional)
@ Dummy transitional package helping the transition of a split of
@ architecture-independent development files and the architecture-dependent
@@ -200,18 +200,16 @@ Package: boinc
@
@Package: libboinc-app-dev
@Section: libdevel
- at Architecture: all
- at Depends: libboinc-app7 (<< ${source:Version}+1~),
-@ libboinc-app7 (>= ${source:Version}),
-@ libboinc7 (<< ${source:Version}+1~),
-@ libboinc7 (>= ${source:Version}),
+ at Architecture: any
+ at Depends: libboinc-app7 (= ${binary:Version}),
+@ libboinc7 (= ${binary:Version}),
@ libc6-dev | libc-dev,
@ libmysqlclient-dev,
@ libssl-dev,
@ libstdc++6-4.7-dev | libstdc++-4.8-dev | libstdc++-4.9-dev,
@ ${misc:Depends}
- at Breaks: boinc-dev (<< ${source:Version})
- at Replaces: boinc-dev (<< ${source:Version})
+ at Breaks: boinc-dev (<< 7.0.28+dfsg-3)
+ at Replaces: boinc-dev (<< 7.0.28+dfsg-3)
@Description: development files to build applications for BOINC projects
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing using volunteered computer
@@ -309,7 +307,7 @@ Package: boinc
@Section: debug
@Priority: extra
@Architecture: any
- at Depends: boinc-client (>= ${source:Version}) | boinc-manager (>= ${source:Version}) | libboinc7 (= ${source:Version}) | libboinc-app7 (= ${source:Version}),
+ at Depends: boinc-client (>= ${binary:Version}) | boinc-manager (>= ${binary:Version}),
@ ${misc:Depends}
@Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk3.0-0-dbg,
% boinc-server-dbg
@@ -328,7 +326,7 @@ Package: boinc
%Section: debug
%Priority: extra
%Architecture: any
-%Depends: boinc-client (>= ${source:Version}) | boinc-manager (>= ${source:Version}) | libboinc7 (>= ${source:Version}) | libboinc-app7 (>= ${source:Version}),
+%Depends: boinc-server-maker (>= ${binary:Version}) | | boinc-app-examples (>= ${binary:Version}) | boinc-cgi-stripchart (>= ${binary:Version}),
% ${misc:Depends}
%Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk3.0-0-dbg
%Description: debugging symbols for BOINC server binaries
diff --git a/debian/libboinc-app-dev.install b/debian/libboinc-app-dev.install
index 57479c9..45e89fe 100644
--- a/debian/libboinc-app-dev.install
+++ b/debian/libboinc-app-dev.install
@@ -1,5 +1,5 @@
usr/include/boinc
-usr/lib/*.so usr/lib
+usr/lib/*/*.so
# The two below are redundant but seem requested by sample code
lib/*.h usr/include/boinc/lib
diff --git a/debian/libboinc-app7.install b/debian/libboinc-app7.install
index dc8ec76..427b638 100644
--- a/debian/libboinc-app7.install
+++ b/debian/libboinc-app7.install
@@ -1,3 +1,3 @@
-usr/lib/libboinc_api*.so.* usr/lib
-usr/lib/libboinc_graphics*.so.* usr/lib
-usr/lib/libboinc_opencl*.so.* usr/lib
+usr/lib/*/libboinc_api*.so.*
+usr/lib/*/libboinc_graphics*.so.*
+usr/lib/*/libboinc_opencl*.so.*
diff --git a/debian/libboinc7.install b/debian/libboinc7.install
index 708a872..9e1e00d 100644
--- a/debian/libboinc7.install
+++ b/debian/libboinc7.install
@@ -1,8 +1,8 @@
-usr/lib/libboinc.so.* usr/lib
+usr/lib/*/libboinc.so.*
#needed for server
-usr/lib/libsched.so.* usr/lib
-usr/lib/libboinc_crypt.so.* usr/lib
+usr/lib/*/libsched.so.*
+usr/lib/*/libboinc_crypt.so.*
#needed for boinc-app-examples
-usr/lib/libboinc_zip.so.* usr/lib
+usr/lib/*/libboinc_zip.so.*
diff --git a/debian/rules b/debian/rules
index 3ce0270..704f84a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,13 +165,9 @@ $(shell sed 's/^@//' -i debian/control)
# --enable-debug
# --enable-wx-debug (need to install libwxbase3.0-0-dbg and libwxgtk3.0-0-dbg)
#
-# The --libdir and --libexecdir is added to turn off
-# the debhelper multiarch feature.
CFGFLAGS_boinc-client = \
$(TYPE_FLAGS) \
--prefix=/usr \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
$(ENABLE_CLIENT) \
$(ENABLE_SERVER) \
--disable-fcgi \
@@ -261,7 +257,6 @@ override_dh_auto_build: update-boinc-applinks.1
$(MAKE) -C zip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
#endif
- dh_auto_build
# Generate binary message catalogs of the BOINC Manager.
# if [ -d locale ]; then \
@@ -279,6 +274,7 @@ ifeq (,$(ENABLE_SERVER_TEST))
$(MAKE) -C samples/example_app
$(MAKE) -C samples/wrapper
endif
+ dh_auto_build
BINARIES= sched/census sched/cgi sched/db_dump sched/db_purge \
sched/delete_file sched/feeder sched/file_deleter \
--
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