[boinc] 01/02: Another upload, fixing lintian errors

[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 7f5b60e7baaced7497c52f3f069dd3fa8a1819ea
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jul 18 10:55:21 2014 +0200

    Another upload, fixing lintian errors
---
 debian/changelog  |  9 +++++++++
 debian/control.in | 24 ++++++++++++------------
 debian/rules      |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e749d61..88b7b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+boinc (7.4.8+dfsg-3) unstable; urgency=medium
+
+  * Upload to unstable.
+  * Reverting some control.in changes to let the package
+    be NMUable.
+  * Remove a .o file from server-maker package
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 18 Jul 2014 10:54:49 +0200
+
 boinc (7.4.8+dfsg-2exp1) experimental; urgency=medium
 
   * Upload to experimental.
diff --git a/debian/control.in b/debian/control.in
index 11d7e5a..80c0f2f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,7 +23,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-boinc/boinc.git
 Package: boinc
 @Architecture: all
 @Depends: ${misc:Depends},
-@ boinc-client (= ${source:Version}), boinc-manager (= ${source:Version})
+@ boinc-client (>= ${source:Version}), boinc-manager (>= ${source:Version})
 @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
@@ -85,7 +85,7 @@ Package: boinc
 @Package: boinc-client
 @Architecture: any
 @Depends: ${shlibs:Depends}, ${misc:Depends},
-@ libboinc7 (= ${source:Version}),
+@ libboinc7 (>= ${source:Version}),
 @ ${python:Depends},
 @ adduser,
 @ ca-certificates
@@ -194,10 +194,10 @@ Package: boinc
 @
 @Package: libboinc-app7
 @Provides: libboinc-app
- at Breaks: libboinc-app (<< ${source:Version}),
-@ boinc-dev (<< ${source:Version})
- at Replaces: libboinc-app (<< ${source:Version}),
-@ boinc-dev (<< ${source:Version})
+ 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)
 @Section: libs
 @Architecture: any
 @Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -211,10 +211,10 @@ Package: boinc
 @
 @Package: libboinc7
 @Provides: libboinc
- at Breaks: libboinc (<< ${source:Version}),
-@ boinc-dev (<< ${source:Version})
- at Replaces: libboinc (<< ${source:Version}),
-@ boinc-dev (<< ${source:Version})
+ 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)
 @Architecture: any
 @Section: libs
 @Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -275,7 +275,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 (>= ${source:Version}) | boinc-manager (>= ${source:Version}) | libboinc7 (= ${source:Version}) | libboinc-app7 (= ${source:Version}),
 @ ${misc:Depends}
 @Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk3.0-0-dbg,
 % boinc-server-dbg
@@ -294,7 +294,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-client (>= ${source:Version}) | boinc-manager (>= ${source:Version}) | libboinc7 (>= ${source:Version}) | libboinc-app7 (>= ${source: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/rules b/debian/rules
index 62fa3ca..1860a67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -387,6 +387,7 @@ ifeq (,$(ENABLE_SERVER_TEST))
 	echo "I: Installing example scientific applications"
 	mkdir -p $(CURDIR)/debian/tmp/samples
 	cp $(SAMPLES) $(CURDIR)/debian/tmp/samples || echo "W: Could not install samples ($(SAMPLES))"
+	rm -f debian/tmp/usr/share/doc/boinc-server-maker/examples/wrapper/regexp_memory.o
 endif
 	for i in $(CURDIR)/debian/*/usr/bin ; \
 	do \

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