[Tokyodebian-commits] TokyoDebian CVS update: monthly-report
debianmeetingresume200701.tex
tokyodebian CVS Commit
tokyodebian-commits at lists.alioth.debian.org
Thu Jan 18 16:16:36 CET 2007
User: nori1-guest
Date: 07/01/18 16:16:36
Modified: . debianmeetingresume200701.tex
Log:
* debianmeetingresume200701.tex: Add my article.
* image200701/patchdep-1.eps:
* image200701/patchdep-2.eps:
* image200701/patchdep-3.eps:
New images.
Revision Changes Path
1.12 +1223 -2 monthly-report/debianmeetingresume200701.tex
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/tokyodebian/monthly-report/debianmeetingresume200701.tex?annotate=1.12&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/tokyodebian/monthly-report/debianmeetingresume200701.tex?rev=1.12&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/tokyodebian/monthly-report/debianmeetingresume200701.tex.diff?r1=1.12&r2=1.11&cvsroot=
-----------------------------------
Index: debianmeetingresume200701.tex
===================================================================
RCS file: /cvsroot/tokyodebian/monthly-report/debianmeetingresume200701.tex,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- debianmeetingresume200701.tex 18 Jan 2007 14:09:20 -0000 1.11
+++ debianmeetingresume200701.tex 18 Jan 2007 15:16:36 -0000 1.12
@@ -355,8 +355,1229 @@
}
-\dancersection{Quilt}{$B>.NS$5$s(B}
-\label{sec:quilt}
+\dancersection{$B%Q%C%A4IM}%D!<%k(Bquilt$B$N;H$$J}(B}{$B>.NS$5$s(B}
+%\label{sec:quilt}
+
+$BK\@a$G$O%Q%C%A4IM}%D!<%k(Bquilt\footnote{\url{http://savannah.nongnu.org/projects/quilt}}$B$r<h$j>e$2!"(B
+$B$=$N4pK\A`:n$rCf?4$K at bL@$7$^$9!#(B
+quilt$B$O(BDebian$B$KFCM-$J(B ($B$D$^$j(BDebian-specific$B$J(B) $B%=%U%H%&%'%"$G$O$J$/!"(B
+Debian$B$H$OA4$/4X78$N$J$$>l=j$G3+H/$5$l$F$$$^$9!#(B
+$B$7$+$7!"$3$N%D!<%k$,(BDebian$B%Q%C%1!<%8$N:n at .$KM-MQ$G$"$k$3$H$rM}2r$7!"(B
+$B<B:]$K:n at .$K;HMQ$7$F$b$i$($?$i4r$7$$8B$j$G$9!#(B
+
+\subsection{$B$O$8$a$K(B}
+
+\subsubsection{$B%Q%C%A$H$O(B}
+
+$B3+H/<T$G$"$l$PEvA3$N$h$&$K:n at .$7$?$jFI$s$@$jEv$F$?$j$7$?$3$H$,$"$k(B\textbf{$B%Q%C%A(B}$B$G$9$,!"(B
+$B0lHL%f!<%6$K$O8+47$l$J$$$b$N$@$H;W$$$^$9!#(B
+$B$=$3$G!":G=i$K%Q%C%A$K$D$$$F at bL@$7$F$*$-$^$9!#(B
+
+$B%Q%C%A$H$O!"(B2$B$D$N%U%!%$%k$N:9J,$r4^$`%U%!%$%k$N$3$H$G$9!#(B
+$B<!$N$h$&$J(B2$B$D$N%U%!%$%k$,$"$k$H$7$^$7$g$&!#(B
+
+\begin{commandline}
+nori1[3:57]% cat file1.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$+$-$/$1$3(B
+$B$5$7$9$;$=(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$O$R$U$X$[(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+nori1[3:58]% cat file2.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$P$S$V$Y$\(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+\end{commandline}
+
+$B$3$l$i$N%U%!%$%k$N$I$3$,0c$C$F$$$k$+$9$0$K$o$+$j$^$9$+(B?
+$B0l!9L\$GHf$Y$kI,MW$O$"$j$^$;$s!#(B
+\texttt{diff}$B%3%^%s%I$G$3$l$i$N:9J,$r$H$k$3$H$,$G$-$^$9!#(B
+
+\begin{commandline}
+nori1[3:57]% diff file1.txt file2.txt saba:~/tmp/q
+2,3c2
+< $B$+$-$/$1$3(B
+< $B$5$7$9$;$=(B
+---
+> $B$P$S$V$Y$\(B
+6d4
+< $B$O$R$U$X$[(B
+\end{commandline}
+
+\texttt{file1.txt}$B$H(B\texttt{file2.txt}$B$NFbMF$d9THV9f$r9M$($l$P!"(B
+$B$J$s$H$J$/0UL#$,$o$+$k$H;W$$$^$9!#(B
+$B$=$l$G$+$^$$$^$;$s!#(B
+$B$b$A$m$s!"$3$N=PNO$r<j$G=q$1$k$h$&$K$J$i$J$/$F$+$^$$$^$;$s!#(B
+
+$B$3$N7A<0$G$b$h$$$N$G$9$,!"(B
+$BDL>o$O(B\texttt{diff}$B%3%^%s%I$K(B\texttt{-u}$B%*%W%7%g%s$r$D$1!"(B
+$B<!$N$h$&$J(B\textbf{unified diff}$B$H$$$&7A<0$G=PNO$5$;$^$9!#(B
+
+\begin{commandline}
+nori1[3:57]% diff -u file1.txt file2.txt saba:~/tmp/q
+--- file1.txt Thu Jan 18 03:57:14 2007
++++ file2.txt Thu Jan 18 03:57:22 2007
+@@ -1,9 +1,7 @@
+ $B$"$$$&$($*(B
+-$B$+$-$/$1$3(B
+-$B$5$7$9$;$=(B
++$B$P$S$V$Y$\(B
+ $B$?$A$D$F$H(B
+ $B$J$K$L$M$N(B
+-$B$O$R$U$X$[(B
+ $B$^$_$`$a$b(B
+ $B$d!!$f!!$h(B
+ $B$i$j$k$l$m(B
+\end{commandline}
+
+$B$3$A$i$N$[$&$,!"(B
+$BDI2C!&:o=|$5$l$?9T$,$I$A$i$N%U%!%$%k$K=jB0$9$k$N$+!"(B
+$B$=$7$F%U%!%$%k$N$I$N$h$&$JItJ,$,0[$J$k$N$+$,$o$+$j$d$9$$$G$7$g$&!#(B
+
+$B%Q%C%A$H$OMW$O!"<!$N$h$&$K$7$F$3$&$$$C$?=PNO$r%U%!%$%k$K<}$a$?$b$N$G$9!#(B
+
+\begin{commandline}
+nori1[3:58]% diff -u file1.txt file2.txt > file.diff saba:~/tmp/q
+\end{commandline}
+
+$B$?$@$7!"A4$/1o$N$J$$(B2$B$D$N%U%!%$%k$G$"$l$P:9J,$O$o$6$o$6%U%!%$%k$K<}$a$kI,MW$O$J$$$G$7$g$&!#(B
+$B$o$6$o$6%Q%C%A$r:n at .$9$k$N$O!"(B
+$B%U%!%$%k$KJQ99$r2C$($kA08e$N:9J,$r8+$?$j!"(B
+$B8e$G>R2p$9$k$h$&$K5!3#E*$J=hM}$GJQ99$r2C$($i$l$k$h$&$K$7$?$j$9$k$?$a$G$9!#(B
+$B$=$3$G!"(B
+$B$3$3$^$G$O(B\texttt{file1.txt}$B$H(B\texttt{file2.txt}$B$OL51o$N%U%!%$%k$H$7$F$-$^$7$?$,!"(B
+$B$3$3$+$i$O(B\texttt{file1.txt}$B$r2~JQ$7$?$b$N$,(B\texttt{file2.txt}$B$G$"$k$H9M$($F$/$@$5$$!#(B
+$B$D$^$j(B\texttt{file1.txt}$B$,2~JQA0$N%U%!%$%k$G!"(B
+\texttt{file2.txt}$B$,2~JQ8e$N%U%!%$%k!"(B
+$B%Q%C%A(B\texttt{file.diff}$B$K$O(B\texttt{file1.txt}$B$r(B\texttt{file2.txt}$B$K$9$k$?$a$NJQ99$,4^$^$l$F$$$k!"(B
+$B$H9M$($F$/$@$5$$!#(B
+
+$B$5$F!":n at .$7$?%Q%C%A$O!"(B\texttt{patch}$B%3%^%s%I$rMQ$$$F!"(B
+$B$=$NCf$K4^$`JQ99$r3:Ev%U%!%$%k$K(B\textbf{$BE,MQ$9$k(B} (\textbf{$BEv$F$k(B}) $B$3$H$,$G$-$^$9!#(B
+
+\begin{commandline}
+nori1[4:00]% patch < file.diff saba:~/tmp/q
+patching file file1.txt
+\end{commandline}
+
+$B$3$&$7$F(B\texttt{file1.txt}$B$NFbMF$O(B\texttt{file2.txt}$B$NFbMF$HF10l$K$J$j$^$9!#(B
+
+\begin{commandline}
+nori1[4:01]% cat file1.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$P$S$V$Y$\(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+nori1[4:02]% cmp file1.txt file2.txt saba:~/tmp/q
+\end{commandline}
+
+$B$^$?!"(B\texttt{-R}$B%*%W%7%g%s$r;XDj$7$F5U8~$-$KEv$F$k$3$H$b$G$-$^$9!#(B
+
+\begin{commandline}
+nori1[4:18]% patch -R < file.diff saba:~/tmp/q
+patching file file1.txt
+nori1[4:19]% cat file1.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$+$-$/$1$3(B
+$B$5$7$9$;$=(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$O$R$U$X$[(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+\end{commandline}
+
+\texttt{file1.txt}$B$NFbMF$O85$KLa$j$^$7$?!#(B
+
+$B%Q%C%A$OI,$:$7$b$&$^$/Ev$?$i$J$$$3$H$rK:$l$F$O$J$j$^$;$s!#(B
+$B<!$N$h$&$K!"(B\texttt{file1.txt}$B$N(B2$B9TL\$r<j85$G2~JQ$7$?$H$7$^$9!#(B
+
+\begin{commandline}
+nori1[5:29]% cat file1.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$,$.$0$2$4(B
+$B$5$7$9$;$=(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$O$R$U$X$[(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+\end{commandline}
+
+$B$3$l$K at hDx$N%Q%C%A$rEv$F$h$&$H$9$k$H<!$N$h$&$K%(%i!<$K$J$j$^$9!#(B
+
+\begin{commandline}
+nori1[5:30]% patch < file.diff saba:~/tmp/q
+patching file file1.txt
+Hunk #1 FAILED at 1.
+1 out of 1 hunk FAILED -- saving rejects to file file1.txt.rej
+\end{commandline}
+
+$B$3$l$O!"<j85$GM?$($?JQ99$H%Q%C%A$,2C$($?$$JQ99$,6%9g$7$F$$$k$+$i$G$9!#(B
+
+$B$b$A$m$s!"(B\texttt{file1.txt}$B$N(B2$B9TL\$r2~JQ$9$kBe$o$j$K!"(B
+$B<!$N$h$&$K:G=*9T$K(B1$B9T2C$($?$H$7$^$9!#(B
+
+\begin{commandline}
+nori1[5:32]% cat file1.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$+$-$/$1$3(B
+$B$5$7$9$;$=(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$O$R$U$X$[(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+$B$`$U$U$U$U(B
+\end{commandline}
+
+$B$3$N>l9g!"(B
+$B<j85$G2C$($?JQ99$O%Q%C%A$,4^$`JQ99$H$OHo$i$J$$$N$G!"%Q%C%A$O$&$^$/Ev$?$j$^$9(B\footnote{$B$?$@$7$"$/$^$G7A<0E*$K$G$"$C$F!"0UL#E*$KE, at Z$+$I$&$+$O3NG'$9$kI,MW$,$"$j$^$9!#(B}$B!#(B
+
+\begin{commandline}
+nori1[5:36]% patch < file.diff saba:~/tmp/q
+patching file file1.txt
+nori1[5:52]% cat file1.txt saba:~/tmp/q
+$B$"$$$&$($*(B
+$B$P$S$V$Y$\(B
+$B$?$A$D$F$H(B
+$B$J$K$L$M$N(B
+$B$^$_$`$a$b(B
+$B$d!!$f!!$h(B
+$B$i$j$k$l$m(B
+$B$o!!$r!!$s(B
+$B$`$U$U$U$U(B
+\end{commandline}
+
+$B$3$l$^$G$O(B1$B$D$N%U%!%$%k$NJQ99$r(B1$B$D$N%Q%C%A$K<}$a$F$-$^$7$?$,!"(B
+1$B$D$N%Q%C%A$KJ#?t$N%U%!%$%k$NJQ99$r<}$a$k$3$H$b2DG=$G$9!#(B
+$B0J2<$O!"(B\texttt{diff}$B$K(B\texttt{-r}$B%*%W%7%g%s$rEO$7$F!"(B
+$BFbMF$N0lIt$,0[$J$k(B2$B$D$N%U%!%$%k$r4^$`(B2$B$D$N%G%#%l%/%H%j$N:9J,$r%Q%C%A$H$7$F=PNO$5$;$?Nc$G$9!#(B
+
+\begin{commandline}
+nori1[5:14]% diff -ur skkdic.orig skkdic > skkdic.diff saba:~/tmp
+nori1[5:14]% cat skkdic.diff saba:~/tmp
+diff -ur skkdic.orig/debian/changelog skkdic/debian/changelog
+--- skkdic.orig/debian/changelog Fri Dec 15 03:36:49 2006
++++ skkdic/debian/changelog Mon Dec 25 17:39:10 2006
+@@ -1,5 +1,7 @@
+ skkdic (20061130-2~pre1) unstable; urgency=low
+
++ * debian/rules: Pass the `-k' option to dh_installchangelogs so that
++ all of ChangeLog* are installed equally.
+ * debian/skkdic{,-cdb,-extra}.docs: Deleted since their settings are
+ now moved into debian/rules.
+
+diff -ur skkdic.orig/debian/rules skkdic/debian/rules
+--- skkdic.orig/debian/rules Fri Dec 15 03:36:49 2006
++++ skkdic/debian/rules Mon Dec 25 17:39:10 2006
+@@ -2,6 +2,7 @@
+ include /usr/share/cdbs/1/rules/debhelper.mk
+ include /usr/share/cdbs/1/class/makefile.mk
+
++DEB_DH_INSTALLCHANGELOGS_ARGS := -k
+ DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
+ DEB_INSTALL_DOCS_ALL := ChangeLog.* READMEs/committers.txt
+
+\end{commandline}
+
+$B0J>e$G4JC1$J%Q%C%A$N at bL@$O=*$o$j$G$9!#(B
+$B$3$&$$$C$?%Q%C%A$O!"(B
+$B=$@5$7$?ItJ,$r3NG'$7$?$jB>?M$H=$@5FbMF$r$d$j$H$j$7$?$j$9$k$N$KHs>o$KJXMx$G!"(B
+$B3+H/:n6H$O$3$l$J$7$G$O$d$C$F$$$1$J$$$H8@$C$F$b2a8@$G$O$J$$$G$7$g$&!#(B
+$B<B:]$K;H$&$KEv$?$C$F$O(Bpatch(1)$B$d(Bdiff(1)$B$r;2>H$9$k$3$H$r$*4+$a$7$^$9!#(B
+
+\subsubsection{$B%Q%C%A4IM}%D!<%k$H$O(B}
+
+$B:#2s at bL@$9$k(Bquilt$B$O%Q%C%A4IM}%D!<%k$G$9!#(B
+$B$3$l$O!"J#?t$N%Q%C%A$r4IM}$9$k$?$a$N$b$N$G$9!#(B
+$B$I$N$h$&$J>l9g$KI,MW$K$J$k$N$G$7$g$&(B?
+
+$B at hDx%Q%C%A$H$O!V=$@5$7$?ItJ,$r3NG'$7$?$jB>?M$H=$@5FbMF$r$d$j$H$j$7$?$j$9$k$N$KHs>o$KJXMx!W$@$H=q$-$^$7$?!#(B
+$B$=$N8 at MU$K4p$E$1$P!"0lHL$K$O%Q%C%A$H$O;H$$<N$F$N0l;~%U%!%$%k$GC;<wL?$G$9!#(B
+$B4IM}$9$kI,MW$O$"$j$^$;$s!#(B
+
+$B$7$+$7!"0J2<$N$h$&$J%1!<%9$r9M$($F$_$F$/$@$5$$!#(B
+\begin{itemize}
+ \item $B$"$kCDBN$,%=%U%H%&%'%"(Bfoo$B$r8x3+$7!"Dj4|E*$K%j%j!<%9$7$F$$$k!#(B
+ \item A$B$5$s$O(Bfoo$B$r2~JQ$7$F;H$C$?$j:FG[I[$7$?$j$9$kI,MW$,$"$k!#(B
+ \item A$B$5$s$N2~JQFbMF$K$OJ#?t$NO at M}E*$K0[$J$kJQ99$,:.$6$C$F$*$j!"(Bfoo$B$K<h$j9~$^$l$k$b$N$b$"$l$P<h$j9~$^$l$J$$$b$N$b$"$k!#(B
+\begin{itemize}
+ \item foo$B$N%P%0$N=$@5(B1 ($B>.$5$JJQ99$J$N$G<!$N%^%$%J!<%j%j!<%9$GE,MQ$5$l$k!#(B)
+ \item foo$B$N%P%0$N=$@5(B2 ($BBg$-$a$NJQ99$J$N$G<!$N%a%8%c!<%j%j!<%9$^$GE,MQ$5$l$J$$!#(B)
+ \item foo$B$N%P%0$N=$@5(B3 ($B%P%0$r2sHr$9$k$?$a$N(BA$B$5$sFH<+$N<!A1:v$G!"3+H/85$+$i$N%j%j!<%9$G$OE,MQ$5$l$J$$!#(B)
+ \item :
+ \item foo$B$N%P%0$N=$@5(BN
+ \item A$B$5$s$N4D6-$K9g$o$;$k$?$a$N(BMakefile$B$N=$@5(B
+\end{itemize}
+\end{itemize}
+
+A$B$5$s$,A4BN$NJQ99$r(B1$B$D$N%Q%C%A$H$7$F4IM}$9$k$N$OIT2DG=$K6a$$$G$7$g$&!#(B
+foo$B$N?7$7$$%j%j!<%9$,=P$?$H$-$K!"(B
+$B85$N%Q%C%A$rEv$F$F$b(B ($B$&$^$/Ev$?$kItJ,$b$"$k$G$7$g$&$,(B) $B4V0c$$$J$/$&$^$/Ev$?$j$^$;$s!#(B
+$B$7$+$bJ#?t$NJQ99$,:.$6$C$F$$$k$N$G$=$l$r2r7h$9$k$N$OHs>o$KBgJQ$G$7$g$&!#(B
+
+$BJQ99$rJ#?t$NO at M}E*$J%Q%C%A$KJ,3d$9$l$P!">/$7$O4IM}$,3Z$K$J$k$G$7$g$&!#(B
+1$B$D$:$D%Q%C%A$rEv$F!"$&$^$/Ev$?$k$b$N$HEv$?$i$J$$$b$N$r6hJL$G$-$^$9!#(B
+$BEv$?$i$J$$$b$N$N$&$A!"(B
+$B4{$K3+H/85$G2C$($i$l$?=$@5$N%Q%C%A$O:o=|$7!"(B
+$B;D$9$Y$-$J$N$KB>$NJQ99$N1F6A$GItJ,E*$K$&$^$/Ev$?$i$J$$%Q%C%A$O$&$^$/Ev$?$k$h$&D4 at 0$7$^$9!#(B
+$B$=$l$i$N:n6H$OLLE]$+$b$7$l$^$;$s$,!"(B
+1$B$D$N%Q%C%A$H$7$F4IM}$9$k$N$KHf$Y$l$P3Z$G$7$g$&!#(B
+$B$?$@$7!":n6HCf$K!"(B
+$B8=:_$I$N%Q%C%A$,Ev$?$C$F$$$F$I$l$,Ev$?$C$F$$$J$$$+$r0l!93P$($F$*$+$J$1$l$P$J$i$J$$$N$,BgJQ$G$9!#(B
+
+$B$=$3$GEP>l$9$k$N$,%Q%C%A4IM}%D!<%k$G$9!#(B
+$B%Q%C%A4IM}%D!<%k$O!"J#?t$N%Q%C%A$N<h$j07$$$r3Z$K$9$k$?$a$N%D!<%k$G$9!#(B
+$B6qBNE*$K$O!"$I$N%Q%C%A$,Ev$?$C$F$*$j$I$l$,Ev$?$C$F$$$J$$$+$r4IM}$G$-$^$9!#(B
+$B$^$?!"0lEY$KJ#?t$N%Q%C%A$rEv$F$?$j30$7$?$j$G$-$k$N$G!"(B
+$BA4$F$N(B ($B$"$k$$$O$"$k0l72$N(B) $B%Q%C%A$,$&$^$/Ev$?$k$+$I$&$+$r354Q$9$k$N$b3Z$K$G$-$^$9!#(B
+A$B$5$s$,$d$C$F$$$k$h$&$J:n6H$K$O$&$C$F$D$1$N%D!<%k$G$9!#(B
+
+$B$5$F!"<B$O(BDebian$B%Q%C%1!<%8$N%a%s%F%J(B ($BJ]<iC4Ev<T(B) $B$O$3$N(BA$B$5$s$N$h$&$J:n6H$r$9$kI,MW$,$"$j$^$9!#(B
+$B$9$J$o$A!"(B
+$B3+H/85$N%j%j!<%9$KJ#?t$N%Q%C%A$rFH<+$KEv$F!"$=$l$i$r4IM}$9$kI,MW$,$"$k$N$G$9!#(B
+$B$H$$$&$N$b!"(B
+$B0lHL$K3+H/85$H(BDebian$B$H$G$O%j%j!<%9%5%$%/%k$dIJ<A$N4p=`$,0[$J$k$+$i$G$9!#(B
+$B4IM}$9$Y$-%Q%C%A$O!"%=%U%H%&%'%"$N5,LO$,Bg$-$/$J$l$P$J$k$[$IA}$($k$G$7$g$&!#(B
+$B$=$3$G(BDebian$B%Q%C%1!<%8%a%s%F%J$O%Q%C%A4IM}%D!<%k$r;HMQ$9$k$3$H$,?d>)$5$l$F$$$^$9!#(B
+
+$B$3$3$G$O(Bquilt$B$r;HMQ$7$?%Q%C%A4IM}$r>R2p$7$^$9!#(B
+Debian$B$G$h$/;H$o$l$k%Q%C%A4IM}%D!<%k$K$O!"(Bdpatch$B$H$$$&$b$N$b$"$j$^$9!#(B
+$B$3$A$i$O(BDebian$B%Q%C%1!<%8%a%s%F%J%s%9$KFC2=$7$?%D!<%k$G$9$,!"(B
+$B5!G=E*$K$O(Bquilt$B$H$=$s$J$K0c$$$O$"$j$^$;$s!#(B
+$B6=L#$,$"$kJ}$O!"(B2005$BG/(B7$B7nJY6/2q(B\footnote{\url{http://www.netfort.gr.jp/~dancer/column/2005-debianmeeting.html.ja\#6th}}$B$N;qNA$r;2>H$7$F$/$@$5$$!#(B
+
+\subsection{$B%$%s%9%H!<%k(B}
+
+quilt$B$O!"(BDebian$B$G$O(B\texttt{quilt}$B%Q%C%1!<%8$K4^$^$l$F$*$j!"(B
+\texttt{apt-get}$B$d(B\texttt{aptitude}$B$GIaDL$K%$%s%9%H!<%k$G$-$^$9!#(B
+
+\subsection{quilt$B$N4pK\A`:n(B}
+
+\subsubsection{$B:G=i$KCN$C$F$*$/$Y$-$3$H(B}
+
+quilt$B$G$O0lHL$K!"(B\texttt{quilt <$B%3%^%s%I(B>}$B$H$$$&=q<0$GMM!9$J%3%^%s%I$,MxMQ$G$-$^$9!#(B
+$BMxMQ2DG=$J%3%^%s%I$N0lMw$O<!$N$h$&$K$7$F;2>H$G$-$^$9!#(B
+
+\begin{commandline}
+nori1[13:19]% quilt --help whale:~
+$B;H$$J}(B: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ...
+ quilt --version
+$B%3%^%s%I0lMw(B:
+ add files import previous setup
+ annotate fold mail push snapshot
+ applied fork new refresh top
+ delete graph next remove unapplied
+ diff grep patches rename upgrade
+ edit header pop series
+
+$BA4%3%^%s%I6&DL%*%W%7%g%s(B:
+
+--trace
+ $B%3%^%s%I$r(Bbash$B$N%H%l!<%9%b!<%I(B(-x)$B$G<B9T!#FbIt%G%P%C%0MQ!#(B
+
+--quiltrc file
+ ~/.quiltrc ($BB8:_$7$J$$>l9g$OBe$o$j$K(B /etc/quiltrc) $B0J30$N%3%s(B
+ $B%U%#%.%e%l!<%7%g%s%U%!%$%k$r;XDj!#FbMF$N>\:Y$K$D$$$F$O(B PDF$B$N%I(B
+ $B%-%e%a%s%H$r;2>H!#(B
+
+--version
+ $B%P!<%8%g%s>pJs$r=PNO$7$F=*N;!#(B
+\end{commandline}
+
+$B$^$?3F%3%^%s%I$N%X%k%W%a%C%;!<%8$O3F%3%^%s%I$K(B\texttt{-h}$B%*%W%7%g%s$r;XDj$9$l$PI=<($G$-$^$9!#(B
+$B0J2<$NNc$G$O(B\texttt{quilt add}$B$N%X%k%W%a%C%;!<%8$rI=<($5$;$F$$$^$9!#(B
+
+\begin{commandline}
+nori1[13:45]% quilt add -h whale:~
+Usage: quilt add [-P patch] {file} ...
+
+Add one or more files to the topmost or named patch. Files must be
+added to the patch before being modified. Files that are modified by
+patches already applied on top of the specified patch cannot be added.
+
+-P patch
+ Patch to add files to.
+\end{commandline}
+
+\subsubsection{$B%Q%C%A%9%?%C%/(B}
+
+$B<B:]$K(Bquilt$B$r;H$&A0$K!"(Bquilt$B$N%G!<%?9=B$$rCN$C$F$*$-$^$7$g$&!#(B
+quilt$B$O!"$"$k%D%j!<$KBP$9$k0lO"$N%Q%C%A$r0lNs$KJB$Y$F%9%?%C%/$H$7$F4IM}$7$^$9!#(B
+
+$B$"$k%=!<%9%D%j!<$K!"0J2<$N$h$&$J(B5$B$D$N%Q%C%A$r=g$K2C$($?$$$H$7$^$9!#(B
+
+\begin{enumerate}
+ \item r1091-remove-trailing-garbage.diff
+ \item r1092-implement-distclean.diff
+ \item r1094-add-readme.diff
+ \item fix-ftbfs-on-m68k.diff
+ \item work-around-an-error-of-libtool.diff
+\end{enumerate}
+
+$B$3$N$H$-!"(B
+$B$3$l$i$N%Q%C%A$O(B\textbf{patches$B%G%#%l%/%H%j(B}$B$K4^$^$l$F$$$J$1$l$P$J$j$^$;$s!#(B
+$B$=$7$F!"%Q%C%A$N at 0Ns=g=x$r<}$a$?<!$N$h$&$JFbMF$N(B\textbf{series$B%U%!%$%k(B}$B$,%Q%C%A%G%#%l%/%H%j$K4^$^$l$F$$$kI,MW$,$"$j$^$9!#(B
+
+\begin{screen}
+\begin{verbatim}
+r1091-remove-trailing-garbage.diff
+r1092-implement-distclean.diff
+r1094-add-readme.diff
+fix-ftbfs-on-m68k.diff
+work-around-an-error-of-libtool.diff
+\end{verbatim}
+\end{screen}
+
+$B$D$^$j8=:_$O<!$N$h$&$K$J$C$F$$$kI,MW$,$"$j$^$9!#(B
+
+\begin{commandline}
+nori1[14:22]% ls patches/* whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+patches/fix-ftbfs-on-m68k.diff
+patches/r1091-remove-trailing-garbage.diff
+patches/r1092-implement-distclean.diff
+patches/r1094-add-readme.diff
+patches/series
+patches/work-around-an-error-of-libtool.diff
+nori1[14:22]% cat patches/series whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+r1091-remove-trailing-garbage.diff
+r1092-implement-distclean.diff
+r1094-add-readme.diff
+fix-ftbfs-on-m68k.diff
+work-around-an-error-of-libtool.diff
+\end{commandline}
+
+quilt$B$N%Q%C%A%G!<%?$O$3$l$,A4$F$G$9!#(B
+
+$B$J$*$3$N%G!<%?9=B$$O!"(B
+\ref{subsubsec:quilt-create-patch}$B$G8e=R$9$k%Q%C%A:n at .:n6H;~$K(Bquilt$B$,<+F0E*$K:n at .$7$F$/$l$k$N$G!"(B
+$BDL>o$O<j$G$$$8$kI,MW$O$"$j$^$;$s!#(B
+$B<!$N%;%/%7%g%s$G$O!"(B
+$B$3$N$h$&$J(Bpatches$B%G%#%l%/%H%j$r4{$K$b$C$?%D%j!<$G%Q%C%A$rEv$F$?$j30$7$?$j$7$F$_$^$7$g$&!#(B
+
+\subsubsection{$B%Q%C%A%9%?%C%/$NA`:n(B}
+
+$B$5$F!"$G$O(Bquilt$B$r;H$C$F$_$^$9!#(B
+$B$^$:$O%9%?%C%/4IM}$N$?$a$NA`:n$rD/$a$F$_$^$7$g$&!#(B
+$B%9%?%C%/4IM}$KI,MW$JA`:n$O!"$b$A$m$s(Bpush$B$H(Bpop$B$G$9!#(B
+
+$B:G=i$O2?$b%Q%C%A$,Ev$?$C$F$$$J$$$H$7$^$9!#(B
+$B$3$N>uBV$G(B\texttt{quilt push}$B$r<B9T$9$k$H!"(B
+1$BHVL\$N%Q%C%A!"$D$^$j(B (\texttt{r1091-remove-trailing-garbage.diff}) $B$,Ev$?$j$^$9!#(B
+$B$3$N%Q%C%A$O(B\texttt{Makefile.in}$B$K=$@5$r2C$($k$b$N$G$9!#(B
+
+\begin{commandline}
+nori1[14:30]% quilt push whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+Applying patch r1091-remove-trailing-garbage.diff
+patching file Makefile.in
+
+Now at patch r1091-remove-trailing-garbage.diff
+\end{commandline}
+
+$B$-$A$s$HEv$?$C$?$h$&$G$9$M!#(B
+\texttt{quilt push}$B$O!"0z?t$rM?$($J$1$l$P!V<!$N%Q%C%A!W$rEv$F$k%3%^%s%I$G$9!#(B
+$B$3$l$G8=:_%D%j!<$O!"(B
+\texttt{r1091-remove-trailing-garbage.diff}$B$@$1$,Ev$?$C$?>uBV$K$J$j$^$7$?!#(B
+
+$B$b$&0lEY(B\texttt{quilt push}$B$r<B9T$7$^$9!#(B
+
+\begin{commandline}
+nori1[15:08]% quilt push whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+Applying patch r1092-implement-distclean.diff
+patching file Makefile.in
+
+Now at patch r1092-implement-distclean.diff
+\end{commandline}
+
+$B<!$N%Q%C%A(B\texttt{r1092-implement-distclean.diff}$B$bEv$?$j$^$7$?!#(B
+$B$3$l$r!V(B\texttt{r1092-implement-distclean.diff}$B$,(B\textbf{$B0lHV>e$KMh$?(B}$B>uBV!W$H8@$&$3$H$K$7$^$7$g$&!#(B
+$B%9%?%C%/(B (stack) $B$H$O1Q8l$G!V at Q$_=E$M$?$b$N!W$N0UL#$G$9!#(B
+push$BA`:n$G$O$=$N>e$K$b$N(B (quilt $B$G$O%Q%C%A(B) $B$r<!!9$K:\$;$F$$$/$N$G!"(B
+$B!V%Q%C%A!{!{$^$GEv$F$i$l$?>uBV!W$O!"(B
+$B8@$$49$($l$P!V%Q%C%A!{!{$,0lHV>e$KMh$?>uBV!W$G$9!#(B
+
+push$B$N5U$O(Bpop$B$G$9!#(B
+$B$9$J$o$A8=:_0lHV>e$K$"$k%Q%C%A$r30$9$N$O(B\texttt{quilt pop}$B$G$9!#(B
+
+\begin{commandline}
+nori1[15:15]% quilt pop whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+Removing patch r1092-implement-distclean.diff
+Restoring Makefile.in
+
+Now at patch r1091-remove-trailing-garbage.diff
+nori1[15:15]% quilt pop whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+Removing patch r1091-remove-trailing-garbage.diff
+Restoring Makefile.in
+
+No patches applied
+\end{commandline}
+
+\texttt{quilt push}$B$d(B\texttt{quilt pop}$B$K0z?t$H$7$F%Q%C%AL>$rM?$($k$H!"(B
+$B$=$N%Q%C%A$,0lHV>e$KMh$?>uBV$K$J$k$h$&$K0lO"$N%Q%C%A$rEv$F$?$j30$7$?$j$7$^$9!#(B
+$B$^$?0z?t$H$7$F?tCM$rM?$($k$H!"$=$N?t$@$1%Q%C%A$rEv$F$?$j30$7$?$j$G$-$^$9!#(B
+\texttt{-a}$B$r%*%W%7%g%s$H$7$F;XDj$9$k$HA4$F$N%Q%C%A$rEv$F$?$j30$7$?$j$G$-$^$9!#(B
+
+\begin{commandline}
+nori1[15:17]% quilt push 3 whale:~/svnwc/deb/serf/trunk/serf-0.1.0
+Applying patch r1091-remove-trailing-garbage.diff
+patching file Makefile.in
Reached max line limit 500!
More information about the Tokyodebian-commits
mailing list