[debian-edu-commits] debian-edu/debian-edu-doc.git (#21) - wheezy (branch) updated: b98e26d8c1fca9828aa4d2803cd692f3b306179a

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:11:24 UTC 2013 

The branch, wheezy has been updated
       via  b98e26d8c1fca9828aa4d2803cd692f3b306179a (commit)
      from  c565c0df2388870cba4be719a9911a56b50ec87d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/control                                  |    2 +-
 debian/copyright                                |    4 ++--
 debian/rules                                    |   13 +++++++++----
 documentation/architecture/arkitektur.da.pdf    |  Bin 40530 -> 0 bytes
 documentation/architecture/arkitektur.de.pdf    |  Bin 143992 -> 0 bytes
 documentation/architecture/arkitektur.en.pdf    |  Bin 75948 -> 0 bytes
 documentation/architecture/arkitektur.nb.pdf    |  Bin 74110 -> 0 bytes
 documentation/architecture/arkitektur.nl.pdf    |  Bin 40803 -> 0 bytes
 documentation/architecture/arkitektur.pt_BR.pdf |  Bin 41477 -> 0 bytes
 documentation/architecture/network-arch.pdf     |  Bin 99123 -> 0 bytes
 documentation/architecture/network-arch_da.pdf  |  Bin 98036 -> 0 bytes
 documentation/architecture/network-arch_en.pdf  |  Bin 89233 -> 0 bytes
 documentation/architecture/network-arch_nl.pdf  |  Bin 89826 -> 0 bytes
 todo                                            |   14 +++++---------
 14 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 documentation/architecture/arkitektur.da.pdf
 delete mode 100644 documentation/architecture/arkitektur.de.pdf
 delete mode 100644 documentation/architecture/arkitektur.en.pdf
 delete mode 100644 documentation/architecture/arkitektur.nb.pdf
 delete mode 100644 documentation/architecture/arkitektur.nl.pdf
 delete mode 100644 documentation/architecture/arkitektur.pt_BR.pdf
 delete mode 100644 documentation/architecture/network-arch.pdf
 delete mode 100644 documentation/architecture/network-arch_da.pdf
 delete mode 100644 documentation/architecture/network-arch_en.pdf
 delete mode 100644 documentation/architecture/network-arch_nl.pdf

The diff of changes is:
diff --git a/debian/control b/debian/control
index 1d3cd07..8ab0151 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: debian-edu-doc
 Section: doc
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), poxml
 Build-Depends-Indep: docbook-utils
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Morten Werner Olsen <werner at debian.org>, Luk Claes <luk at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>
diff --git a/debian/copyright b/debian/copyright
index 6f95130..369ce76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ It was packaged by Mari Wang <mariwan at ifi.uio.no>, Steffen Jöris
 and Holger Levsen (holger at debian.org). The packaging is licenced under the GPL version2 or at your option, any later version. [licence text/pointer here]
  
 
-The files in documentation/architecture are copyright 2002 by 
-Petter Reinholdtsen and are licenced under...
+The files in /usr/share/doc/debian-edu-doc/$lang/architecture/ are copyright 2002 by 
+Petter Reinholdtsen and are licenced under GPL
 
 [licence text/pointer here]
 
diff --git a/debian/rules b/debian/rules
index af41c45..8014344 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,11 +26,16 @@ install: build
 	install -d $(DESTDIR)$(DESTPATH)
 
 # arkitektur
-	install -d $(DESTDIR)$(DESTPATH)/no/architecture
-	install -m 644 $(SRCDIR)/architecture/* $(DESTDIR)$(DESTPATH)/no/architecture
+	svn co svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/arkitektur $(DESTDIR)$(DESTPATH)/arkitektur
+	find $(DESTDIR)$(DESTPATH)/arkitektur -name *.po -exec rm \{\} \;
+	for i in en nb de nl pt_BR da ; do \
+		install -d $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
+		install -m 644 $(DESTDIR)$(DESTPATH)/arkitektur/*.$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
+		install -m 644 $(DESTDIR)$(DESTPATH)/arkitektur/*_$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
+	done
+	rm $(DESTDIR)$(DESTPATH)/arkitektur -r
 
 # drift
-
 #	install -d $(DESTDIR)$(DESTPATH)/no/drift
 #	install -m 644 $(SRCDIR)/drift/*html $(DESTDIR)$(DESTPATH)/no/drift
 #	install -m 644 $(SRCDIR)/drift/driftbok.sgml \
@@ -61,7 +66,7 @@ binary-indep: install
 	dh_installdocs
 	dh_installchangelogs
 	dh_link
-	dh_compress
+#	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol
diff --git a/documentation/architecture/arkitektur.da.pdf b/documentation/architecture/arkitektur.da.pdf
deleted file mode 100644
index 7602a0b..0000000
Binary files a/documentation/architecture/arkitektur.da.pdf and /dev/null differ
diff --git a/documentation/architecture/arkitektur.de.pdf b/documentation/architecture/arkitektur.de.pdf
deleted file mode 100644
index f20df0c..0000000
Binary files a/documentation/architecture/arkitektur.de.pdf and /dev/null differ
diff --git a/documentation/architecture/arkitektur.en.pdf b/documentation/architecture/arkitektur.en.pdf
deleted file mode 100644
index 58df0e9..0000000
Binary files a/documentation/architecture/arkitektur.en.pdf and /dev/null differ
diff --git a/documentation/architecture/arkitektur.nb.pdf b/documentation/architecture/arkitektur.nb.pdf
deleted file mode 100644
index b1c35ea..0000000
Binary files a/documentation/architecture/arkitektur.nb.pdf and /dev/null differ
diff --git a/documentation/architecture/arkitektur.nl.pdf b/documentation/architecture/arkitektur.nl.pdf
deleted file mode 100644
index 11a7a55..0000000
Binary files a/documentation/architecture/arkitektur.nl.pdf and /dev/null differ
diff --git a/documentation/architecture/arkitektur.pt_BR.pdf b/documentation/architecture/arkitektur.pt_BR.pdf
deleted file mode 100644
index bda9ebe..0000000
Binary files a/documentation/architecture/arkitektur.pt_BR.pdf and /dev/null differ
diff --git a/documentation/architecture/network-arch.pdf b/documentation/architecture/network-arch.pdf
deleted file mode 100644
index 0af69e3..0000000
Binary files a/documentation/architecture/network-arch.pdf and /dev/null differ
diff --git a/documentation/architecture/network-arch_da.pdf b/documentation/architecture/network-arch_da.pdf
deleted file mode 100644
index bc6767d..0000000
Binary files a/documentation/architecture/network-arch_da.pdf and /dev/null differ
diff --git a/documentation/architecture/network-arch_en.pdf b/documentation/architecture/network-arch_en.pdf
deleted file mode 100644
index ad846fe..0000000
Binary files a/documentation/architecture/network-arch_en.pdf and /dev/null differ
diff --git a/documentation/architecture/network-arch_nl.pdf b/documentation/architecture/network-arch_nl.pdf
deleted file mode 100644
index 73c5f04..0000000
Binary files a/documentation/architecture/network-arch_nl.pdf and /dev/null differ
diff --git a/todo b/todo
index 77675be..54512a0 100644
--- a/todo
+++ b/todo
@@ -10,23 +10,19 @@ so the plan for the docs on svn.d.n is:
 
 - rename directory names to english (http://bugs.skolelinux.no/show_bug.cgi?id=1029)
 
-- include up2date architecture documents
-	- from svn+ssh://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/arkitektur
-	- fix debian/copyright, pere is the author and said: As for license, i am fine with using GPL on the document and
-	everything in that directory (build rules etc. :)
+- architecture documents
+	- checkout using a date tag
+	- make after svn co doesnt work yet
 
 - include newdriftbook, update it for etch
-  from svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon/newdriftbok
-
-- decide how/where to development the architecture and newdriftbook further
+  from svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon/newdriftbok
 
 - ikt-book in english missing
-	- from svn+ssh://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon
+	- from svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon
 
 - documentation/norwegian/kurs: is that GFDL without invariant sections? this needs to be mentioned in debian/copyright
 
 - debian/rules
-	- the architecture stuff only gets installed for norwegian
 	- install the ikt-book
 
 - fix debian/copyright


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).

More information about the debian-edu-commits mailing list