tags 457738 + patch
thanks

The attached patch for debian/rules allows asclock to be built for all supported
languages *after* you patched all xpms (c.f. #285475) in languages/*. To do so,
the variable DEB_LANG_OPTIONS has to be set to the desired language before
building. Please note that no error checking is done currently wether the 
language actually exists.

I suggest the following debian/changelog entry:

asclock (2.0.12-8.3) unstable; urgency=low

  * Enable language selection at build time
  * Fix typo in debian/rules

 -- Helge Kreutzmann <[EMAIL PROTECTED]>  Tue, 08 Jan 2008 11:37:44 +0100

and the following addition to README.Debian:
Upstream supports several languages. If you like to asclock to use a
language different from English you will have to set the environment
variable DEB_LANG_OPTIONS to one of
german portuguese dutch norwegian italian swedish spanish hungarian
breton french czech russian ukrainian slovene indonesian danish
hebrew japanese
and rebuild asclock

Helge Kreutzmann <[EMAIL PROTECTED]>, Tue, 8 Feb 2008 12:05:00 -0200

Instead of README.Debian it might be more sensible to put it in NEWS.Debian.

The next thing I'll work on is to get rid of the compile time dependency 
but rather determine the language at runtime and chose the appropriate
xpm then.

Please let me know if that route is acceptable to you and upstream.

-- 
      Dr. Helge Kreutzmann                     [EMAIL PROTECTED]
           Dipl.-Phys.                   http://www.helgefjell.de/debian.php
        64bit GNU powered                     gpg signed mail preferred
           Help keep free software "libre": http://www.ffii.de/
--- debian/rules.ursp	2007-12-25 09:29:33.000000000 +0100
+++ debian/rules	2008-01-08 12:46:39.000000000 +0100
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# this is a -*- Makefile -*-, beleive it or not
+# this is a -*- Makefile -*-, believe it or not
 # Based on sample debhelper debian/rules. GNU copyright 1997 by Joey Hess.
 # GNU copyright 1998-2001 Marcelo Magallon
 
@@ -14,10 +14,32 @@
 CDEBUGFLAGS += -g
 endif
 
+ifneq ("",$(DEB_LANG_OPTIONS))
+    DEBLANG = $(DEB_LANG_OPTIONS)
+else
+    DEBLANG = english
+endif
+
 build: build-stamp
 build-stamp:
 	dh_testdir
-	( echo classic ; echo ) | ./configure
+#( echo classic ; echo ) | ./configure
+# Choose classic theme
+	rm -rf default_theme
+	mkdir default_theme
+	ln -s ../themes/classic/config     default_theme/config
+	ln -s ../themes/classic/date.xpm   default_theme/date.xpm
+	ln -s ../themes/classic/clock.xpm  default_theme/clock.xpm
+	ln -s ../themes/classic/led.xpm    default_theme/led.xpm
+	ln -s ../themes/classic/hour.xpm   default_theme/hour.xpm
+	ln -s ../themes/classic/minute.xpm default_theme/minute.xpm
+	ln -s ../themes/classic/second.xpm default_theme/second.xpm
+	ln -s ../themes/classic/beats.xpm  default_theme/beats.xpm
+	ln -s ../languages/$(DEBLANG)/month.xpm ./default_theme/month.xpm
+	ln -s ../languages/$(DEBLANG)/weekday.xpm ./default_theme/weekday.xpm
+	echo $(DEBLANG) has been chosen!
+	xmkmf
+	make clean
 	make CDEBUGFLAGS="$(CDEBUGFLAGS)"
 	touch build-stamp
 
@@ -38,6 +60,8 @@
 	( cd themes && tar cf - $$(find \( -name CVS -o -name themes \) -prune -o \! -type d -print) ) | ( cd debian/asclock-themes/usr/share/asclock && tar xf - )
 # The upstream tarball contains some cruft.
 	find debian/asclock-themes/usr/share/asclock -type f -name classic | xargs rm
+	# Now the proper language files
+	( for i in $$(cd languages/$(DEBLANG); ls *.xpm); do find debian/asclock-themes/usr/share/asclock -name $$i -exec cp -pf languages/$(DEBLANG)/$$i "{}" ";"; done )
 	dh_installdocs
 	dh_installchangelogs
 	dh_strip

Attachment: signature.asc
Description: Digital signature

Reply via email to