org2hpda: Adapt to modern pdfjam

* contrib/scripts/org2hpda (all): Adapt the invocation of pdfnup and
pdfjoin to a modern version of the pdfjam package.

Since version 2.0 of pdfjam, i.e. since 2010-03-14 some of the default
values for parameters have changed. This makes sure org2hpda does the
right thing under the new circumstances.

contrib/scripts/org2hpda

@@ -74,7 +74,7 @@ all: pocketMod.pdf hipsterPDA.pdf
 %-rotated.pdf: %.pdf
 	cp $^ $@
 	for n in 1 2 3; do \
-		pdf90 --outfile tmp.pdf $@; mv tmp.pdf $@; \
+		pdf90 --quiet --outfile tmp.pdf $@; mv tmp.pdf $@; \
 	done
 
 weekCalendar.tex: $(DIARY)
@@ -93,14 +93,14 @@ yearCalendar.tex: $(DIARY)
 	 $(EMACS) -eval "(progn (calendar) (calendar-forward-month 2) (cal-tex-cursor-year-landscape 1) (with-current-buffer cal-tex-buffer (write-file \"$@\")))"
 
 pocketMod.pdf: $(pocketModFiles)
-	pdfjoin --outfile tmp.pdf $^
-	pdfnup tmp.pdf --outfile $@ --nup 4x2 --frame true
+	pdfjoin --quiet --outfile tmp.pdf $^
+	pdfnup tmp.pdf --quiet --outfile $@ --nup 4x2 --frame true
 
 hipsterPDA.pdf: $(hipsterFiles)
-	pdfnup weekCalendar.pdf --outfile page1.pdf --nup 2x2 --frame true
-	pdfjoin --outfile tmp.pdf monthCalendar[1-3]-rotated.pdf yearCalendar-rotated.pdf
-	pdfnup tmp.pdf --outfile page2.pdf --nup 2x2 --frame true
-	pdfjoin --outfile $@ page1.pdf page2.pdf
+	pdfnup weekCalendar.pdf --quiet --outfile page1.pdf --batch --nup 2x2 --frame true --no-landscape
+	pdfjoin --quiet --outfile tmp.pdf monthCalendar[1-3]-rotated.pdf yearCalendar-rotated.pdf
+	pdfnup tmp.pdf --quiet --outfile page2.pdf --batch --nup 2x2 --frame true --no-landscape
+	pdfjoin --quiet --outfile $@ page1.pdf page2.pdf
 
 clean:
 	rm -rf *.aux *.dvi *.tex *.log *.pdf