diff options
| author | James A. Treacy <treacy> | 2000-01-12 15:51:16 +0000 |
|---|---|---|
| committer | James A. Treacy <treacy> | 2000-01-12 15:51:16 +0000 |
| commit | 6a4aa8f2e924fbd6b3d0796eea7a5be28e0b2ae5 (patch) | |
| tree | e6644fa244b1e19a477354cb739d935eb8943078 | |
| parent | b1c3060e9246fa0c98cc5ab02fff74bfd2575b1a (diff) | |
more year end cleanups
CVS version numbers
arabic/Make.lang: 1.1 -> 1.2
arabic/index.wml: 1.5 -> 1.6
chinese/Make.lang: 1.11 -> 1.12
chinese/index.wml: 1.24 -> 1.25
chinese/News/Makefile: 1.2 -> 1.3
chinese/News/index.wml: 1.3 -> 1.4
croatian/Make.lang: 1.2 -> 1.3
croatian/index.wml: 1.17 -> 1.18
croatian/News/Makefile: 1.5 -> 1.6
croatian/News/index.wml: 1.6 -> 1.7
croatian/security/Makefile: 1.5 -> 1.6
danish/Make.lang: 1.2 -> 1.3
danish/index.wml: 1.2 -> 1.3
english/index.wml: 1.49 -> 1.50
english/News/Makefile: 1.14 -> 1.15
english/News/index.wml: 1.9 -> 1.10
english/security/Makefile: 1.22 -> 1.23
esperanto/Make.lang: 1.1 -> 1.2
esperanto/index.wml: 1.8 -> 1.9
esperanto/News/Makefile: 1.1 -> 1.2
esperanto/News/index.wml: 1.1 -> 1.2
finnish/Make.lang: 1.1 -> 1.2
finnish/index.wml: 1.7 -> 1.8
finnish/News/Makefile: 1.1 -> 1.2
finnish/News/index.wml: 1.1 -> 1.2
finnish/security/Makefile: 1.3 -> 1.4
french/Make.lang: 1.3 -> 1.4
french/index.wml: 1.18 -> 1.19
french/News/Makefile: 1.4 -> 1.5
french/News/index.wml: 1.1 -> 1.2
french/security/Makefile: 1.4 -> 1.5
german/Make.lang: 1.4 -> 1.5
german/index.wml: 1.12 -> 1.13
german/News/Makefile: 1.6 -> 1.7
german/News/index.wml: 1.5 -> 1.6
german/security/Makefile: 1.4 -> 1.5
hungarian/Make.lang: 1.1 -> 1.2
hungarian/index.wml: 1.4 -> 1.5
italian/Make.lang: 1.3 -> 1.4
italian/index.wml: 1.10 -> 1.11
italian/News/Makefile: 1.4 -> 1.5
italian/security/Makefile: 1.8 -> 1.9
japanese/Make.lang: 1.9 -> 1.10
japanese/index.wml: 1.22 -> 1.23
japanese/News/Makefile: 1.7 -> 1.8
japanese/News/index.wml: 1.10 -> 1.11
japanese/security/Makefile: 1.4 -> 1.5
korean/Make.lang: 1.1 -> 1.2
korean/index.wml: 1.11 -> 1.12
korean/News/Makefile: 1.1 -> 1.2
korean/News/index.wml: 1.1 -> 1.2
korean/security/Makefile: 1.3 -> 1.4
norwegian/Make.lang: 1.1 -> 1.2
norwegian/News/Makefile: 1.1 -> 1.2
norwegian/News/index.wml: 1.1 -> 1.2
norwegian/security/Makefile: 1.3 -> 1.4
polish/Make.lang: 1.3 -> 1.4
polish/index.wml: 1.5 -> 1.6
portuguese/Make.lang: 1.1 -> 1.2
portuguese/index.wml: 1.2 -> 1.3
romanian/Make.lang: 1.1 -> 1.2
romanian/index.wml: 1.3 -> 1.4
romanian/News/Makefile: 1.1 -> 1.2
romanian/News/index.wml: 1.2 -> 1.3
romanian/security/Makefile: 1.2 -> 1.3
russian/Make.lang: 1.1 -> 1.2
russian/index.wml: 1.3 -> 1.4
russian/News/Makefile: 1.1 -> 1.2
russian/News/index.wml: 1.3 -> 1.4
spanish/Make.lang: 1.3 -> 1.4
spanish/index.wml: 1.21 -> 1.22
spanish/News/Makefile: 1.6 -> 1.7
spanish/security/Makefile: 1.4 -> 1.5
swedish/Make.lang: 1.1 -> 1.2
swedish/index.wml: 1.15 -> 1.16
swedish/News/Makefile: 1.3 -> 1.4
swedish/News/index.wml: 1.3 -> 1.4
swedish/security/Makefile: 1.3 -> 1.4
turkish/Make.lang: 1.1 -> 1.2
turkish/index.wml: 1.1 -> 1.2
80 files changed, 244 insertions, 208 deletions
diff --git a/arabic/Make.lang b/arabic/Make.lang index fbfe1925858..d10aefa55b6 100644 --- a/arabic/Make.lang +++ b/arabic/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=AR # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/arabic/index.wml b/arabic/index.wml index c659f056007..5b28f464ab0 100644 --- a/arabic/index.wml +++ b/arabic/index.wml @@ -32,7 +32,7 @@ <HR> <H2>ÃÎÈÇÑ</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P> ááÍÕæá Úáì ÇáäÔÑÇÊ ÇáÓÇÈÞÉ ÑÇÌÚ <A href="$(HOME)/News/">ÕÝÍÉ ÇáÃÎÈÇÑ</A>. @@ -44,7 +44,7 @@ <HR> <H2> ÊäÈíåÇÊ ÇáÃãä</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> ááÍÕæá Úáì äÔÑÇÊ ÇáÃãä ÇáÓÇÈÞÉ ÑÇÌÚ <A href="$(HOME)/security/">ÕÝÍÉ ÇáÃãä</A>. Åä ßäÊ ÊÑÛÈ Ýì ÇáÍÕæá Úáì äÔÑÇÊ ÇáÃãä ÝæÑ ÕÏæÑåÇ íõãßäß ÇáÇÔÊÑÇß Ýí <A diff --git a/chinese/Make.lang b/chinese/Make.lang index 9f340226a5e..af92eb0f5d2 100644 --- a/chinese/Make.lang +++ b/chinese/Make.lang @@ -23,7 +23,7 @@ TOTW = $(BIN)/totw.pl # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -#WMLOPTIONS=-q +#WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) #WMLOUTFILE=$(@F) WMLOUTPUT=-o UNDEFuZH@uCN:$*.zh-cn.html.tmp -o UNDEFuZH@uTW:$*.zh-tw.html.tmp WMLPROLOG=--prolog='/usr/bin/perl -pe "s/^(([\\x00-\\x7F]|([\\x80-\\xFF].))+[\\x80-\\xFF]\\\\)$$/\$$1\\\\\\\\/;"' diff --git a/chinese/News/Makefile b/chinese/News/Makefile index 0fe844973ea..f6a9a99625e 100644 --- a/chinese/News/Makefile +++ b/chinese/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/chinese/News/index.wml b/chinese/News/index.wml index 25d233bdca9..e508f3672c0 100644 --- a/chinese/News/index.wml +++ b/chinese/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="³Ì·s®ø®§" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> ¦b <a href="weekly/">¨C¶g§Ö°T (Debian Weekly News)</A> ¤¤§A¥i¥H§ä¨ì\ diff --git a/chinese/index.wml b/chinese/index.wml index 9061aa848cd..fc39c809f1f 100644 --- a/chinese/index.wml +++ b/chinese/index.wml @@ -51,7 +51,7 @@ Debian 2.1 ·s¼W¥\¯à¡B¤É¯Åª`·N¨Æ¶µ¥H¤Î¾A¦X·s¥Î¤á¬d¾\ªº¦w¸Ë¤â¥Uµ¥¡C</P> <HR> <H2>³Ì·s®ø®§</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>¸ûªº®ø®§½Ð°Ñ¬Ý<A href="$(HOME)/News/">·s»Dºô¶</A>¡C\ ¦pªG§Æ±æ¦b²Ä¤@®É¶¡±µ¦¬Ãö©ó Debian ³Ì·s®ø®§ªº¹q¤l¶l¥ó¡A½Ðq¾\ \ <A href="MailingLists/debian-announce">debian-announce ¶l»¼¦Cªí</A>¡C</P> @@ -65,7 +65,7 @@ Debian 2.1 ·s¼W¥\¯à¡B¤É¯Åª`·N¨Æ¶µ¥H¤Î¾A¦X·s¥Î¤á¬d¾\ªº¦w¸Ë¤â¥Uµ¥¡C</P> <HR> <H2>¦w¥þĵ³ø</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>¸ûªº¦w¥þĵ³ø½Ð°Ñ¬Ý<A href="$(HOME)/security/">¦w¥þºô¶</A>¡C\ ¦p±ý²Ä¤@®É¶¡±µ¦¬ Debian Ãö©ó¦w¥þĵ³øªº¹q¤l¶l¥ó¡A\ ½Ðq¾\ <A href="MailingLists/subscribe">debian-security-announce ¶l»¼¦Cªí</A>¡C</P> diff --git a/croatian/Make.lang b/croatian/Make.lang index a580b855360..9642d53b65a 100644 --- a/croatian/Make.lang +++ b/croatian/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=HR # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/croatian/News/Makefile b/croatian/News/Makefile index 0fe844973ea..f6a9a99625e 100644 --- a/croatian/News/Makefile +++ b/croatian/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/croatian/News/index.wml b/croatian/News/index.wml index 11cc65532ff..b594d87eab7 100644 --- a/croatian/News/index.wml +++ b/croatian/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="Najnovije vijesti" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Ako tra¾ite informacije o trenutnim dogaðanjima u razvoju Debiana, mo¾da æe diff --git a/croatian/index.wml b/croatian/index.wml index bba201f69f2..e4051a2a022 100644 --- a/croatian/index.wml +++ b/croatian/index.wml @@ -28,7 +28,7 @@ nadograðivanju, te instalacijski priruènik, prikladan za nove korisnike. <HR> <H2>Vijesti</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Za starije novosti pogledajte stranicu <A href="$(HOME)/News/">Novosti</A>. Ako ¾elite primiti poruku pri izlasku novih Debian novosti, pretplatite se na mailing listu @@ -38,7 +38,7 @@ zbivanja u svijetu Debiana. <HR> <H2>Sigurnosne uzbune</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Za starije sigurnosne uzbune pogledajte stranicu <A href="$(HOME)/security/">Sigurnost</A>. Ako ¾elite primati sigurnosne uzbune èim se objave, pretplatite se na diff --git a/croatian/security/Makefile b/croatian/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/croatian/security/Makefile +++ b/croatian/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/danish/Make.lang b/danish/Make.lang index 7cff22cd8a9..4b5f3a7559c 100644 --- a/danish/Make.lang +++ b/danish/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=DA # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/danish/index.wml b/danish/index.wml index bf2ce900a3e..2d8a238b99d 100644 --- a/danish/index.wml +++ b/danish/index.wml @@ -32,14 +32,14 @@ vores <a href="support">support</a> og vores <a href="doc/">dokumentation</a>s s <HR> <H2>Seneste nyt</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>For ældre nyheder se på <a href="$(HOME)/News/">Nyhedssiden</A>. Hvis du er interesseret i at modtage mail når Debian nyheder bliver frigivet, kan du blive optaget på <a href="MailingLists/debian-announce">debian-announce mailing listen</a>. <HR> <H2>Seneste Sikkerheds Alarmer</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>For ældre sikkerheds alarmer se på <a href="$(HOME)/security/"> Sikkerheds siden</A>. Hvis du er interesseret i at modtage sikkerheds alarmer så snart de annonceres, så diff --git a/english/News/Makefile b/english/News/Makefile index b007444185d..f6a9a99625e 100644 --- a/english/News/Makefile +++ b/english/News/Makefile @@ -16,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/english/News/index.wml b/english/News/index.wml index a640d096e65..140403a56c1 100644 --- a/english/News/index.wml +++ b/english/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="Latest News" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Those seeking information about current events in Debian development diff --git a/english/index.wml b/english/index.wml index ef3429784ec..6ae2370786a 100644 --- a/english/index.wml +++ b/english/index.wml @@ -37,7 +37,7 @@ what's happened in the world of Debian. <HR> <H2>Security Alerts</H2> -<P><:= get_recent_list ('security/2000', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>For older security alerts see the <A href="$(HOME)/security/"> Security Page</A>. If you would like to receive security alerts as soon as they're announced, subscribe to the diff --git a/english/security/Makefile b/english/security/Makefile index 76e3f6f310f..8e6036caff1 100644 --- a/english/security/Makefile +++ b/english/security/Makefile @@ -15,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/esperanto/Make.lang b/esperanto/Make.lang index fcf3a7012d4..2b23a1a3bb9 100644 --- a/esperanto/Make.lang +++ b/esperanto/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=EO # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/esperanto/News/Makefile b/esperanto/News/Makefile index 0fe844973ea..b007444185d 100644 --- a/esperanto/News/Makefile +++ b/esperanto/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common diff --git a/esperanto/News/index.wml b/esperanto/News/index.wml index 6d6f4b8afe3..523e4977a4d 100644 --- a/esperanto/News/index.wml +++ b/esperanto/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="Lastaj Nova¼oj" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Homoj seræantaj informo pri nuntempaj eventoj en Debiana disvolvigo diff --git a/esperanto/index.wml b/esperanto/index.wml index 999619e89f1..107007fbac4 100644 --- a/esperanto/index.wml +++ b/esperanto/index.wml @@ -28,7 +28,7 @@ apogo</A> kaj <A href="doc/">dokumentaro</A>. <HR> <H2>Nova¼oj</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Por legi antaýajn nova¼ojn vidu la <A href="$(HOME)/News/">Nova¼paøn</A>. Se vi volas ricevi retpoþtajn mesaøojn kiam aperas nova¼oj pri Debiano aliøu al la <A href="MailingLists/debian-announce"><I>debian-announce</I> retpoþta dissendlisto</A>. @@ -37,7 +37,7 @@ estas bonega raporto pri la okaza¼oj en la Debiana mondo. <HR> <H2>Sekurecaj Atentigoj</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Por legi malnovajn anoncojn pri sekurecaj atentigoj vidu la <A href="$(HOME)/security/"> Paøon pri Sekureco</A>. diff --git a/finnish/Make.lang b/finnish/Make.lang index 0cad7785752..19ed53e6332 100644 --- a/finnish/Make.lang +++ b/finnish/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=FI # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/finnish/News/Makefile b/finnish/News/Makefile index 0f5a20c47ee..f6a9a99625e 100644 --- a/finnish/News/Makefile +++ b/finnish/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,6 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/finnish/News/index.wml b/finnish/News/index.wml index 2b8f3a462eb..7cf3d626406 100644 --- a/finnish/News/index.wml +++ b/finnish/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="Tuoreimmat uutiset" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Aiempien vuosien uutisotsikot ovat seuraavilla sivuilla:<br> diff --git a/finnish/index.wml b/finnish/index.wml index 2e4c65eaf04..179c31d5a61 100644 --- a/finnish/index.wml +++ b/finnish/index.wml @@ -34,7 +34,12 @@ sekä asennusohje uusia käyttäjiä varten. <HR> <H2>Tuoreimmat uutiset</H2> +<<<<<<< index.wml +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> + +======= <P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +>>>>>>> 1.7 <P>Vanhat otsikot löytyvät <A href="$(HOME)/News/">uutissivulta</A>. Jos haluat saada uutiset sähköpostitse heti julkistuksen jälkeen, liity <a @@ -44,7 +49,7 @@ tiivistelmä Debianin maailman tapahtumista. <HR> <H2>Uusimmat tietoturvatiedotteet</H2> -<P><:= get_recent_list ('security/2000', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Vanhat tiedotteet löytyvät <A href="$(HOME)/security/">tietoturvasivuilta</A>. Jos haluat saada tiedotteet sähköpostitse heti julkistamisen jälkeen, liity diff --git a/finnish/security/Makefile b/finnish/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/finnish/security/Makefile +++ b/finnish/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/french/Make.lang b/french/Make.lang index 6a171362628..cb0dd5b64e7 100644 --- a/french/Make.lang +++ b/french/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=FR # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/french/News/Makefile b/french/News/Makefile index 0f5a20c47ee..f6a9a99625e 100644 --- a/french/News/Makefile +++ b/french/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,6 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/french/News/index.wml b/french/News/index.wml index 63af7af8a6f..46b41395072 100644 --- a/french/News/index.wml +++ b/french/News/index.wml @@ -6,7 +6,7 @@ Translate by : Frederic Pascal <frederic.pascal@maisel-gw.enst-bretagne.fr> --> -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Les informations des années précédentes peuvent être consultées sur les pages suivantes:<br> diff --git a/french/index.wml b/french/index.wml index 35786bfdf77..497914b55a7 100644 --- a/french/index.wml +++ b/french/index.wml @@ -35,7 +35,7 @@ Assistance</A> et nos pages <A href="doc/">Documentation</A>. <HR> <H2>Actualités</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Pour les communiqués plus anciens, consultez la suite de la page <A href="$(HOME)/News/">Actualités</A>. Si vous voulez recevoir un courrier (en anglais) à chaque fois qu'un communiqué parait, abonnez-vous à la <A href="MailingLists/debian-announce">liste de diffusion debian-announce</A>. @@ -44,7 +44,7 @@ du monde Debian. <HR> <H2>Alertes de sécurité</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Pour les alertes de sécurité, consultez la <A href="$(HOME)/security/"> Page Sécurité</A>. Si vous voulez recevoir les alertes de sécurité (en anglais) dès leur parution, abonnez-vous diff --git a/french/security/Makefile b/french/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/french/security/Makefile +++ b/french/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/german/Make.lang b/german/Make.lang index c2d1f4fe4c8..6beff065be6 100644 --- a/german/Make.lang +++ b/german/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=DE # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/german/News/Makefile b/german/News/Makefile index 0f5a20c47ee..f6a9a99625e 100644 --- a/german/News/Makefile +++ b/german/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,6 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/german/News/index.wml b/german/News/index.wml index 5d004fe4ea4..450e2f713e3 100644 --- a/german/News/index.wml +++ b/german/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="Letzte Nachrichten" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Nachrichten aus den vergangenen Jahren sind auf den folgenden Seiten zu diff --git a/german/index.wml b/german/index.wml index 6c9201ac6ca..3c492fb67ac 100644 --- a/german/index.wml +++ b/german/index.wml @@ -38,7 +38,7 @@ benötigen benutzen Sie unsere <HR> <H2>Neuste Nachrichten</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Ältere Nachrichten befinden sich auf der <a href="$(HOME)/News/">Nachrichtenseite</A>. Wenn Sie die neusten Debian-Nachrichten per Mail geschickt bekommen wollen, @@ -50,7 +50,7 @@ passiert ist. <HR> <H2>Sicherheitshinweise</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Ältere Sicherheitshinweise befinden sich auf der <a href="$(HOME)/security/"> Sicherheistsseite</A>. Wenn Sie sofort bei jedem aufkommenden Sicherheitsproblem eine Mail geschickt diff --git a/german/security/Makefile b/german/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/german/security/Makefile +++ b/german/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/hungarian/Make.lang b/hungarian/Make.lang index 366218e4152..57de37f8179 100644 --- a/hungarian/Make.lang +++ b/hungarian/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=HU # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/hungarian/index.wml b/hungarian/index.wml index 290d409c2ba..26406da7519 100644 --- a/hungarian/index.wml +++ b/hungarian/index.wml @@ -29,7 +29,7 @@ Dokumentáció</A> oldalainkat. <HR> <H2>Hírek</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>A régebbi híreket a <A href="$(HOME)/News/">Hírek</A> oldalon keresd. Ha szeretnéd megkapni e-mailben a legújabb Debian-híreket, iratkozz fel a <A href="MailingLists/debian-announce">debian-announce</A> levelezõlistára. @@ -38,7 +38,7 @@ mindannak, ami a Debian-világban történt. <HR> <H2>Biztonsági riasztások</H2> -<P><:= get_recent_list ('security/2000', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>A régebbi biztonsági riasztásokat a <A href="$(HOME)/security/"> Biztonság</A> oldalon keresd. Ha szeretnéd a lehetõ leghamarabb e-mailben megkapni a biztonsági diff --git a/italian/Make.lang b/italian/Make.lang index d5bdc061dc4..39aa70a99bc 100644 --- a/italian/Make.lang +++ b/italian/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=IT # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/italian/News/Makefile b/italian/News/Makefile index ca97ff90f56..f6a9a99625e 100644 --- a/italian/News/Makefile +++ b/italian/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,6 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \ - $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_news.wml $(TEMPLDIR)/languages.wml +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ + $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/italian/index.wml b/italian/index.wml index 97c85cb276d..3c24162aee0 100644 --- a/italian/index.wml +++ b/italian/index.wml @@ -32,7 +32,7 @@ il <A href="support">supporto</A> e le pagine di <A href="doc/">Documentazione <H2>Ultime Notizie</H2> <P> -<:= get_recent_news ('News/1999', '6', '$(ENGLISHDIR)') :> +<:= get_recent_news ('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)') :> <P>Per le notizie più vecchie vedi la <A href="$(HOME)/News/">Pagina delle News</A>. Se interessa ricevere una mail ogni volta che arrivano novità su Debian, @@ -42,7 +42,7 @@ indice approfondito di quello che succede nel mondo Debian. <HR> <H2>Problemi legati alla sicurezza</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Per problemi trovati precedentemente vedi la <A href="$(HOME)/security/"> Security Page</A>. diff --git a/italian/security/Makefile b/italian/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/italian/security/Makefile +++ b/italian/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/japanese/Make.lang b/japanese/Make.lang index 15d094adffd..0dd86aa0bea 100644 --- a/japanese/Make.lang +++ b/japanese/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=JA # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F).tmp WMLPROLOG=--prolog="/usr/bin/kcc -e -" WMLEPILOG=--epilog="$(WMLBASE)/convert $(@F)" diff --git a/japanese/News/Makefile b/japanese/News/Makefile index 0fe844973ea..f6a9a99625e 100644 --- a/japanese/News/Makefile +++ b/japanese/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/japanese/News/index.wml b/japanese/News/index.wml index e1b51bb8f74..8dc93825993 100644 --- a/japanese/News/index.wml +++ b/japanese/News/index.wml @@ -2,7 +2,7 @@ #use wml::debian::recent_list <!--original_revision: 1.9 :--> -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Debian $B$N3+H/$K4X$9$k:G6a$NOCBj$K$D$$$F$O!"(B diff --git a/japanese/index.wml b/japanese/index.wml index 579c8fa7665..08e31deb896 100644 --- a/japanese/index.wml +++ b/japanese/index.wml @@ -29,7 +29,7 @@ Debian $B$O!"8=:_(B <A href="http://www.linux.org/">Linux</A> $B%+!<%M%k$rMxM <HR> <H2>$B%K%e!<%9(B</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>$B8E$$%K%e!<%9$K$D$$$F$O(B<A href="$(HOME)/News/">$B%K%e!<%9%Z!<%8(B</A>$B$r$4Mw$/$@$5$$!#(B Debian $B$N%K%e!<%9H/I=$r%a!<%k$G<u$1$H$j$?$$J}$O!"(B <A href="MailingLists/debian-announce">debian-announce $B%a!<%j%s%0%j%9%H(B</a>$B$r9XFI$7$F$/$@$5$$!#(B @@ -38,7 +38,7 @@ Debian $B3&$G$N=PMh;v$K4X$9$k>\:Y$J%5%^%j!<$G$9!#(B <HR> <H2>$B%;%-%e%j%F%#7Y9p(B</H2> -<P><:= get_recent_list ('security/2000', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>$B8E$$%;%-%e%j%F%#7Y9p$K$D$$$F$O(B<A href="$(HOME)/security/">$B%;%-%e%j%F%#%Z!<%8(B</A>$B$r$4Mw$/$@$5$$!#(B $B%;%-%e%j%F%#7Y9p$NH/I=$r%a!<%k$G<u$1$H$j$?$$J}$O!"(B <A href="MailingLists/subscribe">debian-security-announce $B%a!<%j%s%0%j%9%H(B</a> diff --git a/japanese/security/Makefile b/japanese/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/japanese/security/Makefile +++ b/japanese/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/korean/Make.lang b/korean/Make.lang index 6d20eb01ae6..6e10c024a3c 100644 --- a/korean/Make.lang +++ b/korean/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=KO # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/korean/News/Makefile b/korean/News/Makefile index 0f5a20c47ee..f6a9a99625e 100644 --- a/korean/News/Makefile +++ b/korean/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,6 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/korean/News/index.wml b/korean/News/index.wml index 4a8357d3196..a963f6aed70 100644 --- a/korean/News/index.wml +++ b/korean/News/index.wml @@ -1,7 +1,7 @@ #use wml::debian::template title="ÃÖ±Ù ´º½º" #use wml::debian::recent_list -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Áö³ ÇØ ÀÌÀüÀÇ ´º½º´Â ´ÙÀ½ ÆäÀÌÁö¿¡¼ º¼ ¼ö ÀÖ½À´Ï´Ù:<br> diff --git a/korean/index.wml b/korean/index.wml index 66fc86329e9..099fd518a05 100644 --- a/korean/index.wml +++ b/korean/index.wml @@ -28,7 +28,7 @@ <HR> <H2>´º½º</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>´õ ¿À·¡µÈ ¼Ò½ÄÀº <A href="$(HOME)/News/">´º½º ÆäÀÌÁö</A>¿¡ º¸Á¸µÇ¾î ÀÖ´Ù. µ¥ºñ¾È¿¡ ´ëÇÑ »õ·Î¿î ¼Ò½ÄÀ» °è¼ÓÀûÀ¸·Î ¸ÞÀÏÀ» ÅëÇÏ¿© ¹Þ±â¸¦ ¿øÇÑ´Ù¸é <A href="MailingLists/debian-announce">debian-announce ¸ÞÀϸµ ¸®½ºÆ®</A>¿¡ @@ -36,7 +36,7 @@ <HR> <H2>º¸¾È Á¤º¸</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>´õ ¿À·¡µÈ º¸¾È Á¤º¸¸¦ ¿øÇÑ´Ù¸é <A href="$(HOME)/security/">º¸¾È Á¤º¸ ÆäÀÌÁö</A>¸¦ Âü°íÇϱ⠹ٶõ´Ù. º¸¾È °ü·Ã ¼Ò½ÄÀ» ¹ßÇ¥µÇ´Â Áï½Ã ¹Þ¾Æº¸°íÀÚ ÇÑ´Ù¸é <A href="MailingLists/subscribe">debian-security-announce ¸ÞÀϸµ ¸®½ºÆ®</A>¿¡ diff --git a/korean/security/Makefile b/korean/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/korean/security/Makefile +++ b/korean/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/norwegian/Make.lang b/norwegian/Make.lang index 3b8147119bf..097e58bacad 100644 --- a/norwegian/Make.lang +++ b/norwegian/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=NO # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/norwegian/News/Makefile b/norwegian/News/Makefile index 0fe844973ea..f6a9a99625e 100644 --- a/norwegian/News/Makefile +++ b/norwegian/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/norwegian/News/index.wml b/norwegian/News/index.wml index 54f51b6af79..ad8a1595eaf 100644 --- a/norwegian/News/index.wml +++ b/norwegian/News/index.wml @@ -3,7 +3,7 @@ #<!--translation 1.9--> <!-- Oversatt til norsk av Tor Slettnes (tor@slett.net) --> -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> diff --git a/norwegian/security/Makefile b/norwegian/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/norwegian/security/Makefile +++ b/norwegian/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/polish/Make.lang b/polish/Make.lang index b528e9c1cdf..f2029248554 100644 --- a/polish/Make.lang +++ b/polish/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=PL # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/polish/index.wml b/polish/index.wml index cd04884b882..d717b45273d 100644 --- a/polish/index.wml +++ b/polish/index.wml @@ -27,7 +27,7 @@ znale¼æ na naszych stronach na temat <A href="support">wsparcia</A> i <A href="d <HR> <H2>Wiadomo¶ci</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Starsze wiadomo¶ci dostêpne s± na stronie z <A href="$(HOME)/News/">Wiadomo¶ciami</A>. Je¶li chcia³by¶/chcia³aby¶ otrzymaæ pocztê gdy uka¿e siê nowa wersja Debiana, zapisz siê na <A href="MailingLists/debian-announce">listê debian-announce</A>. @@ -36,7 +36,7 @@ doskona³e podsumowanie wszystkich wydarzeñ ze ¶wiata Debiana. <HR> <H2>Ostrze¿enia dotycz±ce bezpieczeñstwa</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Starsze ostrze¿enia dotycz±ce bezpieczeñstwa dostêpne s± na <A href="$(HOME)/security/">Stronie dotycz±cej bezpieczeñstwa</A>. Je¶li chcia³by¶/chcia³aby¶ otrzymywaæ ostrze¿enia gdy tylko zostan± wydane, diff --git a/portuguese/Make.lang b/portuguese/Make.lang index 8d139986396..7d6a7c2ebb9 100644 --- a/portuguese/Make.lang +++ b/portuguese/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=PT # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/portuguese/index.wml b/portuguese/index.wml index b4b8c59f997..3129f2abb27 100644 --- a/portuguese/index.wml +++ b/portuguese/index.wml @@ -50,7 +50,7 @@ Para conseguir ajuda ou configurar seu Debian, veja nossas páginas de <HR> <H2>Últimas Notícias</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Para notícias antigas veja a <a href="$(HOME)/News/">Página de Notícias</A>. Se você quiser receber e-mail sempre que as notícias surgirem, inscreva-se na @@ -58,7 +58,7 @@ Se você quiser receber e-mail sempre que as notícias surgirem, inscreva-se na <HR> <H2>Últimos Alertas de Segurança</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Para alertas antigos veja a <a href="$(HOME)/security/"> Página de Segurança</A>. Se você quiser receber os alertas de seguraça tão diff --git a/romanian/Make.lang b/romanian/Make.lang index cacb9e9a4c2..2be4bde6ebb 100644 --- a/romanian/Make.lang +++ b/romanian/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=RO # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/romanian/News/Makefile b/romanian/News/Makefile index 0fe844973ea..f6a9a99625e 100644 --- a/romanian/News/Makefile +++ b/romanian/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/romanian/News/index.wml b/romanian/News/index.wml index 036f5eff181..805be1d0d3e 100644 --- a/romanian/News/index.wml +++ b/romanian/News/index.wml @@ -3,7 +3,7 @@ <!-- translation of EN 1.9 --> -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Cei care cautã informaþii despre evenimentele în programare în curs la Debian diff --git a/romanian/index.wml b/romanian/index.wml index 0a608759fde..04e2132b375 100644 --- a/romanian/index.wml +++ b/romanian/index.wml @@ -30,7 +30,7 @@ suport tehnic</A> ºi la cea de <A href="doc/"> documentaþie </A>. <HR> <H2>ªtiri</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>Pentru ºtiri mai vechi mergeþi la <A href="$(HOME)/News/">Pagina de ºtiri</A>. Dacã vreþi sã primiþi sãptãmînal mail sau de cite ori ceva nou se întimplã Debian, subcrieþi la <A href="MailingLists/debian-announce">debian-announce </A>. @@ -39,7 +39,7 @@ despre ce s-a întîmplat în lumea Debian. <HR> <H2>ªtiri ºi alerte privind securitatea sistemului</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>Pentru ºtiri mai vechi mergeþi la <A href="$(HOME)/security/"> pagina de securitate a sistemului</A>. Dacã vreþi sã fiþi alertat imediat ce astfel de ºtiri sînt anunþate, subcrieþi la diff --git a/romanian/security/Makefile b/romanian/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/romanian/security/Makefile +++ b/romanian/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/russian/Make.lang b/russian/Make.lang index 516c8c814ff..3c5dc7c8c05 100644 --- a/russian/Make.lang +++ b/russian/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=RU # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/russian/News/Makefile b/russian/News/Makefile index 0fe844973ea..f6a9a99625e 100644 --- a/russian/News/Makefile +++ b/russian/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/russian/News/index.wml b/russian/News/index.wml index b3eb87bc224..38bfa4764c1 100644 --- a/russian/News/index.wml +++ b/russian/News/index.wml @@ -3,7 +3,7 @@ #<!-- translation 1.9 --> -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> éÝÕÝÉÅ ÉÎÆÏÒÍÁÃÉÀ Ï ÔÅËÕÝÉÈ ÓÏÂÙÔÉÑÈ × ÒÁÚÒÁÂÏÔËÅ Debian diff --git a/russian/index.wml b/russian/index.wml index 4ffd19ff705..5954c82a763 100644 --- a/russian/index.wml +++ b/russian/index.wml @@ -32,7 +32,7 @@ Debian ÎÁ ÄÒÕÇÉÅ ÑÄÒÁ, ÉÓÐÏÌØÚÕÑ <HR> <H2>îÏ×ÏÓÔÉ</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>âÏÌÅÅ ÓÔÁÒÙÅ ÎÏ×ÏÓÔÉ ÓÍÏÔÒÉÔÅ ÎÁ ÓÔÒÁÎÉÃÅ <A href="$(HOME)/News/"> îÏ×ÏÓÔÉ</A>. åÓÌÉ ×Ù ÈÏÔÉÔÅ ÐÏÌÕÞÁÔØ Õ×ÅÄÏÍÌÅÎÉÑ Ï ×ÙÈÏÄÅ ÎÏ×ÙÈ ÒÅÌÉÚÏ× Debian, @@ -43,7 +43,7 @@ Debian ÎÁ ÄÒÕÇÉÅ ÑÄÒÁ, ÉÓÐÏÌØÚÕÑ <HR> <H2>ðÒÅÄÕÐÒÅÖÄÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ Ó ÂÅÚÏÐÁÓÎÏÓÔØÀ</H2> -<P><:= get_recent_list ('security/2000', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>âÏÌÅÅ ÓÔÁÒÙÅ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ ×Ù ÓÍÏÖÅÔÅ ÎÁÊÔÉ ÎÁ ÓÔÒÁÎÉÃÅ <A href="$(HOME)/security/"> âÅÚÏÐÁÓÎÏÓÔØ</A>. åÓÌÉ ×Ù ÈÏÔÉÔÅ ÐÏÌÕÞÁÔØ ÁÎÏÎÓÙ Ï ÐÒÏÂÌÅÍÁÈ Ó ÂÅÚÏÐÁÓÎÏÓÔØÀ ÓÒÁÚÕ ËÁË diff --git a/spanish/Make.lang b/spanish/Make.lang index a0364957b4b..185e28db552 100644 --- a/spanish/Make.lang +++ b/spanish/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=ES # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/spanish/News/Makefile b/spanish/News/Makefile index 50cd7db7e14..f6a9a99625e 100644 --- a/spanish/News/Makefile +++ b/spanish/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 weekly +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,6 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1998/1998*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \ - $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_news.wml $(TEMPLDIR)/languages.wml +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ + $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/spanish/index.wml b/spanish/index.wml index b9b0adb2f92..de88d28cd43 100644 --- a/spanish/index.wml +++ b/spanish/index.wml @@ -56,7 +56,7 @@ href="doc/">documentación</a>. <HR> <H2>Últimas noticias</H2> -<P><:= get_recent_list ('News/1999', '6', '$(ENGLISHDIR)','','\d+\w*') :> +<P><:= get_recent_list ('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)','','\d+\w*') :> <!-- debe cambiarse esto a SPANISHDIR? --> <P>Para noticias más antiguas mire la <a href="$(HOME)/News/">Página de Noticias</A>. @@ -65,7 +65,7 @@ subscríbase a la <a href="MailingLists/debian-announce">lista de correo d <HR> <H2>Últimos avisos de Seguridad</H2> -<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)','list','\d+\w*') :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)','list','\d+\w*') :> <P>Para avisos más antiguos vea la <a href="$(HOME)/security/"> Página de Seguridad</A>. Si desea recibir los avisos de seguridad en el momento de ser anunciados, diff --git a/spanish/security/Makefile b/spanish/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/spanish/security/Makefile +++ b/spanish/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/swedish/Make.lang b/swedish/Make.lang index a304dbb6b46..6e00b040c48 100644 --- a/swedish/Make.lang +++ b/swedish/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=SV # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/swedish/News/Makefile b/swedish/News/Makefile index 2cdfa760530..f6a9a99625e 100644 --- a/swedish/News/Makefile +++ b/swedish/News/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=News -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=weekly 1997 1998 1999 +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) weekly include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -15,7 +16,7 @@ include $(WMLBASE)/Make.dep.generic include $(WMLBASE)/Make.dep.templ # Do Not modify the following line -index.$(LANGUAGE).html: index.wml $(wildcard 1999/1999*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/News/1999/1999*.wml) \ - $(wildcard 1999/1999*.title) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/News/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.title) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml diff --git a/swedish/News/index.wml b/swedish/News/index.wml index 7604b15385e..c8db49ec299 100644 --- a/swedish/News/index.wml +++ b/swedish/News/index.wml @@ -2,7 +2,7 @@ #use wml::debian::recent_list # <!--translation 1.9--> -<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> +<:= get_recent_list ('$(CUR_YEAR', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :> <hr> Om du söker information om aktuella händelser inom Debianutvecklingen diff --git a/swedish/index.wml b/swedish/index.wml index 00267226b26..a3aa15d23a9 100644 --- a/swedish/index.wml +++ b/swedish/index.wml @@ -34,7 +34,7 @@ se våra <A href="support">support-</A> och <HR> <H2>Nyheter</H2> -<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> +<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :> <P>För äldre nyheter, se <A href="$(HOME)/News/">nyhetssidan</A>. Om du är intresserad av att få e-post varje gång Debiannyheter kommer ut, kan du prenumerera på @@ -44,7 +44,7 @@ sammanfattning över vad som händer i Debians värld. <HR> <H2>Säkerhetsalarm</H2> -<P><:= get_recent_list ('security/2000', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> +<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :> <P>För äldre säkerhetsalarm, se <A href="$(HOME)/security/">säkerhetssidan</A>. Om du är intresserad av att ta emot säkerhetsalarm så fort de tillkännages, diff --git a/swedish/security/Makefile b/swedish/security/Makefile index 7a54cee2d32..8e6036caff1 100644 --- a/swedish/security/Makefile +++ b/swedish/security/Makefile @@ -4,9 +4,10 @@ WMLBASE=.. CUR_DIR=security -# list any subdirectories in the following variable. Any directories listed -# must exist or the make will not work -SUBS=1997 1998 1999 2000 undated +# list any subdirectories in the following variable. If a listed directory +# exists, it must contain a Makefile, or make gives an error +YEARS:=$(wildcard [12][0-9][0-9][0-9]) +SUBS=$(YEARS) undated include $(WMLBASE)/Make.lang include $(WMLBASE)/Make.common @@ -14,8 +15,8 @@ include $(WMLBASE)/Make.common include $(WMLBASE)/Make.dep.templ include $(WMLBASE)/Make.dep.generic -index.$(LANGUAGE).html: index.wml $(wildcard 2000/2000*.wml) \ - $(wildcard $(ENGLISHSRCDIR)/security/2000/2000*.wml) \ +index.$(LANGUAGE).html: index.wml $(wildcard $(CUR_YEAR)/$(CUR_YEAR)*.wml) \ + $(wildcard $(ENGLISHSRCDIR)/security/$(CUR_YEAR)/$(CUR_YEAR)*.wml) \ $(TEMPLDIR)/template.wml $(TEMPLDIR)/recent_list.wml diff --git a/turkish/Make.lang b/turkish/Make.lang index 6862cf94102..d0f90e0f38c 100644 --- a/turkish/Make.lang +++ b/turkish/Make.lang @@ -13,7 +13,7 @@ LANGUAGECAP=TR # -o $(@F) # If you use --epilog as above, then you will want to add a line to # Make.templ.inc to remove $(@F) after WML is done. -WMLOPTIONS=-q +WMLOPTIONS=-q -D CUR_YEAR=$(shell date +%Y) WMLOUTFILE=$(@F) WMLPROLOG= WMLEPILOG= diff --git a/turkish/index.wml b/turkish/index.wml index 2a79e8339ae..3c1625c3213 100644 --- a/turkish/index.wml +++ b/turkish/index.wml @@ -42,7 +42,7 @@ destek</A> ve <A href="doc/">dökümantasyon</A> sayfalarýmýza bakýnýz. <HR>
<H2>En Son Haberler</H2>
-<P><:= get_recent_list('News/1999', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :>
+<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :>
<P>Daha eski haberler için <A href="$(HOME)/News/">Haberler Sayfasý</A>'na bakýnýz.
Eðer, yeni Debian haberleri geldiðinde posta almak isterseniz,
<A href="MailingLists/debian-announce">debian-announce mailing list</A>'e üye olunuz.
@@ -51,7 +51,7 @@ Eðer, yeni Debian haberleri geldiðinde posta almak isterseniz, <HR>
<H2>En Son Güvenlik Alarmlarý</H2>
-<P><:= get_recent_list ('security/1999', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :>
+<P><:= get_recent_list ('security/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', 'list', '\d+\w*' ) :>
<P>Daha eski güvenlik alarmlarý için<A href="$(HOME)/security/">
Güvenlik Sayfasý</A>'na bakýnýz.
Güvenlik alarmlarýný duyurulduðu anda almak isterseniz,
|