[SCM] BOINC packaging branch, debian/experimental-6.4.5, updated. debian/6.2.18-2-8-ge952ef2

[rmayorga]

The following commit has been merged in the debian/experimental-6.4.5 branch:
commit e952ef2d6f70052838a1ec37fb59a1ac6ad355bf
Author: rmayorga <rmayorga at debian.org>
Date:   Sat Feb 21 11:59:35 2009 -0600

    Don't install catalog files manually.

diff --git a/debian/boinc-manager.install b/debian/boinc-manager.install
index 8432a14..f3db479 100644
--- a/debian/boinc-manager.install
+++ b/debian/boinc-manager.install
@@ -1,2 +1,3 @@
 debian/icons/boincmgr-*.xpm     usr/share/pixmaps
 debian/boinc-manager.desktop    usr/share/applications
+usr/share/locale/*
diff --git a/debian/changelog b/debian/changelog
index 496c7da..ac0ca6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ boinc (6.4.5-1) UNRELEASED; urgency=low
     + 003_use_sensible-browser.patch
     + 004_exclude_sea.patch removed
     + 101_check_RSA_returned_values.patch removed
-    + add 005_disable_client_res.patch added
+    + 005_disable_client_res.patch added
+    + 006_correct_catalog_path.patch added 
   * debian/boinc-dev.install; upstream now calls `boinc' instead
     of `BOINC' the include/ dir
   * debian/boinc-dev.links; make BOINC point to boinc, this
@@ -24,7 +25,11 @@ boinc (6.4.5-1) UNRELEASED; urgency=low
       client/install-sh, samples/glut/win32_util.c, 
       samples/glut/win32_x11.[ch], samples/glut/stroke.h,
       samples/glut/glut.h, samples/jpeglib/*
-    
+  * debian/rules:
+    + don't install .mo files manually
+    + correct .mo files perms
+  * debian/boinc-manager.install: usr/share/locale/* files added
+
  -- Rene Mayorga <rmayorga at debian.org>  Thu, 29 Jan 2009 13:44:11 -0600
 
 boinc (6.2.18-2) experimental; urgency=low
diff --git a/debian/patches/006_correct_catalog_path.patch b/debian/patches/006_correct_catalog_path.patch
new file mode 100644
index 0000000..c7327db
--- /dev/null
+++ b/debian/patches/006_correct_catalog_path.patch
@@ -0,0 +1,26 @@
+Author: René Mayorga
+Description: Upstream place .mo files just in share/locale, on Debian 
+ almost all .mo files are placed correctly under LC_MESSAGES
+--- boinc.orig/locale/client/Makefile.am
++++ boinc/locale/client/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.incl
+ 
+-datadir = $(prefix)/share/locale 
++datadir = $(prefix)/share/locale
+ 
+ locale_dirs = \
+         af_ZA \
+@@ -45,9 +45,9 @@
+ install-exec-hook:
+ 	mydir=$(DESTDIR)$(datadir) ;\
+ 	for ldir in $(locale_dirs) ; do \
+-	  $(INSTALL) -d $$mydir/$$ldir ; \
++	  $(INSTALL) -d $$mydir/$$ldir/LC_MESSAGES ; \
+ 	  if [ -f "$$ldir/BOINC Manager.mo" ] ; then \
+-	    $(INSTALL) "$$ldir/BOINC Manager.mo" "$$mydir/$$ldir/BOINC Manager.mo" ; \
++	    $(INSTALL) "$$ldir/BOINC Manager.mo" "$$mydir/$$ldir/LC_MESSAGES/BOINC Manager.mo" ; \
+ 	  fi ;\
+ 	done
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f88946f..d71cbb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 003_use_sensible-browser.patch 
 005_using_hyphen_as_minus.patch
 005_disable_client_res.patch
+006_correct_catalog_path.patch
diff --git a/debian/rules b/debian/rules
index 75e3166..756f018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,6 +166,7 @@ clean-patched:
 	  config.sub \
 	  client/scripts/Makefile \
 	  client/scripts/boinc-client \
+	  clientgui/res/Makefile \
 	  sea/Makefile
 	debconf-updatepo
 
@@ -185,12 +186,12 @@ install-stamp:
 	  debian/boinc-manager/usr/bin/boincmgr
 	
 	# Install binary message catalogs of the BOINC Manager.
-	for i in `ls locale/client`; do \
-	  if [ -f "locale/client/$$i/BOINC Manager.mo" ]; then \
-	    install -D -m644 "locale/client/$$i/BOINC Manager.mo" \
-	      "debian/boinc-manager/usr/share/locale/$$i/LC_MESSAGES/BOINC Manager.mo"; \
-	  fi; \
-	done;
+	#for i in `ls locale/client`; do \
+	#  if [ -f "locale/client/$$i/BOINC Manager.mo" ]; then \
+	#    install -D -m644 "locale/client/$$i/BOINC Manager.mo" \
+	#      "debian/boinc-manager/usr/share/locale/$$i/LC_MESSAGES/BOINC Manager.mo"; \
+	#  fi; \
+	#done;
 	
 	# The en_US po file is actually a po template, thus the corresponding
 	# "BOINC Manager.mo" is empty and useless.
@@ -203,6 +204,8 @@ install-stamp:
 	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
 	  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 "*.mo" -exec chmod 644   {} \;
 	dh install
 	dh_buildinfo
 	touch $@
diff --git a/version.h b/version.h
deleted file mode 100644
index 94acabc..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 4
-
-/* Release part of BOINC version number */
-#define BOINC_RELEASE 5
-
-/* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "6.4.5"
-
-/* 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.4.5"
-
-/* 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.4.5"
-
-#endif /* #if (defined(_WIN32) || defined(__APPLE__)) */
-
-#endif /* #ifndef BOINC_VERSION_H */
-

-- 
BOINC packaging