r258 - in /packages/swfmill/trunk/debian: h2m/Makefile h2m/swfmill rules

[miriam at users.alioth.debian.org]

Author: miriam
Date: Fri Jun  6 12:08:26 2008
New Revision: 258

URL: http://svn.debian.org/wsvn/?sc=1&rev=258
Log:
Finxed man page


Modified:
    packages/swfmill/trunk/debian/h2m/Makefile
    packages/swfmill/trunk/debian/h2m/swfmill
    packages/swfmill/trunk/debian/rules

Modified: packages/swfmill/trunk/debian/h2m/Makefile
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/h2m/Makefile?rev=258&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/h2m/Makefile (original)
+++ packages/swfmill/trunk/debian/h2m/Makefile Fri Jun  6 12:08:26 2008
@@ -7,7 +7,7 @@
 # NEED: help2man
 
 clean:
-	rm -f $(MANPAGES)
+	rm -f $(MANPAGES) *.log
 
 swfmill.1: swfmill
 	chmod +x $<

Modified: packages/swfmill/trunk/debian/h2m/swfmill
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/h2m/swfmill?rev=258&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/h2m/swfmill (original)
+++ packages/swfmill/trunk/debian/h2m/swfmill Fri Jun  6 12:08:26 2008
@@ -6,13 +6,14 @@
 
 case "$1" in
   "--help")
-    LD_LIBRARY_PATH="$LIB" $BIN/swfmill 2>&1 | \
+    LD_LIBRARY_PATH="$LIB" $BIN/swfmill 2>&1 | tee help.log | \
       grep --extended-regexp --regexp="^<command>|^$|^ |^<option>" | \
       grep -v "XML-based SWF" | awk '(p<2){if(NF==0){p++;next;}}{print}'
     ;;
    "--version")
-    LD_LIBRARY_PATH="$LIB" $BIN/swfmill 2>&1 | \
-      grep -v "^$" | head -n 1 | awk '{ print $2 }'
+    LD_LIBRARY_PATH="$LIB" $BIN/swfmill 2>&1 | tee version.log| \
+      grep --extended-regexp --regexp="^swfmill " | \
+      head -n 1 | awk '{ print $2 }'
     ;;
 esac
 exit 0

Modified: packages/swfmill/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/swfmill/trunk/debian/rules?rev=258&op=diff
==============================================================================
--- packages/swfmill/trunk/debian/rules (original)
+++ packages/swfmill/trunk/debian/rules Fri Jun  6 12:08:26 2008
@@ -58,7 +58,7 @@
 	-$(MAKE) distclean
 	-$(MAKE) clean
 	rm -f config.sub config.guess config.status config.log
-	cd debian/h2m/ && $(MAKE) clean
+	$(MAKE) -C debian/h2m clean
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
@@ -70,7 +70,7 @@
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/swfmill
 	install debian/doc/* $(CURDIR)/debian/tmp/usr/share/doc/swfmill
-	cd debian/h2m/ && $(MAKE)
+	$(MAKE) -C debian/h2m
 
 # Build architecture-independent files here.
 binary-indep: build install