[boinc] 01/04: wrap-and-sort
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Wed Sep 24 09:09:54 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.22+dfsg-1
in repository boinc.
commit 41fb2e034a1083dc08ca81455537c638d142b6e8
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sun Sep 7 23:49:53 2014 +0200
wrap-and-sort
---
debian/boinc-app-examples.install | 3 -
debian/boinc-cgi-stripchart.install | 8 +--
debian/boinc-client.install | 4 +-
debian/boinc-manager.install | 2 +-
debian/boinc-server-maker.install | 10 +--
debian/control.in | 139 ++++++++++++++++++++++--------------
debian/libboinc-app7.install | 2 +-
7 files changed, 99 insertions(+), 69 deletions(-)
diff --git a/debian/boinc-app-examples.install b/debian/boinc-app-examples.install
index 1f0b135..508282f 100644
--- a/debian/boinc-app-examples.install
+++ b/debian/boinc-app-examples.install
@@ -1,11 +1,8 @@
# Candidate for a separate package
samples/wrapper/wrapper usr/lib/boinc-server-maker/apps
-#usr/libexec/examples/1sec usr/lib/boinc-server-maker/apps
apps/1sec usr/lib/boinc-server-maker/apps
-#usr/libexec/examples/concat usr/lib/boinc-server-maker/apps
apps/concat usr/lib/boinc-server-maker/apps
-#usr/libexec/examples/upper_case usr/lib/boinc-server-maker/apps
apps/upper_case usr/lib/boinc-server-maker/apps
# where should it go
samples/example_app/uc2 usr/lib/boinc-server-maker/apps
diff --git a/debian/boinc-cgi-stripchart.install b/debian/boinc-cgi-stripchart.install
index 6a2471a..7080b8a 100644
--- a/debian/boinc-cgi-stripchart.install
+++ b/debian/boinc-cgi-stripchart.install
@@ -1,4 +1,4 @@
-stripchart/stripchart usr/lib/cgi-bin
-stripchart/samples/datafiles usr/share/stripchart
-stripchart/stripchart.cgi usr/lib/cgi-bin
-stripchart/stripchart.cnf etc
+stripchart/samples/datafiles usr/share/stripchart
+stripchart/stripchart usr/lib/cgi-bin
+stripchart/stripchart.cgi usr/lib/cgi-bin
+stripchart/stripchart.cnf etc
diff --git a/debian/boinc-client.install b/debian/boinc-client.install
index c83ea72..6e87ebe 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/switcher usr/lib/boinc-client
-usr/bin/boinc usr/bin
-usr/bin/boinccmd usr/bin
usr/share/locale/*/BOINC-Client.mo
diff --git a/debian/boinc-manager.install b/debian/boinc-manager.install
index 1b4f5d8..9c549e0 100644
--- a/debian/boinc-manager.install
+++ b/debian/boinc-manager.install
@@ -1,5 +1,5 @@
+debian/boinc-manager.desktop usr/share/applications
debian/icons/hicolor usr/share/icons
debian/icons/pixmaps/boincmgr.xpm usr/share/pixmaps
-debian/boinc-manager.desktop usr/share/applications
usr/bin/boincmgr
usr/share/locale/*/BOINC-Manager.mo
diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 88aa042..178d15b 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -1,7 +1,7 @@
-usr/share/boinc-server-maker
+debian/fetch_example_applications.sh usr/share/boinc-server-maker
+debian/get_latest_windows_wrappers.sh usr/share/boinc-server-maker
+py/Boinc/*.py usr/share/boinc-server-maker/py/Boinc
+sched/boinc_path_config.py usr/share/boinc-server-maker/py/Boinc
usr/lib/boinc-server-maker
usr/lib/python2.7
-sched/boinc_path_config.py usr/share/boinc-server-maker/py/Boinc
-py/Boinc/*.py usr/share/boinc-server-maker/py/Boinc
-debian/fetch_example_applications.sh usr/share/boinc-server-maker
-debian/get_latest_windows_wrappers.sh usr/share/boinc-server-maker
+usr/share/boinc-server-maker
diff --git a/debian/control.in b/debian/control.in
index f2b8794..0d8c00c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,27 +2,50 @@ Source: boinc
Section: net
Priority: optional
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
-Uploaders: Steffen Moeller <moeller at debian.org>,
- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>,
- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Uploaders: Steffen Moeller <moeller at debian.org>,
+ Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>,
+ Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), dh-autoreconf, po-debconf, pkg-config,
- dpkg-dev (>= 1.16.1.1),
- libtool, autoconf, autotools-dev, automake, gettext,
- docbook2x, docbook-xml, libxml2-utils,
- zlib1g-dev, libssl-dev, libcurl4-openssl-dev,
- libsm-dev, libice-dev, libxmu-dev, libxi-dev, libnotify-dev (>= 0.7.0),
- freeglut3-dev, libwxgtk3.0-dev, libwxgtk-webview3.0-dev, libgtk2.0-dev,
- libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
- libxcb-util0-dev
+Build-Depends: autoconf,
+ automake,
+ autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ docbook-xml,
+ docbook2x,
+ dpkg-dev (>= 1.16.1.1),
+ freeglut3-dev,
+ gettext,
+ libcurl4-openssl-dev,
+ libfcgi-dev,
+ libgtk2.0-dev,
+ libice-dev,
+ libjpeg-dev,
+ libmysqlclient-dev,
+ libnotify-dev (>= 0.7.0),
+ libsm-dev,
+ libsqlite3-dev,
+ libssl-dev,
+ libtool,
+ libwxgtk-webview3.0-dev,
+ libwxgtk3.0-dev,
+ libxcb-util0-dev,
+ libxi-dev,
+ libxml2-utils,
+ libxmu-dev,
+ pkg-config,
+ po-debconf,
+ python,
+ zlib1g-dev
Homepage: http://boinc.berkeley.edu/
Vcs-Git: git://anonscm.debian.org/pkg-boinc/boinc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-boinc/boinc.git
Package: boinc
@Architecture: all
- at Depends: ${misc:Depends},
-@ boinc-client (>= ${source:Version}), boinc-manager (>= ${source:Version})
+ at Depends: boinc-client (>= ${source:Version}),
+@ boinc-manager (>= ${source:Version}),
+@ ${misc:Depends}
@Description: metapackage for the BOINC client and the manager
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing: several initiatives of
@@ -41,7 +64,8 @@ Package: boinc
@Section: contrib/net
@Priority: extra
@Depends: ${misc:Depends}
- at Recommends: libcuda1 | libcuda-5.0-1 | libcuda-5.5-1 | nvidia-173 | nvidia-current | nvidia-current-updates | nvidia-304 | nvidia-304-updates | nvidia-310 | nvidia-310-updates | nvidia-313-updates | nvidia-319 | nvidia-319-updates | nvidia-331 | nvidia-331-updates | libcuda1-304 | libcuda1-304-updates | libcuda1-331 | libcuda1-331-updates, libcudart4 | libcudart5.0 | libcudart5.5
+ at Recommends: libcuda1 | libcuda-5.0-1 | libcuda-5.5-1 | nvidia-173 | nvidia-current | nvidia-current-updates | nvidia-304 | nvidia-304-updates | nvidia-310 | nvidia-310-updates | nvidia-313-updates | nvidia-319 | nvidia-319-updates | nvidia-331 | nvidia-331-updates | libcuda1-304 | libcuda1-304-updates | libcuda1-331 | libcuda1-331-updates,
+@ libcudart4 | libcudart5.0 | libcudart5.5
@Description: metapackage for CUDA-savvy BOINC client and manager
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing: several initiatives of
@@ -61,7 +85,7 @@ Package: boinc
@Section: contrib/net
@Priority: extra
@Depends: ${misc:Depends}
- at Recommends: fglrx-driver, amd-libopencl1 | fglrx | fglrx-updates
+ at Recommends: amd-libopencl1 | fglrx | fglrx-updates, fglrx-driver
@Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing: several initiatives of
@@ -83,12 +107,13 @@ Package: boinc
@
@Package: boinc-client
@Architecture: any
- at Depends: ${shlibs:Depends}, ${misc:Depends},
-@ libboinc7 (>= ${source:Version}),
-@ ${python:Depends},
-@ adduser,
-@ ca-certificates
- at Suggests: boinc-manager, boinc-amd-opencl, boinc-nvidia-cuda, x11-xserver-utils
+ at Depends: adduser,
+@ ca-certificates,
+@ libboinc7 (>= ${source:Version}),
+@ ${misc:Depends},
+@ ${python:Depends},
+@ ${shlibs:Depends}
+ at Suggests: boinc-amd-opencl, boinc-manager, boinc-nvidia-cuda, x11-xserver-utils
@Description: core client for the BOINC distributed computing infrastructure
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing: several initiatives of
@@ -107,7 +132,7 @@ Package: boinc
#Package: boinc-screensaver
#Section: x11
#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, boinc-client
+#Depends: boinc-client, ${misc:Depends}, ${shlibs:Depends}
#Suggests: boinc-manager
#Description: screen saver auto-controlling volunteer computing
# The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@ -137,7 +162,7 @@ Package: boinc
@Package: boinc-manager
@Section: x11
@Architecture: any
- at Depends: ${shlibs:Depends}, ${misc:Depends}, boinc-client
+ at Depends: boinc-client, ${misc:Depends}, ${shlibs:Depends}
@Suggests: libgl1-mesa-glx, libxt6
@Description: GUI to control and monitor the BOINC core client
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@ -164,7 +189,7 @@ Package: boinc
@Section: oldlibs
@Architecture: all
@Priority: extra
- at Depends: ${misc:Depends}, libboinc-app-dev (= ${source:Version})
+ at Depends: libboinc-app-dev (= ${source: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
@@ -173,13 +198,15 @@ Package: boinc
@Package: libboinc-app-dev
@Section: libdevel
@Architecture: all
- at Depends: ${misc:Depends},
-@ libboinc7 (>= ${source:Version}),
-@ libboinc7 (<< ${source:Version}+1~),
-@ libboinc-app7 (>= ${source:Version}),
-@ libboinc-app7 (<< ${source:Version}+1~),
-@ libc6-dev | libc-dev,
-@ libstdc++6-4.7-dev | libstdc++-4.8-dev | libstdc++-4.9-dev, libssl-dev, libmysqlclient-dev
+ at Depends: libboinc-app7 (<< ${source:Version}+1~),
+@ libboinc-app7 (>= ${source:Version}),
+@ libboinc7 (<< ${source:Version}+1~),
+@ libboinc7 (>= ${source:Version}),
+@ libc6-dev | libc-dev,
+@ libmysqlclient-dev,
+@ libssl-dev,
+@ libstdc++6-4.7-dev | libstdc++-4.8-dev | libstdc++-4.9-dev,
+@ ${misc:Depends}
@Breaks: boinc-dev (<< ${source:Version})
@Replaces: boinc-dev (<< ${source:Version})
@Description: development files to build applications for BOINC projects
@@ -192,13 +219,11 @@ Package: boinc
@
@Package: libboinc-app7
@Provides: libboinc-app
- at Breaks: libboinc-app (<= 7.0.34+dfsg-1),
-@ boinc-dev (<< 7.0.28+dfsg-3)
- at Replaces: libboinc-app (<= 7.0.34+dfsg-1),
-@ boinc-dev (<< 7.0.28+dfsg-3)
+ at Breaks: boinc-dev (<< 7.0.28+dfsg-3), libboinc-app (<= 7.0.34+dfsg-1)
+ at Replaces: boinc-dev (<< 7.0.28+dfsg-3), libboinc-app (<= 7.0.34+dfsg-1)
@Section: libs
@Architecture: any
- at Depends: ${shlibs:Depends}, ${misc:Depends}
+ at Depends: ${misc:Depends}, ${shlibs:Depends}
@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
@@ -209,13 +234,11 @@ Package: boinc
@
@Package: libboinc7
@Provides: libboinc
- at Breaks: libboinc (<= 7.0.34+dfsg-1),
-@ boinc-dev (<< 7.0.28+dfsg-3)
- at Replaces: libboinc (<= 7.0.34+dfsg-1),
-@ boinc-dev (<< 7.0.28+dfsg-3)
+ at Breaks: boinc-dev (<< 7.0.28+dfsg-3), libboinc (<= 7.0.34+dfsg-1)
+ at Replaces: boinc-dev (<< 7.0.28+dfsg-3), libboinc (<= 7.0.34+dfsg-1)
@Architecture: any
@Section: libs
- at Depends: ${shlibs:Depends}, ${misc:Depends}
+ at Depends: ${misc:Depends}, ${shlibs:Depends}
@Description: libraries of BOINC the client depends on
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing using volunteered computer
@@ -230,12 +253,22 @@ Package: boinc
%Package: boinc-server-maker
%Architecture: any
%Provides: boinc-server
-%Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends},
-% python, python-mysqldb,
-% mysql-server-5.5 | virtual-mysql-server, apache2 | httpd-cgi,
-% php5, php5-cli, php5-mysql,
-% tcsh, openssl, adduser, libfcgi0ldbl
-%Recommends: libapache2-mod-php5, php5-gd, uuid-runtime, apache2-utils
+%Depends: adduser,
+% apache2 | httpd-cgi,
+% libfcgi0ldbl,
+% mysql-server-5.5 | virtual-mysql-server,
+% openssl,
+% php5,
+% php5-cli,
+% php5-mysql,
+% python,
+% python-mysqldb,
+% tcsh,
+% ${misc:Depends},
+% ${perl:Depends},
+% ${python:Depends},
+% ${shlibs:Depends}
+%Recommends: apache2-utils, libapache2-mod-php5, php5-gd, uuid-runtime
%Suggests: boinc-app-examples, boinc-cgi-stripchart
%Description: BOINC server applications and data files
% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@ -250,7 +283,7 @@ Package: boinc
%
%Package: boinc-app-examples
%Architecture: any
-%Depends: ${shlibs:Depends}, ${misc:Depends}
+%Depends: ${misc:Depends}, ${shlibs:Depends}
%Recommends: boinc-server-maker
%Description: example binaries for BOINC servers
% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@ -274,9 +307,9 @@ Package: boinc
@Priority: extra
@Architecture: any
@Depends: boinc-client (>= ${source:Version}) | boinc-manager (>= ${source:Version}) | libboinc7 (= ${source:Version}) | libboinc-app7 (= ${source:Version}),
-@ ${misc:Depends}
+@ ${misc:Depends}
@Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk3.0-0-dbg,
-% boinc-server-dbg
+% boinc-server-dbg
@Description: debugging symbols for BOINC binaries
@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@ software platform for distributed computing using volunteered computer
@@ -293,7 +326,7 @@ Package: boinc
%Priority: extra
%Architecture: any
%Depends: boinc-client (>= ${source:Version}) | boinc-manager (>= ${source:Version}) | libboinc7 (>= ${source:Version}) | libboinc-app7 (>= ${source:Version}),
-% ${misc:Depends}
+% ${misc:Depends}
%Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk3.0-0-dbg
%Description: debugging symbols for BOINC server binaries
% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@ -309,7 +342,7 @@ Package: boinc
%Section: libs
%Priority: extra
%Architecture: all
-%Depends: ${misc:Depends}, gnuplot-nox, ${perl:Depends},
+%Depends: gnuplot-nox, ${misc:Depends}, ${perl:Depends}
%Recommends: apache2 | httpd-cgi
%Description: CGI script for plotting basic statistical graphs
% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
diff --git a/debian/libboinc-app7.install b/debian/libboinc-app7.install
index 8de5be8..dc8ec76 100644
--- a/debian/libboinc-app7.install
+++ b/debian/libboinc-app7.install
@@ -1,3 +1,3 @@
-usr/lib/libboinc_graphics*.so.* usr/lib
usr/lib/libboinc_api*.so.* usr/lib
+usr/lib/libboinc_graphics*.so.* usr/lib
usr/lib/libboinc_opencl*.so.* usr/lib
--
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