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

[David Prévot]

The branch, wheezy has been updated
       via  3228fd45dedf4f0f869165c08a3a5f256edc62b1 (commit)
      from  445f41b8c91b6651397868489ccdd30cb2e1d3e6 (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/changelog                      |    4 +++-
 debian/rules                          |   16 ----------------
 documentation/release-manual/Makefile |    8 ++++----
 3 files changed, 7 insertions(+), 21 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0ed7822..c7e2eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ debian-edu-doc (0.9.20071127) unstable; urgency=low
     * updated source from the wiki (describes a workaround for
       #1270)
     * add localized german images for the installation chapter
+    * fix a bug to include localized images in the pdf again
     * updated German and Bokmål translations, thanks to Jürgen and Håvard
+  * debian/rules: remove useless cleanups
 
- -- Holger Levsen <holger at debian.org>  Tue, 27 Nov 2007 13:19:42 +0100
+ -- Holger Levsen <holger at debian.org>  Tue, 27 Nov 2007 22:30:14 +0100
 
 debian-edu-doc (0.9.20071124) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 148d4a3..573ec36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,6 @@ SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 get-orig-source:
 	$(MAKE) get-orig-source
 	
-	# clean sources
-	find $(SRCDIR) -name "*.eps" -exec rm \{\} \;
-	find $(SRCDIR) -name "*.ps"  -exec rm \{\} \;
-	find $(SRCDIR) -name "*.fig" -exec rm \{\} \;
-
 dist-clean: clean
 
 clean:
@@ -44,17 +39,6 @@ install: build
 	#
 	$(MAKE) install DESTDIR="$(DESTDIR)"
 
-	#
-	# cleanup
-	#
-	find $(DESTDIR)$(DESTPATH) -name "*.po"   -exec rm \{\} \;
-	find $(DESTDIR)$(DESTPATH) -name "*.pot"  -exec rm \{\} \;
-	find $(DESTDIR)$(DESTPATH) -name "*.sgml" -exec rm \{\} \;
-	find $(DESTDIR)$(DESTPATH) -name "*.eps"  -exec rm \{\} \;
-	find $(DESTDIR)$(DESTPATH) -name "*.ps"   -exec rm \{\} \;
-	find $(DESTDIR)$(DESTPATH) -name "*.dia"  -exec rm \{\} \;
-	find $(DESTDIR)$(DESTPATH) -name "*.fig"  -exec rm \{\} \;
-
 
 binary-indep: install
 	dh_testdir
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index b16155e..8225c3d 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -41,7 +41,7 @@ install: build
 			cp release-manual.$$f.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
 			if [ "$$f" = "en" ] ; then \
 			  mkdir $(DESTDIR)$(DESTPATH)/$$f/images/ ; \
-			  find images -type f -maxdepth 1 -exec cp \{\} $(DESTDIR)$(DESTPATH)/$$f/images/ \; ; \
+			  find images -maxdepth 1 -type f -exec cp \{\} $(DESTDIR)$(DESTPATH)/$$f/images/ \; ; \
 			  dblatex -T db2latex -p release-manual.xsl -o $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf release-manual.xml ; \
 			else \
 			  if [ -d images/$$f ] ; then \
@@ -57,15 +57,15 @@ install: build
 			  else \
 			    ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
 			  fi ; \
-			  dblatex -T db2latex -p release-manual.xsl -o $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf release-manual.$$f.xml ; \
+			  export CURRENTDIR=`pwd` ; cd $(DESTDIR)$(DESTPATH)/$$f/ ; cp $$CURRENTDIR/release-manual.$$f.xml . ; dblatex -T db2latex -p $$CURRENTDIR/release-manual.xsl -o release-manual.pdf release-manual.$$f.xml ; rm release-manual.$$f.xml ; cd $$CURRENTDIR ; \
 			fi ; \
 		else \
 			ln -sf ../en/release-manual.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
 			ln -sf ../en/release-manual.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
 		        ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
 		fi ; \
-	done
-	
+	done 		
+
 clean:
 	rm -f *.pdf
 	rm -f *.html


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).