[Pkg-opt-media-team] [SCM] dvd+rw-tools packaging branch, master, updated. debian/7.1-6-24-g6e7912b

Mon Nov 8 01:03:48 UTC 2010

The following commit has been merged in the master branch:
commit d3048784567aefe73d0a3d87f8c4d028410115d1
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Sat Nov 6 17:08:03 2010 -0200

    Drop sharutils from build-dependencies.
    
    With the debian format "3.0 (quilt)", there's no need to continue the
    uuencode/uudecode dance to avoid having binary files in diffs. So, let's
    take advantage of this and make things simpler.

diff --git a/debian/control b/debian/control
index 7ee6318..af4b3d0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7),
 	       libcam-dev [kfreebsd-i386 kfreebsd-amd64],
-	       m4,
-	       sharutils
+	       m4
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvd%2Brw-tools.git
 Vcs-Git: git://git.debian.org/pkg-opt-media/dvd+rw-tools.git
diff --git a/debian/docs/isofs4gb.gif b/debian/docs/isofs4gb.gif
new file mode 100644
index 0000000..5d00b48
Binary files /dev/null and b/debian/docs/isofs4gb.gif differ
diff --git a/debian/docs/isofs4gb.gif.uee b/debian/docs/isofs4gb.gif.uee
deleted file mode 100644
index 229e0e7..0000000
--- a/debian/docs/isofs4gb.gif.uee
+++ /dev/null
@@ -1,65 +0,0 @@
-begin 644 isofs4gb.gif.uue
-M1TE&.#EAD``[`?,`,?______9O_,``#_``"9_[L```"J`,#`P```````````
-M`````````````````````"'Y!`$`````+`````"0`#L!0`3_$,CYCKTXZ\V[
-M_V#(/5-IGFBJ`I7HOG`<DVMMJX^@[[R0ZS_>(]@K&GW#HQ)H)"Z/M)M4ZGQ:
-MK]AL-=N<>FU;KGA,+ at ._Z%38S&Z[?>EXZ1&@#P-U.OZ>U^/[>76!@X-#>GQV
-M=GM_C(V.C7Z/=7*4AI:7F)F:FYR=GI^?)E&48#*FIZ at PHRRD5*FOL+$'JZNM
-M:@.XN;J[O+V^O\#!PK\/P21#ME/%Q;J&N,O#T=+3T<S$-;6VULS.0\_/UN#0
-MW\[4YM7&V,FB!NWN[_#Q\O/T]?;W^/.THNMS^?\``PH<N&]./PH#$RI<&+`@
-MA8,26LB:2#&$PX at 0653<R%'#1580_Q\0&$FRI,F3*%..%*FRI<N7,$M&R9:M
-M%<N8.'/JW*FSYL.0/(,*'=I3'5"B2),J]8GQJ-*G4',R!7E08L>K%*=.C6,5
-MJ]=76C.&&_N-6"YOR\*=];9+;;-SO=RVS0@&KMV[>`?(;<:/[IRR>LN.>YNW
-ML+2]9_OZC<BPL>/'!C[2?0!Y(>7*"26+Q<RY,SW-(;^"Z"K:H^+%I$MC2*W:
-M`NBJ)&_>7&IR=DK9)VT3P"U3Y>RM8J,*'^Y[,0[BR),#=YJ\^=/EL)U+3PJ]
-M'^O6V$<85Y.]^^CM**Y[]UY]G?CQV<LG6[,CQX_W3.##]X$D2?O[ENC?%Z)_
-MOGPLZFGSQO^`!)H1H$T%)JB@%0>2`LJ#$$8HX83(@">*((SP00B&?QBR2"2$
-M:(@A(I"(*,F)BZ#XFG4+MNAB>Z?Y=1YZK:UH'HTXNA;C9&>ME59@;!DF)#K`
-M-%C)D$@FB=@S1E45&&%/<K--CU,"EB0U2^H5HY$X>.;EEQ]QJ<:79'(6YF9E
-MING8F:'E2".;5;GYYD,V<A7;G;NME"=*(NF&IYZ`]@GHGX(.NE23UDVGZ%!A
-M,;?HHS$U&AVDE+XD::*59EK<"F*&)R=ZE][X*7DLU-3I"=ST&.634+*:JB6J
-MMM5JEH>E8]!V9*FZ)*U7PI5EG=KT*NQ=O^Z(IIK(9F9L2,DV*Q#_L#91*.VT
-MU'Y2P+789HLM``5(T"VWWG:;K2MOX at BM@]6FJ^ZZEH#'VYXL_59;;_0&JJ=M
-M^.)9Z)_SWLOOJ5_XJ:FF`'LA\,"5%JP,P at RO9*$HHY+Z,`41=Z<PN:":.S'%
-MY<ZYL48=@_IQJ>R6;+(G([.G7W]!N!=?$O8AT4/+0+0LGWLXOV??SC(O<?$-
-M*C/1'LWU]2=TS#43$3//_!G"7\]!G_%QU"]6+<;/8%BM]8!88[/UUVQTS2G8
-M9(\A- at YEIPU@RB@^`F*'*;:=H=QTU_TV)&Q'<LB(<:>XM]X>@KBW('KW73<D
-M)7;B[N&,-TZWB8YS*,FYE:AMN<_+5G7Y_^9%4"['C!5OY#E7H6,W>AJ at ES[1
-MZ6BDKGHLQ]!P=D2S6CGL[:SZ,GMX@*4*).ZX%\NI6,`7+XSP.!`?*UIZ[6J6
-M\<;8FGQ(5E:95I#5MPI]7-(W]9.3VX<?J^Y;'NOL^?;`:1WZ[->COGGMNW-9
-M_.^O%__][]2O#?[\ZQ_MR0`,H"'*UZ:,>>Q[WK..N31V*P2*RH`B:V`"S2/`
-M"EJ0==@@5%3>Q:_<^&:#B#*/!N%5+T/EJU[QVI,'_64HZH1P/0UC6*A@&,.!
-MS5`;-;3A"W&8PTS=T"8]].$. at 1A$2OW0044TXA`=]+K2'+$2313-$S\7Q:],
-MD715Q,H542>^+O\6JT(6JE+S?O0C7:'%=]BK'O/(D49?=>]A at Q$'.60%)31*
-MJ1Q3$B.OCO?&W>VQBTA"W at 1YU+LS`BE7@,12']V5NS'.47MH3*3N%HDK_N$/
-M at P:SY/TPJ0Q-TB]SZ_,D^SA)!5&.$I3P,^7YHM`MGUS+6Q,05RR!ED4MSI(I
-MW_H6N'2I2T[5\BJDI.4O.1+,4 at Q3='1RUW0.]L%%S02.(TRAP/:U0A+F:0C]
-M&I0T35C-??TF94F$U.Y0%<Y'C5,4Y70F.-.YS'6RTSGGG,,[I1-/"LP3GNZ\
-M)W'J&9%C(G-J_JP(/T$64%D,U'4%M4C*$FK0A3(4%@=]*$0=*E%41+3_HA:E
-M*$9E<-&-<C1EG`NIU#:F,J+-+&Q"<P/5H`#2)[C,:/3YC]'FD]*7VK1G\3F:
-M3I&FA(->@6 at RO6E,FZ#3_;P4/T65*8-:*E*S%<BG3=T<5*-JN:E2-6U6O2K9
-MLJK5KW&UJUK[*EBK)M:QNJBL9ET06M.:H(-&[JUPC2OB5,0VQMU-<G:5:U[I
-M.K40?<AO<_V;'_X&6+YI:'!PO6N'\C8WPA46;H9M;&$'IPC(*M9N;2LF-O3*
-M6<S&];*3D*",.DO:TCH"M)H=&UO#BLKUK):UHIW,:ZV66AQ<\+;I:JTV/&J*
-MVG(G9./QK:=X.P/=VF2!!QRD6(A;W- at N%[@2_W/@9)BKBF3B"K?871<CQR?)
-M*R'OG&*T77?S(D at X]DXPS1LOL=HB(>+EZE7J76^1EGBD^-ZNO*@22W;W&R'Z
-M?DY[]BT,?HT;L.7QPGF35.^`G6N3[*'7=P8.KR35$@H&.ZB1UFMDA+F;R/(*
-M]X\!/H>'"6PP_IJXP@[\V?Q4F2S_.8C%SG)Q)2YY20)6!<;-DO'G<-QB&X>2
-MQVG2,5>`K"8AHX[&F_1Q*HE,)B.WCLEE<G+`H-QD):^'NB^0LL&P[`(M*X/+
-M(O`RQL#L`3$+D\QEMO)NT9QFT:J8S6U.\7/AO('835#%^E1.J=00G$NHL(79
-M;(EL!(7-9O()A,-SRO^@X\7HWS3ZT+O!9J$971M)W\D04-EBZZ(9*-U0NIHJ
-ME":F2RBO3/O73MJTUZA[L^H.\N;3H8XUH!EU:M3E&3F:#MBM]UGK3>]:.+DV
-MV*^!W6M=#]O4B9[4L5V8;$PMF]G34_:S:=UL$4X;*<%>V+6)DFTJ;)O;Q1;V
-MMX72;:"-F]SAUO:Y=U)N,)SXW9M(]YCIO!IYGSFX#(RV`NEMFFI?&;H6L[<Q
-M^5UO?Z\9 at L$5.#8(GH%GYC<D\(YX?ZG'83Z&.,'74"XA,6QQ#;M%PH@!<9'>
-M&,;SKBJ-B(1O[CY.I8J+F+V*P]7*'TQ'`_\.P.>5L%U&+/.+>Y>2QI&XT,'_
-MJ''PB;?C/L<Y7RQL'>[22N03!CIJ3/XJ"B<=X[83+JIF?O*:7]WK<2'Q?[\N
-M))X'?>@2%_N0J>PEK;.#[9YQNS\V66.F+QGNF)$[0O!N)K4?F>]Y]_N3`5\9
-MO3.&[DFVN_T(#QG#LX#QC0<E+U_)K6T!#?*/(0'E:R)+<)6`E_=FN.:_E0UM
-M>7Z7LQPXPV<A^5A2?ERA)[CC$4K=V:_^`K:_/>L5?_#5Y_[V=J8*:M;-D^"'
-M,=*8/N%M8%)J9@[ZFGYJ]:Q-Z,Y%K^31L<%^-I-/Z.9+.H61!G7R+UWHW51?
-M7YU>8?E1J&KQH]\2'>3FO\YO+^A[&OF at QO\U`RWK:D_[.=;O(AOY1'R1,H`$
-M:"D&>(""EH`*>!L,V("Y\8`0*!,2.($.,S46Z!('E8$+B($<Z(`>^($1&((B
-M2($D6((72%(H6!LI at W81IU&B!X,6DV\30WO,U5'XEEQPI'N[1U+(%4$^J'N[
-$$P$`.P``
-`
-end
diff --git a/debian/dvd+rw-tools.docs b/debian/dvd+rw-tools.docs
new file mode 100644
index 0000000..86d55fa
--- /dev/null
+++ b/debian/dvd+rw-tools.docs
@@ -0,0 +1,2 @@
+debian/docs/dvd-rw.html
+debian/docs/isofs4gb.gif
diff --git a/debian/rules b/debian/rules
index 2bbc977..6d4b836 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ build-stamp:
 	CFLAGS="$(CFLAGS)" $(MAKE) rpl8
 	sed -n "/^%changelog$$/,$$ p" dvd+rw-tools.spec > ChangeLog
 
-	touch build-stamp
+	touch $@
 
 install: build
 	dh_testdir
@@ -29,10 +29,6 @@ install: build
 
 	$(MAKE) install prefix=$(CURDIR)/debian/dvd+rw-tools/usr
 
-	mkdir -p debian/dvd+rw-tools/usr/share/doc/dvd+rw-tools
-	cp index.html debian/docs/dvd-rw.html debian/dvd+rw-tools/usr/share/doc/dvd+rw-tools
-	uudecode debian/docs/isofs4gb.gif.uee -o debian/dvd+rw-tools/usr/share/doc/dvd+rw-tools/isofs4gb.gif
-
 binary: binary-arch
 
 binary-arch: install
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..271191a
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/docs/isofs4gb.gif

-- 
dvd+rw-tools packaging

