From 655d0a3b0d77a2ef6157b28aace15f1becdc489e Mon Sep 17 00:00:00 2001 From: Marc Singer Date: Fri, 24 Jul 2015 08:23:32 -0700 Subject: [PATCH] Improving cleanliness. o Some files in the demo/ directory were committed and should not have been. These are removed. o Cleaning includes removing demo/ directory transients. o Debian rules explicitly perform demo/ cleanup so that source tarball is correct. o Resolves #329 --- .gitignore | 3 +++ Makefile.am | 16 +++++++++++++++- debian/rules | 8 +++++++- demo/beep.wav | Bin 844 -> 0 bytes demo/enabled.gif | Bin 847 -> 0 bytes demo/favicon.ico | Bin 2238 -> 0 bytes 6 files changed, 25 insertions(+), 2 deletions(-) delete mode 100644 demo/beep.wav delete mode 100644 demo/enabled.gif delete mode 100644 demo/favicon.ico diff --git a/.gitignore b/.gitignore index 754b06e..af3accf 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,10 @@ debian/*.debhelper debian/*.substvars debian/shellinabox/ debian/tmp/ +demo/beep.wav demo/demo.js +demo/enabled.gif +demo/favicon.ico demo/keyboard.png demo/print-styles.css demo/styles.css diff --git a/Makefile.am b/Makefile.am index 8f9b92a..2a59fe2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,7 +238,7 @@ shellinaboxd.1: ${top_srcdir}/shellinabox/shellinaboxd.man.in \ @out=`echo "$@" 2>/dev/null|sed -e 's/\.[^.]*$$/.ps/'`; \ man -Tps "./$@" >"$${out}" 2>/dev/null || rm -f "$${out}" -clean-local: +clean-local: clean-demo -rm -rf shellinaboxd.1 \ shellinaboxd.ps -rm -rf debian/shellinabox \ @@ -259,6 +259,20 @@ clean-local: shellinabox/vt100.js \ shellinabox/vt100.h +clean-demo: + -rm demo/beep.wav \ + demo/demo.js \ + demo/enabled.gif \ + demo/favicon.ico \ + demo/keyboard.png \ + demo/print-styles.css \ + demo/styles.css \ + demo/usercss-0.css \ + demo/usercss-1.css \ + demo/usercss-2.css \ + demo/usercss-3.css \ + demo/vt100.js + .css.h: @echo od "$<" '>'"$@" @mkdir -p "`dirname "$@"`" diff --git a/debian/rules b/debian/rules index eb1229a..53f3cfd 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DH_WITH=--with autotools-dev,autoreconf + +clean: + [ ! -f Makefile ] || make clean-demo + dh clean $(DH_WITH) + %: - dh $@ --with autotools-dev,autoreconf + dh $@ $(DH_WITH) # elf-2012.04.10: Since Debian manages package dependencies we can # force linkage of ssl s.t. the dependency is properly kept diff --git a/demo/beep.wav b/demo/beep.wav deleted file mode 100644 index a5ee5d9cfce517f05eb9ec6fa4d0107c44ef26f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 844 zcmZ{i!Aiq09L6hNJo*Ou4r_FFO}0T(HbG%ir-C~O;?3I*Q&3QF9()T$MP-75j;5$< z+UjifQ2vv4TiuY-Q}Tr$zwfJ-ZQGjGw9R6T?jJPfXEjZmg0C>AseekF(e`#5yYq18 zCVcPmwn1~$eD3;8v=AkDqvwQ-my0<&a}v3pe~U`l61wA_D~{pZ-063EouBnQrus$1 zc=y?)1~uBA=SB^k;(X=H`Er7lf@$lAkmnCs+pzHKhwq3}WD&d_K|b2TkUx{}U+d+? z(!!(1nK+dB)qsU8tP*0OO9AgcE!l>hd-?R8eoN+S-z;>! z@4rbtf+=dr{7b^eC;5(K{(g*aOYv=ElJH%P_?l@x9P@c2KJcgboY3We_>@1z2mb0} zz^7kGzS!TBm*!(Bf0B=qx1qn7FZL(EAMj--{Z$73B;OK^{hj~AH|9_E3;xo4ZN-O@ ze$#xaUoz@^T0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IP8AEC2ui00{sH000Oq0RIUb_^$#0f&u{?M5qwqzXAYg2=p-E Zp9cUM1}by_zyLuM3KtSoXar$E06WcRkdXiY diff --git a/demo/favicon.ico b/demo/favicon.ico deleted file mode 100644 index 116fdbc346b28105430a7b1afc1b42b22d284aaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmc&!eOSwDAOEa*=}}SERMdKrU(u;dwn}=TmB=}DMmvZlL}WbVoIMB)r%n`M7)FLaDSjU>1ddkjlr0)rZAccA1PRt}gh=%@wZhZg69|!+qLRO!Z)b=`jt{rhCAHJss0MSzvjw z!S?oqr?(fpW_ZKfX9i~Y`XIn>27LTxVy3?@d;|R87vPUT|5@;#6@Y-*voI%U7G?(p zA~2W(&YU0wg#;sXE(gJL=U~p<5X=vmhmg>@m^Xi(9^nZ6Wj?s!^YL@|FW`p#iZE_C z!WaAsZo~pCtZ2@Ta9&sIK*vOkM$b`5d3=sHf-96P4Szt`S*Cl z|FH#Igui3Ea4Y`UDui&`f3S7?Hf-Cm9f>=)V*Abn>`2^+ouXaXwL1}sq9i2l5ka(f zH+KKI2YZtCVsG-FNJ>dY^1i?D*Zvfwr0&DMwEfthdKjq((~y>a00$4JBmKxB91550Z7t8x-1;2P+gkAI zMKfAnw4$}W4Q(%9;Ki$Uw5wj?^{WoN{QDJDuRHK}=WD#ysG)w-iB3%qI=eK`bicuy zw_WIZt3_8&H@e@y!@J%d^l0DXL*F~R@9Rac_7i&hwdniMkNyu|(En)w1A`y&@$)AP ze*KKkx-ao-8;<)OE)(M2I0r$uUxZs-3Gz7M6o!tSVqcj-D~I_(hV3f9O-m>_PoUlc|SZX z=L-GrCBo=41#cBa=3yWl9DEMS8IokN~IA@Crc9}x{a%=r>DM^aP^uW zCETA$YWm-{4p68z#1t#KnYrG?!ssaeg4rx$Du)}FDyiTCrp=CH#8}$GKJx6@37bevGj45PS-^-AqWd=7k_^8W%<+EYO+BliePz%#fdVc zkKcS9(ooEu92g8&?&b_xtx|e0NqJ*u7>DzlAWc$O_eS@zn?ffDM`t!aK|(f@8L?sF zebF4Bxyyy=lADd)x&y)oC>pDnT%roTyzAvO%6Nj^i&}60;@sn4YfF4Cwkh zDF%*A7Aq)HC@!gf@<5W2utSs}K9eael`FbG557}VsC0Lhw?A*=0ZD~iULnnvoWGDO zExt=Ow7=DARh<-y>12){hpT@S1+oV1$_FW}%C zwkT??P`FPlkrZ7oDv^~{$rb9>=KAKoFLVntLo;{I0zN-3J|R_n@|;8}m6pjBEzPx+ z^{PP~)rw(Gr!&L&v2oi(NhyaU=W`27$g29?J;LwQ3nDy~ncO|7AJzrS$tWBwS((&=fC-8qv F{{;=3Z?pga