Since I sent this bug report I read some text where bashisms are corrected rewriting the offending commands and not switching to bash, as I did on my patch (this adds no build dependency because bash is a essential package, right? -- I verified when I wrote it.) As you didn't answered nor released a new version, I did another patch where the interpreter is still sh and the offending commands are corrected. It's attached and I not changed its name (you aren't going to use both of them.)
This patch removes the .patched file only when the reverse patch is successful, a thing the previous didn't do. This helps the packaging of new patches and it isn't a bug but I added it because I rewrote the affecting code and it helped me a bit. -- ,-. rollingbits -- [EMAIL PROTECTED], [EMAIL PROTECTED] \`' [EMAIL PROTECTED], [EMAIL PROTECTED], [EMAIL PROTECTED] ` Get my public GPG key in http://rollingbits.tripod.com/mykey.html
diff -ruN apt-howto-2.0.2.old/debian/patches/02_fix_clean.diff apt-howto-2.0.2/debian/patches/02_fix_clean.diff
--- apt-howto-2.0.2.old/debian/patches/02_fix_clean.diff 1969-12-31 21:00:00.000000000 -0300
+++ apt-howto-2.0.2/debian/patches/02_fix_clean.diff 2008-02-17 16:13:47.000000000 -0300
@@ -0,0 +1,19 @@
+--- Makefile 2008-02-17 16:12:36.000000000 -0300
++++ Makefile.old 2008-02-17 16:13:13.000000000 -0300
+@@ -290,14 +290,9 @@
+ distclean: clean
+ rm -Rf $(PUBLISHDIR)/$(MANUAL)
+
+-# This rely on BASH
+ clean:
+- rm -f $(MANUAL)*.{txt,ps,dvi,pdf,info*,log,tex,aux,toc,sasp*,out,tov,tpt,hyp}
+- rm -f *~ prior.aux pprior.aux *.log typescript README README.html
+- rm -f {latex,pdflatex,pdftex}.{fmt,log,efmt} *.tex[01]pdf *.tex[01]ps
+- rm -f *.error $(MANUAL).*.ent date.ent
+- rm -rf $(MANUAL)*.html *stamp
+- rm -f $(MANUAL).{$(shell echo $(NORMALIZED_PO_LANGS) | sed 's/ /,/g')}.sgml
++ rm -rf $(MANUAL)*.txt $(MANUAL)*.ps $(MANUAL)*.dvi $(MANUAL)*.pdf $(MANUAL)*.info* $(MANUAL)*.log $(MANUAL)*.tex $(MANUAL)*.aux $(MANUAL)*.toc $(MANUAL)*.sasp* $(MANUAL)*.out $(MANUAL)*.tov $(MANUAL)*.tpt $(MANUAL)*.hyp *~ prior.aux pprior.aux *.log typescript README README.html latex.fmt latex.log latex.efmt pdflatex.fmt pdflatex.log pdflatex.efmt pdftex.fmt pdftex.log pdftex.efmt *.tex[01]pdf *.tex[01]ps *.error $(MANUAL).*.ent date.ent $(MANUAL)*.html *stamp
++ for f in $(NORMALIZED_PO_LANGS); do rm -f $(MANUAL).$${f}.sgml; done
+
+ .PHONY: all html text txt ps pdf files tar sf \
+ publish publish-all publish-html publish-ps publish-pdf \
diff -ruN apt-howto-2.0.2.old/debian/rules apt-howto-2.0.2/debian/rules
--- apt-howto-2.0.2.old/debian/rules 2008-02-17 16:16:33.000000000 -0300
+++ apt-howto-2.0.2/debian/rules 2008-02-17 16:07:54.000000000 -0300
@@ -50,14 +50,10 @@
dh_testdir
dh_testroot
- for i in $$(ls debian/patches/*.patched); do \
- patch -p0 -R < $${i/.patched/}; \
- done
-
# code based on gnome-pkg-tools to auto create Uploaders field from
# metainfo available on the Debian Brasil's Team SVN repo
TEAM_LIST=../../metainfo/debian-br.team; \
- if test -f $${TEAM_LIST}; then \
+z if test -f $${TEAM_LIST}; then \
MAINTAINER=$$(sed -n 's/^Maintainer: //p' debian/control.in); \
grep -vF "$${MAINTAINER}" $${TEAM_LIST} | tr '\n' ' ' > debian/uploaders.tmp; \
cat debian/uploaders.tmp; \
@@ -77,9 +73,9 @@
# end of Uploaders generating code
- if patch --dry-run -R -p0 < debian/patches/00_special_case_el_in_fixhtml.diff >& /dev/null; then \
- patch -R -p0 < debian/patches/00_special_case_el_in_fixhtml.diff; \
- fi
+ #if patch --dry-run -R -p0 < debian/patches/00_special_case_el_in_fixhtml.diff >& /dev/null; then \
+ # patch -R -p0 < debian/patches/00_special_case_el_in_fixhtml.diff; \
+ #fi
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
-$(MAKE) "MANUAL=$(MANUAL)" "LANGS=$(LANGS)" \
@@ -91,7 +87,11 @@
apt-howto-$${xx}.dirs \
apt-howto-$${xx}.doc-base; \
done
- -rm *.ent
+ rm -f *.ent texsys.aux head.tmp body.tmp
+
+ for i in $$(ls -r debian/patches/*.patched); do \
+ patch -p0 -R < debian/patches/$$(basename $$i .patched) && rm -f $${i}; \
+ done
dh_clean
signature.asc
Description: Digital signature
