updated to latest version

CVS version numbers

danish/.wmlrc: INITIAL -> 1.1 
danish/Make.common: 1.1 -> 1.2 
danish/Make.dep.generic: 1.1 -> 1.2 
danish/Make.dep.templ: 1.1 -> 1.2 
danish/Make.lang: 1.1 -> 1.2 
danish/Makefile: 1.1 -> 1.2

6 files changed, 34 insertions, 12 deletions

diff --git a/danish/.wmlrc b/danish/.wmlrc
new file mode 100644
index 00000000000..c57c563a62c
--- /dev/null
+++ b/danish/.wmlrc
@@ -0,0 +1,21 @@
+-D WML_SRC_REALNAME="Debian Webmaster"
+-D WML_SRC_USERNAME=webmaster
+-D WML_GEN_HOSTNAME=debian.org
+-D HOME~.
+-D ENGLISHDIR~../english
+-D CUR_LANG=Danish
+-D CUR_ISO_LANG=da
+-D INTRO~intro
+-D DEVEL~devel
+-D DOC~doc
+-D DISTRIB~distrib
+-D MISC~misc
+-D BUGS~Bugs
+-D PICS~Pics
+-D STYLE~style
+-D SPANISH~Spanish
+-D ITALIAN~Italian
+-D GERMAN~German
+-D HTMLDIR~../../debian.org
+-D CHARSET=iso-8859-1
+-I ../english/template
diff --git a/danish/Make.common b/danish/Make.common
index a092db65956..b7ad9d479c8 100644
--- a/danish/Make.common
+++ b/danish/Make.common
@@ -4,7 +4,7 @@
 # from your improvements
 
 RELHTMLBASE=../../debian.org
-RELTEMPLDIR=template/debian
+RELTEMPLDIR=../english/template/debian
 
 HTMLDIR=$(WMLBASE)/$(RELHTMLBASE)/$(CUR_DIR)
 TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
@@ -12,8 +12,8 @@ TEMPLDIR=$(WMLBASE)/$(RELTEMPLDIR)
 ENGLISHSRCDIR=$(WMLBASE)/../english
 
 WMLFILES := $(wildcard *.wml)
-HTMLFILES := $(patsubst %.wml,%.html.$(LANGUAGE),$(WMLFILES))
-HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.html.$(LANGUAGE),$(WMLFILES))
+HTMLFILES := $(patsubst %.wml,%.$(LANGUAGE).html,$(WMLFILES))
+HTMLDESTFILES := $(patsubst %.wml,$(HTMLDIR)/%.$(LANGUAGE).html,$(WMLFILES))
 JPGSOURCE := $(wildcard *.jpg)
 JPGDESTFILES := $(patsubst %,$(HTMLDIR)/%,$(JPGSOURCE))
 GIFSOURCE := $(wildcard *.gif)
@@ -38,7 +38,7 @@ install:: $(HTMLDESTFILES) $(IMGDESTFILES)
 	done
 
 clean::
-	-rm -f *.html.$(LANGUAGE)
+	-rm -f *.$(LANGUAGE).html
 	@for i in $(SUBS) ''; do \
 		if [ -d "$$i" ]; then \
 			$(MAKE) -C $$i clean; \
@@ -46,14 +46,14 @@ clean::
 	done
 
 cleandest::
-	-rm -f $(HTMLDIR)/*.html.$(LANGUAGE)
+	-rm -f $(HTMLDIR)/*.$(LANGUAGE).html
 	@for i in $(SUBS) ''; do \
 		if [ -d "$$i" ]; then \
 			$(MAKE) -C $$i clean; \
 		fi ; \
 	done
 
-$(HTMLDIR)/%.html.$(LANGUAGE): %.html.$(LANGUAGE)
+$(HTMLDIR)/%.$(LANGUAGE).html: %.$(LANGUAGE).html
 	@echo copying $(@F) to $(HTMLDIR)
 	-@cp $(@F) $(HTMLDIR)
 ifeq ($(LANGUAGE),en)
diff --git a/danish/Make.dep.generic b/danish/Make.dep.generic
index 8ff0e3a89c7..244586d92b2 100644
--- a/danish/Make.dep.generic
+++ b/danish/Make.dep.generic
@@ -1,2 +1,2 @@
-%.html.$(LANGUAGE) : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
+%.$(LANGUAGE).html : %.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml
 	$(WML) $(<F)
diff --git a/danish/Make.dep.templ b/danish/Make.dep.templ
index 1de7ea0fd4f..df2a96740ca 100644
--- a/danish/Make.dep.templ
+++ b/danish/Make.dep.templ
@@ -20,7 +20,7 @@ $(TEMPLDIR)/news.wml: $(TEMPLDIR)/basic.wml $(TEMPLDIR)/footer.wml \
 		$(TEMPLDIR)/languages.wml 
 	touch $(TEMPLDIR)/news.wml
 
-$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml
+$(TEMPLDIR)/consultant.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml
 	touch $(TEMPLDIR)/consultant.wml
 
 $(TEMPLDIR)/event.wml: $(TEMPLDIR)/footer.wml $(TEMPLDIR)/languages.wml $(TEMPLDIR)/basic.wml
diff --git a/danish/Make.lang b/danish/Make.lang
index 305a77d37ec..7cff22cd8a9 100644
--- a/danish/Make.lang
+++ b/danish/Make.lang
@@ -17,5 +17,5 @@ WMLOPTIONS=-q
 WMLOUTFILE=$(@F)
 WMLPROLOG=
 WMLEPILOG=
-WML=wml $(WMLOPTIONS) -o $(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
+WML=wml $(WMLOPTIONS) -o UNDEFu$(LANGUAGECAP):$(WMLOUTFILE) $(WMLPROLOG) $(WMLEPILOG)
 
diff --git a/danish/Makefile b/danish/Makefile
index 0eb6889474d..fc746833152 100644
--- a/danish/Makefile
+++ b/danish/Makefile
@@ -6,8 +6,8 @@ WMLBASE=.
 CUR_DIR=
 # list any subdirectories in the following variable. Any directories listed
 # must exist or the make will not work
-SUBS=2.0 MailingLists News SPI devel distrib doc events intro logos mirror \
-ports security Pics
+SUBS=Bugs MailingLists News Pics SPI consultants devel distrib doc events intro \
+logos mirror partners ports releases security vote y2k
 
 include $(WMLBASE)/Make.lang
 include $(WMLBASE)/Make.common
@@ -16,8 +16,9 @@ include $(WMLBASE)/Make.dep.generic
 include $(WMLBASE)/Make.dep.templ
 
 # Do Not modify the following line
-index.html.$(LANGUAGE): index.wml $(TEMPLDIR)/mainpage.wml \
+index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/mainpage.wml \
 		$(wildcard News/1998/1998*.wml) $(wildcard $(ENGLISHSRCDIR)/News/1998/1998*.wml) \
+		$(wildcard security/1999/1999*.wml) $(wildcard $(ENGLISHSRCDIR)/security/1999/1999*.wml) \
 		$(TEMPLDIR)/ctime.wml $(TEMPLDIR)/recent_list.wml $(TEMPLDIR)/languages.wml
 	$(WML) index.wml