[SCM] BOINC packaging branch, master, updated. upstream/7.0.28+dfsg-457-g5a93be6
Steffen Moeller
steffen_moeller at gmx.de
Mon May 28 13:28:55 UTC 2012
The following commit has been merged in the master branch:
commit 5a93be6839fb423490fa0d594c1a9f081ed229ad
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Mon May 28 15:27:59 2012 +0200
Series of changes for split of boinc-dev.
diff --git a/debian/boinc-dev.install b/debian/boinc-dev.install
deleted file mode 100644
index a1e068e..0000000
--- a/debian/boinc-dev.install
+++ /dev/null
@@ -1,21 +0,0 @@
-usr/include/boinc
-usr/lib/lib* usr/lib
-
-#api/graphics_data.h usr/include/boinc/api
-#api/reduce.h usr/include/boinc/api
-#api/boinc_gl.h usr/include/boinc/api
-#api/txf_util.h usr/include/boinc/api
-#lib/md5_file.h usr/include/boinc/lib
-#lib/procinfo.h usr/include/boinc/lib
-#lib/str_replace.h usr/include/boinc
-#lib/coproc.h usr/include/boinc
-
-# The two below are redundant but seem requested by sample code
-lib/*.h usr/include/boinc/lib
-api/*.h usr/include/boinc/api
-
-# no longer available
-#lib/cal.h usr/include/boinc
-
-config.h usr/include/boinc
-Makefile.am usr/share/boinc-dev
diff --git a/debian/changelog b/debian/changelog
index b53095a..295272d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-boinc (7.0.28+dfsg-2) unstable; urgency=low
+boinc (7.0.28+dfsg-3) unstable; urgency=low
+
+ * Splitting -dev package into libboinc and libboinc-dev.
+
+ -- Steffen Moeller <moeller at debian.org> Mon, 28 May 2012 13:21:35 +0200
+
+boinc (7.0.28+dfsg-2) UNRELEASED; urgency=low
* Reactivating the screensaver (Steffen and Bernd)
- not ready, yet.
diff --git a/debian/control b/debian/control
index 4aa71bd..9858ac0 100644
--- a/debian/control
+++ b/debian/control
@@ -164,10 +164,22 @@ Description: GUI to control and monitor the BOINC core client
Package: boinc-dev
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev,
+Section: oldlibs
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}, libboinc-app-dev, libboinc-app
+Description: development files to build applications for BOINC projects
+ Dummy transitional package helping the transition of a split of
+ architecture-independent development files and the architecture-dependent
+ dynamic libraries. Static libraries are no longer redistributed.
+
+
+Package: libboinc-app-dev
+Section: libdevel
+Architecture: all
+Depends: ${misc:Depends}, libboinc-app, libc6-dev | libc-dev,
libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient-dev
+Conflicts: boinc-dev (<= 7.0.28+dfsg-2)
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
@@ -178,6 +190,20 @@ Description: development files to build applications for BOINC projects
infrastructure.
+Package: libboinc-app
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: boinc-dev (<= 7.0.28+dfsg-2)
+Description: libraries for BOINC's scientific applications
+ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+ software platform for distributed computing using volunteered computer
+ resources.
+ .
+ This package contains dynamic libraries that are needed for applications
+ which utilizes the BOINC infrastructure.
+
+
Package: boinc-server-maker
Architecture: any
Provides: boinc-server
diff --git a/debian/libboinc-app-dev.install b/debian/libboinc-app-dev.install
new file mode 100644
index 0000000..56ae47d
--- /dev/null
+++ b/debian/libboinc-app-dev.install
@@ -0,0 +1,8 @@
+usr/include/boinc
+
+# The two below are redundant but seem requested by sample code
+lib/*.h usr/include/boinc/lib
+api/*.h usr/include/boinc/api
+
+config.h usr/include/boinc
+Makefile.am usr/share/boinc-dev
diff --git a/debian/boinc-dev.links b/debian/libboinc-app-dev.links
similarity index 93%
rename from debian/boinc-dev.links
rename to debian/libboinc-app-dev.links
index 9af4979..0d19fa0 100644
--- a/debian/boinc-dev.links
+++ b/debian/libboinc-app-dev.links
@@ -1,3 +1,4 @@
+# This seems unfortunate, let us improve this over time
usr/include/BOINC/boinc_api.h usr/share/boinc-dev/api/boinc_api.h
usr/include/BOINC/gutil.h usr/share/boinc-dev/api/gutil.h
usr/include/BOINC/app_ipc.h usr/share/boinc-dev/lib/app_ipc.h
@@ -29,6 +30,4 @@ usr/include/BOINC/api/graphics_data.h usr/share/boinc-dev/api/graphics_data.h
usr/include/BOINC/api/reduce.h usr/share/boinc-dev/api/reduce.h
usr/include/BOINC/lib/md5_file.h usr/share/boinc-dev/lib/md5_file.h
-usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
-usr/lib/libboinc_api.a usr/share/boinc-dev/api/libboinc_api.a
usr/include/boinc usr/include/BOINC
diff --git a/debian/libboinc-app.install b/debian/libboinc-app.install
new file mode 100644
index 0000000..0d7dc31
--- /dev/null
+++ b/debian/libboinc-app.install
@@ -0,0 +1 @@
+usr/lib/lib*so* usr/lib
diff --git a/debian/libboinc-app.links b/debian/libboinc-app.links
new file mode 100644
index 0000000..a5312e0
--- /dev/null
+++ b/debian/libboinc-app.links
@@ -0,0 +1,3 @@
+# once we have the static libraries redistributed again, we should think about this
+#usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
+#usr/lib/libboinc_api.a usr/share/boinc-dev/api/libboinc_api.a
diff --git a/debian/boinc-dev.lintian-overrides b/debian/libboinc-app.lintian-overrides
similarity index 52%
rename from debian/boinc-dev.lintian-overrides
rename to debian/libboinc-app.lintian-overrides
index 3c75c93..d6bfc25 100644
--- a/debian/boinc-dev.lintian-overrides
+++ b/debian/libboinc-app.lintian-overrides
@@ -1,2 +1,2 @@
-boinc-dev binary: package-name-doesnt-match-sonames
+libboinc-app binary: package-name-doesnt-match-sonames
# Well, yes, and this is not supposed to change for a while
diff --git a/debian/patches/socklenBuildFixByDavid.patch b/debian/patches/socklenBuildFixByDavid.patch
index ad3b735..353d6cf 100644
--- a/debian/patches/socklenBuildFixByDavid.patch
+++ b/debian/patches/socklenBuildFixByDavid.patch
@@ -1,15 +1,16 @@
Index: boinc/lib/network.h
===================================================================
---- boinc.orig/lib/network.h 2012-04-01 20:19:44.977682134 +0200
-+++ boinc/lib/network.h 2012-05-28 12:29:18.855647468 +0200
+--- boinc.orig/lib/network.h 2012-05-28 12:30:21.326797803 +0200
++++ boinc/lib/network.h 2012-05-28 15:06:29.703775442 +0200
@@ -54,10 +54,7 @@
extern const char* socket_error_str();
extern void reset_dns();
-#if defined(_WIN32) && defined(USE_WINSOCK)
- typedef int BOINC_SOCKLEN_T;
+-typedef int BOINC_SOCKLEN_T;
-#endif
-
++#typedef int BOINC_SOCKLEN_T;
#if defined(_WIN32) && defined(USE_WINSOCK)
extern int WinsockInitialize();
extern int WinsockCleanup();
diff --git a/debian/rules b/debian/rules
index 1346347..c269cd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -239,7 +239,7 @@ override_dh_auto_clean:
rm -f lib/crypt_prog test/run notices/feeds.xml
find test -name "run-*" | xargs -r rm -rf
rm -f $(BINARIES)
- rm -fr debian/boinc-amd-opencl # for cases when this is not in debian/control
+ rm -fr debian/boinc-amd-opencl debian/boinc-screensaver # for cases when this is not in debian/control
rm -f \
lockfile \
doc/manpages/*.1 \
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list