[SCM] BOINC packaging branch, master, updated. debian/6.4.5+dfsg-3-11-gf87328e

[rmayorga]

The following commit has been merged in the master branch:
commit ae1f08063b344bb50ca83df5517b5ff239481911
Author: rmayorga <rmayorga at debian.org>
Date:   Tue Nov 3 23:20:48 2009 -0600

    update debian/copyright, refresh patches, delete windows binary`

diff --git a/clientscr/progress/win/x64/boincscr.exe b/clientscr/progress/win/x64/boincscr.exe
deleted file mode 100644
index b2357e2..0000000
Binary files a/clientscr/progress/win/x64/boincscr.exe and /dev/null differ
diff --git a/clientscr/progress/win/x86/boincscr.exe b/clientscr/progress/win/x86/boincscr.exe
deleted file mode 100644
index 3bd9de6..0000000
Binary files a/clientscr/progress/win/x86/boincscr.exe and /dev/null differ
diff --git a/debian/copyright b/debian/copyright
index 8e1d102..143bfef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,7 +28,7 @@ License: other
   suitability of this software for any purpose.  It is provided "as is"
   without express or implied warranty.
 
-Files: api/texfont.[ch], samples/glut/glutbitmap.h
+Files: api/texfont.[cpp|h], samples/glut/glutbitmap.h
 Copyright: © 1997 Mark J. Kilgard
 License: other
  This program is freely distributable without licensing fees and is
diff --git a/debian/patches/006_correct_catalog_path.patch b/debian/patches/006_correct_catalog_path.patch
index 7885bf8..248b4a0 100644
--- a/debian/patches/006_correct_catalog_path.patch
+++ b/debian/patches/006_correct_catalog_path.patch
@@ -20,7 +20,7 @@ Description: Upstream place .mo files just in share/locale, on Debian
 +	  $(INSTALL) -d $$mydir/$$ldir/LC_MESSAGES ; \
  	  if [ -f $$ldir/BOINC-Manager.po ] ; then \
 -	    $(INSTALL) $$ldir/BOINC-Manager.po $$mydir/$$ldir/BOINC-Manager.po ; \
-+	    $(INSTALL) "$$ldir/BOINC-Manager.po" "$$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.po" ; \
++	    $(INSTALL) "$$ldir/BOINC-Manager.mo" "$$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo" ; \
  	  fi ;\
  	done
  
diff --git a/debian/rules b/debian/rules
index 744cdf0..260bc1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,10 +137,11 @@ build-stamp: autoreconf-stamp build-boinc-client-stamp
 	$(MAKE)
 	docbook2x-man debian/manpages/update-boinc-applinks.xml
 	# Generate binary message catalogs of the BOINC Manager.
+# NEEDs TODO
 	for i in `ls locale/client`; do \
-	  if [ -f "locale/client/$$i/BOINC Manager.po" ]; then \
-	    msgfmt -o "locale/client/$$i/BOINC Manager.mo" \
-	      "locale/client/$$i/BOINC Manager.po"; \
+	  if [ -f "locale/client/$$i/BOINC-Manager.po" ]; then \
+	    msgfmt -o "locale/client/$$i/BOINC-Manager.mo" \
+	      "locale/client/$$i/BOINC-Manager.po"; \
 	  fi; \
 	done;
 	touch $@
@@ -172,6 +173,7 @@ clean-patched:
 	  api/libboinc_api.a \
 	  api/libboinc_graphics2.a \
 	  lib/libboinc.a \
+	  client/boinc \
 	  packages/solaris/CSW/boincclient/pkginfo \
 	  packages/solaris/CSW/boincclient/prototype \
 	  packages/solaris/CSW/boincdevel/pkginfo \
@@ -179,7 +181,13 @@ clean-patched:
 	  packages/solaris/CSW/boinclibs/pkginfo \
 	  packages/solaris/CSW/boinclibs/prototype \
 	  packages/solaris/CSW/boincmanager/pkginfo \
-	  packages/solaris/CSW/boincmanager/prototype
+	  packages/solaris/CSW/boincmanager/prototype \
+	  packages/solaris/CSW/Makefile \
+	  packages/generic/sea/Makefile \
+	  packages/solaris/CSW/boincclient/Makefile \
+	  packages/solaris/CSW/boincdevel/Makefile \
+	  packages/solaris/CSW/boinclibs/Makefile \
+	  packages/solaris/CSW/boincmanager/Makefile
 	debconf-updatepo
 
 install: build install-stamp
@@ -207,7 +215,7 @@ install-stamp:
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
 	# Correct catalog file perms
-	find ./ -name "*.po" -exec chmod 644   {} \;
+	find ./ -name "*.mo" -exec chmod 644   {} \;
 	# delete empty dirs
 	find debian/boinc-manager/usr/share/locale -type d -empty -delete
 	dh install
diff --git a/version.h b/version.h
deleted file mode 100644
index b118e1b..0000000
--- a/version.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Platform independent version definitions... */
-
-#ifndef BOINC_VERSION_H
-#define BOINC_VERSION_H
-
-/* Major part of BOINC version number */
-#define BOINC_MAJOR_VERSION 6
-
-/* Minor part of BOINC version number */
-#define BOINC_MINOR_VERSION 10
-
-/* Release part of BOINC version number */
-#define BOINC_RELEASE 17
-
-/* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "6.10.17"
-
-/* Package is a pre-release (Alpha/Beta) package */
-/* #define BOINC_PRERELEASE 1 */
-
-#if (defined(_WIN32) || defined(__APPLE__))
-/* Name of package */
-#define PACKAGE "boinc"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "BOINC"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "BOINC 6.10.17"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "boinc"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "6.10.17"
-
-#endif /* #if (defined(_WIN32) || defined(__APPLE__)) */
-
-#endif /* #ifndef BOINC_VERSION_H */
-

-- 
BOINC packaging