From c52aa33b7b2a50b8b3a182a2ccb1fa83863c09a7 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Thu, 28 Dec 2006 22:52:47 +0000
Subject: [PATCH] pusb_adm -> pusb_conf

---
 fetch_doc.rb                  |   2 +-
 pam_usb/Makefile              |   8 ++++----
 pam_usb/doc/CONFIGURATION     |   2 +-
 pam_usb/doc/INSTALLATION      |   8 ++++----
 pam_usb/doc/pusb.conf-dist    |   2 +-
 pam_usb/doc/pusb_adm.1.gz     | Bin 722 -> 0 bytes
 pam_usb/doc/pusb_check.1.gz   | Bin 840 -> 840 bytes
 pam_usb/doc/pusb_conf.1.gz    | Bin 0 -> 724 bytes
 pam_usb/doc/pusb_hotplug.1.gz | Bin 607 -> 607 bytes
 9 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 pam_usb/doc/pusb_adm.1.gz
 create mode 100644 pam_usb/doc/pusb_conf.1.gz

diff --git a/fetch_doc.rb b/fetch_doc.rb
index 9a8aca3..f498c59 100755
--- a/fetch_doc.rb
+++ b/fetch_doc.rb
@@ -11,7 +11,7 @@ require 'open-uri'
 BASE_URI = 'http://www.pamusb.org/wiki/doc/'
 DOC_PATH = './pam_usb/doc/'
 DOCS = [ 'installation', 'upgrading', 'configuration', 'faq' ]
-MANS = [ 'pusb_hotplug', 'pusb_adm', 'pusb_check' ]
+MANS = [ 'pusb_hotplug', 'pusb_conf', 'pusb_check' ]
 
 REPLACE_LIST = [
 	# Remove wiki links [[link|name]]
diff --git a/pam_usb/Makefile b/pam_usb/Makefile
index 76f8b4b..70a6032 100644
--- a/pam_usb/Makefile
+++ b/pam_usb/Makefile
@@ -32,7 +32,7 @@ PUSB_CHECK_OBJS	:= $(PUSB_CHECK_SRCS:.c=.o)
 PUSB_CHECK	:= pusb_check
 
 # Tools
-PUSB_ADM	:= tools/pusb_adm
+PUSB_CONF	:= tools/pusb_conf
 PUSB_HOTPLUG	:= tools/pusb_hotplug
 TOOLS_DEST	:= $(DESTDIR)/usr/bin
 
@@ -45,7 +45,7 @@ DOCS		:= doc/INSTALLATION doc/CONFIGURATION doc/UPGRADING doc/FAQ
 DOCS_DEST	:= $(DESTDIR)/usr/share/doc/pamusb
 
 # Man
-MANS		:= doc/pusb_adm.1.gz doc/pusb_hotplug.1.gz doc/pusb_check.1.gz
+MANS		:= doc/pusb_conf.1.gz doc/pusb_hotplug.1.gz doc/pusb_check.1.gz
 MANS_DEST	:= $(DESTDIR)/usr/share/man/man1
 
 # Binaries
@@ -74,13 +74,13 @@ clean		:
 install		: all
 		$(MKDIR) -p $(CONFS_DEST) $(DOCS_DEST)
 		$(INSTALL) -m644 $(PAM_USB) $(PAM_USB_DEST)
-		$(INSTALL) -m755 $(PUSB_CHECK) $(PUSB_ADM) $(PUSB_HOTPLUG) $(TOOLS_DEST)
+		$(INSTALL) -m755 $(PUSB_CHECK) $(PUSB_CONF) $(PUSB_HOTPLUG) $(TOOLS_DEST)
 		$(INSTALL) -m644 $(CONFS) $(CONFS_DEST)
 		$(INSTALL) -m644 $(DOCS) $(DOCS_DEST)
 		$(INSTALL) -m644 $(MANS) $(MANS_DEST)
 
 deinstall	:
 		$(RM) -f $(PAM_USB_DEST)/$(PAM_USB)
-		$(RM) -f $(TOOLS_DEST)/$(PUSB_CHECK) $(TOOLS_DEST)/$(PUSB_ADM) $(TOOLS_DEST)/$(PUSB_HOTPLUG)
+		$(RM) -f $(TOOLS_DEST)/$(PUSB_CHECK) $(TOOLS_DEST)/$(PUSB_CONF) $(TOOLS_DEST)/$(PUSB_HOTPLUG)
 		$(RM) -rf $(DOCS_DEST)
 		$(RM) -f $(MANS_DEST)/pusb_*
diff --git a/pam_usb/doc/CONFIGURATION b/pam_usb/doc/CONFIGURATION
index 1a381a6..518430b 100644
--- a/pam_usb/doc/CONFIGURATION
+++ b/pam_usb/doc/CONFIGURATION
@@ -176,7 +176,7 @@ combine and override options.
 <!-- Device settings -->
 <devices>
   <device id="MyDevice">
-    <!-- This part was generated by pusb_adm -->
+    <!-- This part was generated by pusb_conf -->
     <vendor>SanDisk Corp.</vendor>
     <model>Cruzer Titanium</model>
     <serial>SNDKXXXXXXXXXXXXXXXX</serial>
diff --git a/pam_usb/doc/INSTALLATION b/pam_usb/doc/INSTALLATION
index 85d2307..768e92a 100644
--- a/pam_usb/doc/INSTALLATION
+++ b/pam_usb/doc/INSTALLATION
@@ -9,7 +9,7 @@ an older version of pamusb.
   * libhal-storage
   * libxml2
 
-* Requirements for pusb_hotplug and pusb_adm:
+* Requirements for pusb_hotplug and pusb_conf:
   * python2.4
   * python-celementtree
   * python-dbus
@@ -35,10 +35,10 @@ $ make
 
 cp /etc/pusb/pusb.conf-dist /etc/pusb/pusb.conf
 
-* Once you've connected your USB device to the computer, use pusb_adm to add it
+* Once you've connected your USB device to the computer, use pusb_conf to add it
 to the configuration file:
 
-# pusb_adm --add-device MyDevice
+# pusb_conf --add-device MyDevice
 Name            : MyDevice
 Vendor          : SanDisk Corp.
 Model           : Cruzer Titanium
@@ -49,7 +49,7 @@ Save device to /etc/pusb/pusb.conf ?
 Done.
 
 Note that MyDevice can be any arbitrary name you'd like.
-If more devices are connected, pusb_adm will ask you which device you want to
+If more devices are connected, pusb_conf will ask you which device you want to
 use.
 
 * Edit your /etc/pusb/pusb.conf config file to add the users:
diff --git a/pam_usb/doc/pusb.conf-dist b/pam_usb/doc/pusb.conf-dist
index e0204c6..bd422e7 100644
--- a/pam_usb/doc/pusb.conf-dist
+++ b/pam_usb/doc/pusb.conf-dist
@@ -16,7 +16,7 @@ See http://www.pamusb.org/doc/configuring
 	<!-- Device settings -->
 	<devices>
 		<!-- Example:
-		Note: You should use pusb_adm to add devices automatically.
+		Note: You should use pusb_conf to add devices automatically.
 		<device id="MyDevice">
 			<vendor>SanDisk Corp.</vendor>
 			<model>Cruzer Titanium</model>
diff --git a/pam_usb/doc/pusb_adm.1.gz b/pam_usb/doc/pusb_adm.1.gz
deleted file mode 100644
index 2d26449e89236b23eb1bd9295296b9f7d6b82ccd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 722
zcmV;@0xkU?iwFolFO)?918{Y7VqaloZ7wkYbyRIn+b|IR?q6~07eH!Vil%Lv0IdZ!
zDglj1`(awA$xSYaHOG!@hf;q1&Q5_+HmPcR@x44R=kOlP@zH~5y{UzlnNVs2C2F+7
zV-Bkg_(y+I3q2U|5BwA3^J{2YxB4ye8b;8&#0={dS~&UKhm+&uk3HzoCmG)^(n*go
zo?gS<`1Xn|i^)sfasY{_DT2)CLY6HJlSYF#M#YNs$K5PRrzzvQV7w4DT<kVj776^M
zcrfVdL%b}eg;Yp?e?dGFc|OSTL1y6@oN7_y`L;@%K_Hx?$IOR{ZpNH`WSoC_m0sLW
zllgRZw?9`p5D_Tk=wzu$ByXTX)jZ24bqT)0C=(9=_gKCn<%}l@8~d1En;Nz6gY*Y9
zVx=(jEd?D}AT7apV?~M3aRR9eW9!(_!C_5gRG&50<ZVVx99k(9=r(#IbPmn{75M6i
zh3MaYM;w{47F}a>9*AtG5i+}>ncIvVI_wP{(ry-IBkSe~<C7rYprXTm=SmQYB9>NW
z4X&+gL48dDrio1WZrQ85XRkxp!gV-H`GESr(!ybmg=m#`BqJN5&xXN|;fpCpZ%4h^
zmb0)dEX_p6*KM4~I>-n3fP|OoHEj-A|K1o5Go2v|buGC7m2i+%#$ng1OX@S}VJ(${
z6#|X!mgt?fyL?&~?C1q#J)oXjV?qpvYg!Uy+rt1mwAC9Bb|t+H634uaX%BKx@(=E@
z-@g#-o3Ye<Z}kbH!fsh3HHV7QVO`0rdd5RJbk+|-X(q{6P5WguMjcj2Ds)3I@3v*K
z_@1&vp&(aDBYNYsC0J}|Ro$~D+jm7RqzW1+={#pCQcv%jFClc?nU)ZfMI~~Lei)y|
z?{HCuO>7ak5>8Yv%Q{}nuV?pctaFP3ZrZ0OVRH$mE;El`>3WYwoLZi<zbi$8-zWtD
E0PIRq;s5{u

diff --git a/pam_usb/doc/pusb_check.1.gz b/pam_usb/doc/pusb_check.1.gz
index 7df7177b642f48450fb98f55a3eff07765baec11..cc40156ae855c9c8b2551ea50133f7ac2301e790 100644
GIT binary patch
delta 15
WcmX@Xc7lyfzMF$X*lQ!36EgrJp98i4

delta 15
WcmX@Xc7lyfzMF%?UVkH-6EgrKAOpt$

diff --git a/pam_usb/doc/pusb_conf.1.gz b/pam_usb/doc/pusb_conf.1.gz
new file mode 100644
index 0000000000000000000000000000000000000000..78c7fc3ca6bed517c832f85d84b9c85b6cbdd0f3
GIT binary patch
literal 724
zcmV;_0xSI=iwFo4N|Z$a18{Y7Vqar#Ze}hq0CiMhZ`v>r{qA3J;!9fzOsS@An!0Mx
zb}Q0aq6R)pW138INvt_`WILtw*YE7mQs^cj;Ox71@7}wF_h62X9z^R+ExgQxQX42y
zqZJ-=SZ%;R`m<W-!HB=(9~htCK-0R_@66}|M$o&$4C@tIIQ!U#v(wY}J?POV8Q(6_
zNslp}-oV}X_L?n=$*yoYfJD?3LI`EqQafohcw<y7Nq^kUl60Cft_#KsQN!gP!m>!<
zCmjq19YBbe#k7zL>F+OyS0c{`IX=iNoWZ#kHC}A1v>Ak%bM%<`P|-D+(~pb<uCCL|
z`)M+t&hFkcmJURu3OPDiY7)vDs8BV}(n(!{uP{o*<HUP&vK>{<c#^QOkLk6kQTskf
ze?%=-3IlE_=*j}g3C<fUN`!7Gkh(Coj))G9Ynn#&Sz}G!W(4BUN})iv(H^05a0aNr
zS0^k)|Mooc$c(k<8l&?t$hI3Xvm5HU&G_#)B;G9QM&`{E#wS6)K}DDS&Xyn)MJ%n%
z8eCh~f^ba%riqjA*JV3<Kku5bh3j~h@&Wb13hmP1ILAV?$~%&g4bf-A;K%UAl#~5d
zd+YK!Yzs>>(aq~N&SM?q1AIW@OZA#ohpc~V42PM{kcGOIT!2bA$SUKo!|IayOnO*L
zrC^0Xt-B?9qwVW?S{Ll-1!g@U%&jpYhT}CY39{{FpdDcK283NnZ-c}!Z)4h{9F+Wn
z2h$%u5$vn61b(>t#8F|lt#LMoit=Gy$*g)NL^*WVXBga(WUQtIGa921E2P7&3+COr
zOcvi#mM9ctD~Uv}owfvv4ehFX7G?XosD)HP1SOs4EJecfzWEeF$DL`3GI>-Y*XW1w
zG=7ICW!OZBFf8#z^|Gzw#r$S=&&E2pDByeh^dxL9;oN2B@e4iQqY)>_3-%WXe~XeW
G1pokDIcZG*

literal 0
HcmV?d00001

diff --git a/pam_usb/doc/pusb_hotplug.1.gz b/pam_usb/doc/pusb_hotplug.1.gz
index c1e792391c7893b266ba9a9114300af0467e6339..1b631cdf18b4191e901dc42d995e39f31a88da98 100644
GIT binary patch
delta 15
Wcmcc5a-W4wzMF$X$ZI28BohE776bJF

delta 15
Wcmcc5a-W4wzMF%?R(~T~BohE7kpu+*