r714 - in /branches/experimental/boinc/debian: ./ manpages/ patches/

fst-guest at users.alioth.debian.org fst-guest at users.alioth.debian.org
Sun Oct 7 12:51:46 UTC 2007 

Author: fst-guest
Date: Sun Oct  7 12:51:45 2007
New Revision: 714

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=714
Log:
* Removed the man pages for boinc_client, boinc_cmd, and boincmgr from the
  Debian-diff because they are now included in the upstream source and also
  handled by upstream's makefiles.
* Updated two patches for the new upstream version.


Removed:
    branches/experimental/boinc/debian/manpages/boinc_client.xml
    branches/experimental/boinc/debian/manpages/boinc_cmd.xml
    branches/experimental/boinc/debian/manpages/boincmgr.xml
Modified:
    branches/experimental/boinc/debian/boinc-client.manpages
    branches/experimental/boinc/debian/boinc-manager.manpages
    branches/experimental/boinc/debian/changelog
    branches/experimental/boinc/debian/patches/002_remove_hardcoded_optimization.patch
    branches/experimental/boinc/debian/patches/005_sched_makefile.am.patch
    branches/experimental/boinc/debian/rules

Modified: branches/experimental/boinc/debian/boinc-client.manpages
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.manpages?rev=714&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.manpages (original)
+++ branches/experimental/boinc/debian/boinc-client.manpages Sun Oct  7 12:51:45 2007
@@ -1,3 +1,3 @@
-boinc_client.1
-boinc_cmd.1
+doc/manpages/boinc_client.1
+doc/manpages/boinc_cmd.1
 update-boinc-applinks.1

Modified: branches/experimental/boinc/debian/boinc-manager.manpages
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-manager.manpages?rev=714&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-manager.manpages (original)
+++ branches/experimental/boinc/debian/boinc-manager.manpages Sun Oct  7 12:51:45 2007
@@ -1,1 +1,1 @@
-boincmgr.1
+doc/manpages/boincmgr.1

Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=714&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Sun Oct  7 12:51:45 2007
@@ -8,6 +8,9 @@
     - Don't clean lib/boinccmd and *.unmodified files by hand in the
       clean-patched target, since they are now removed by upstream's
       makefiles on "make clean".
+  * Removed the man pages for boinc_client, boinc_cmd, and boincmgr from the
+    Debian-diff because they are now included in the upstream source and also
+    handled by upstream's makefiles.
 
   +++ Changes unsuitable for the trunk branch:
 
@@ -31,7 +34,7 @@
     - Don't fix PHP shebang and execute permissions of files in html/ops/
       since these were fixed upstream.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 04 Oct 2007 12:16:13 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun, 07 Oct 2007 14:46:53 +0200
 
 boinc (5.10.8-3) unstable; urgency=low
 

Modified: branches/experimental/boinc/debian/patches/002_remove_hardcoded_optimization.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/002_remove_hardcoded_optimization.patch?rev=714&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/002_remove_hardcoded_optimization.patch (original)
+++ branches/experimental/boinc/debian/patches/002_remove_hardcoded_optimization.patch Sun Oct  7 12:51:45 2007
@@ -1,11 +1,11 @@
-Index: boinc-5.10.8/client/Makefile.am
+Index: boinc-6.1.0/client/Makefile.am
 ===================================================================
---- boinc-5.10.8.orig/client/Makefile.am	2007-06-26 08:57:25.000000000 +0200
-+++ boinc-5.10.8/client/Makefile.am	2007-06-26 08:57:32.000000000 +0200
+--- boinc-6.1.0.orig/client/Makefile.am
++++ boinc-6.1.0/client/Makefile.am
 @@ -61,7 +61,7 @@
      work_fetch.C
  
- boinc_client_DEPENDENCIES = $(LIBRSA)
+ boinc_client_DEPENDENCIES =
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
 +boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
  boinc_client_LDFLAGS = -static-libgcc

Modified: branches/experimental/boinc/debian/patches/005_sched_makefile.am.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/005_sched_makefile.am.patch?rev=714&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/005_sched_makefile.am.patch (original)
+++ branches/experimental/boinc/debian/patches/005_sched_makefile.am.patch Sun Oct  7 12:51:45 2007
@@ -1,14 +1,14 @@
-Index: boinc-5.8.15/sched/Makefile.am
+Index: boinc-6.1.0/sched/Makefile.am
 ===================================================================
---- boinc-5.8.15.orig/sched/Makefile.am	2007-03-16 18:07:19.000000000 +0100
-+++ boinc-5.8.15/sched/Makefile.am	2007-03-16 18:08:15.000000000 +0100
+--- boinc-6.1.0.orig/sched/Makefile.am
++++ boinc-6.1.0/sched/Makefile.am
 @@ -2,7 +2,8 @@
  
  include $(top_srcdir)/Makefile.incl
  
--noinst_PROGRAMS =                               \
+-noinst_PROGRAMS = \
 +scheddir=$(libdir)/BOINC/sched
-+sched_PROGRAMS =                                \
-     cgi                                         \
-     feeder                                      \
-     db_dump                                     \
++sched_PROGRAMS = \
+     census \
+     cgi \
+     db_dump \

Modified: branches/experimental/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/rules?rev=714&op=diff
==============================================================================
--- branches/experimental/boinc/debian/rules (original)
+++ branches/experimental/boinc/debian/rules Sun Oct  7 12:51:45 2007
@@ -98,9 +98,6 @@
 	cp -f /usr/share/misc/config.sub config.sub
 	aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
 	
-	docbook2x-man debian/manpages/boinc_client.xml
-	docbook2x-man debian/manpages/boinc_cmd.xml
-	docbook2x-man debian/manpages/boincmgr.xml
 	docbook2x-man debian/manpages/update-boinc-applinks.xml
 	touch $@
 
@@ -130,11 +127,7 @@
 	
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
-	dh_clean \
-	  boinc_client.1 \
-	  boinc_cmd.1 \
-	  boincmgr.1 \
-	  update-boinc-applinks.1
+	dh_clean update-boinc-applinks.1
 	
 	dh_clean \
 	  api/Makefile.in \

More information about the pkg-boinc-commits mailing list