r17027 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r17026‎ | r17027 | r17028 >
Date:18:39, 15 October 2006
Author:mark
Status:old
Tags:
Comment:
squid (2.6.4-2wm1) dapper; urgency=low

* Incorporate Debian package changes:
- Added DEB_BUILD_OPTIONS dependent optimization and install options,
allowing for easy builing of unstripped binary packages as per Policy
10.1. (Closes: #384616)
* Build with --enable-stacktraces
* COSS preparation:
- Remove the time consuming and likely useless dd
- chgrp $gid COSS files on every Squid start, as they get reset on boot
Modified paths:
  • /trunk/debs/squid/debian/changelog (modified) (history)
  • /trunk/debs/squid/debian/rules (modified) (history)
  • /trunk/debs/squid/debian/squid.rc (modified) (history)

Diff [purge]

Index: trunk/debs/squid/debian/changelog
——@@ -1,3 +1,16 @@
 2+squid (2.6.4-2wm1) dapper; urgency=low
 3+
 4+ * Incorporate Debian package changes:
 5+ - Added DEB_BUILD_OPTIONS dependent optimization and install options,
 6+ allowing for easy builing of unstripped binary packages as per Policy
 7+ 10.1. (Closes: #384616)
 8+ * Build with --enable-stacktraces
 9+ * COSS preparation:
 10+ - Remove the time consuming and likely useless dd
 11+ - chgrp $gid COSS files on every Squid start, as they get reset on boot
 12+
 13+ -- Mark Bergsma <mark@wikimedia.org> Sun, 15 Oct 2006 18:05:05 +0000
 14+
215 squid (2.6.4-1wm5) dapper; urgency=low
316
417 * Change the init.d script to not use the executable file on
Index: trunk/debs/squid/debian/squid.rc
——@@ -64,17 +64,8 @@
6565 prepare_coss() {
6666 COSS_FILES=`sed -e 's/#.*//g' /etc/squid/squid.conf | \
6767 egrep "cache_dir[[:space:]]+coss" | awk '{ print $3 }'`
68 - for cossfile in $COSS_FILES
69 - do
70 - log_warning_msg "Preparing COSS file $cossfile..."
71 - cosssize=`sed -e 's/#.*//g' /etc/squid/squid.conf | \
72 - egrep "cache_dir[[:space:]]+coss[[:space:]]+$cossfile" | awk '{ print $4 }'`
73 - if [ -w $cossfile -a -n "$cosssize" -a $cosssize -gt 0 ]
74 - then
75 - gid=`grepconf cache_effective_group proxy`
76 - su $gid dd if=/dev/zero bs=1048576 count=$cosssize of=$cossfile || exit 1
77 - fi
78 - done
 68+ gid=`grepconf cache_effective_group proxy`
 69+ chgrp $gid $COSS_FILES
7970 }
8071
8172 start () {
Index: trunk/debs/squid/debian/rules
——@@ -15,6 +15,22 @@
1616 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
1717 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
1818
 19+CFLAGS = -Wall -g
 20+INSTALL = install
 21+INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
 22+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
 23+INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
 24+INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
 25+
 26+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 27+CFLAGS += -O0
 28+else
 29+CFLAGS += -O2
 30+endif
 31+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 32+INSTALL_PROGRAM += -s
 33+endif
 34+
1935 # Take account of old dpkg-architecture output.
2036 ifeq ($(DEB_HOST_ARCH_CPU),)
2137 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
——@@ -57,13 +73,13 @@
5874 else
5975 ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
6076 with_pthreads = --enable-async-io --with-pthreads \
61 - --enable-storeio=ufs,aufs,diskd,null
 77+ --enable-storeio=ufs,aufs,coss,diskd,null
6278 with_netfilter =
6379 with_arp_acl =
6480 with_epoll = --enable-kqueue
6581 else
6682 with_pthreads = --enable-async-io --with-pthreads \
67 - --enable-storeio=ufs,aufs,diskd,null
 83+ --enable-storeio=ufs,aufs,coss,diskd,null
6884 with_netfilter = --enable-linux-netfilter --enable-linux-proxy
6985 with_arp_acl = --enable-arp-acl
7086 with_epoll = --enable-epoll
——@@ -83,7 +99,7 @@
84100
85101
86102 # Build the binaries.
87 -build: patch wmerrors config.status
 103+build: patch config.status
88104 $(checkdir)
89105 $(MAKE) $(DEFAULTS) all
90106 # Authentication modules
——@@ -120,7 +136,6 @@
121137 $(with_netfilter) \
122138 $(with_arp_acl) \
123139 $(with_epoll) \
124 - --enable-storeio="aufs,coss,diskd,null,ufs" \
125140 --enable-removal-policies=lru,heap \
126141 --enable-snmp \
127142 --enable-delay-pools \
——@@ -135,6 +150,7 @@
136151 --disable-icmp \
137152 --with-large-files \
138153 --with-maxfd=16384 \
 154+ --enable-stacktraces \
139155 $(DEB_HOST_ARCH_CPU)-debian-$(DEB_HOST_ARCH_OS)
140156 ifeq ($(DEB_HOST_ARCH_OS), linux)
141157 endif
——@@ -146,19 +162,18 @@
147163 #
148164 # Build squid-common package.
149165 #
150 - install -m 755 -g root -d $(tmp)/DEBIAN
151 - install -m 755 -g root -d $(tmp)/usr/share/doc/squid-common
152 - install -m 644 -g root ChangeLog $(tmp)/usr/share/doc/squid-common/changelog
153 - install -m 644 -g root debian/changelog \
 166+ $(INSTALL_DIR) $(tmp)/DEBIAN
 167+ $(INSTALL_DIR) $(tmp)/usr/share/doc/squid-common
 168+ $(INSTALL_FILE) ChangeLog $(tmp)/usr/share/doc/squid-common/changelog
 169+ $(INSTALL_FILE) debian/changelog \
154170 $(tmp)/usr/share/doc/squid-common/changelog.Debian
155171 gzip -9f $(tmp)/usr/share/doc/squid-common/*
156 - install -m 644 -g root debian/copyright $(tmp)/usr/share/doc/squid-common
157 - install -m 755 -g root -d $(tmp)/usr/share/$(package)
158 - install -m 755 -g root -d $(tmp)/usr/share/squid/{errors,icons}
159 - install -m 644 -g root src/mib.txt \
160 - ./$(tmp)$(datadir)/mib.txt
161 - install -m 644 -g root src/mime.conf.default \
162 - ./$(tmp)$(datadir)/mime.conf
 172+ $(INSTALL_FILE) debian/copyright $(tmp)/usr/share/doc/squid-common
 173+ $(INSTALL_DIR) $(tmp)/usr/share/$(package)
 174+ $(INSTALL_DIR) $(tmp)/usr/share/squid/errors
 175+ $(INSTALL_DIR) $(tmp)/usr/share/squid/icons
 176+ $(INSTALL_FILE) src/mib.txt ./$(tmp)$(datadir)/mib.txt
 177+ $(INSTALL_FILE) src/mime.conf.default ./$(tmp)$(datadir)/mime.conf
163178 #
164179 cp -R errors/* ./$(tmp)$(datadir)/errors
165180 rm -f ./$(tmp)$(datadir)/errors/Makefile*
——@@ -166,36 +181,36 @@
167182 chmod 755 ./$(tmp)$(datadir)/errors/*
168183 chmod 644 ./$(tmp)$(datadir)/errors/*/*
169184 chown -R root:root ./$(tmp)$(datadir)/errors
170 - install -m 644 -g root icons/*.gif ./$(tmp)$(datadir)/icons
171 - install -m 755 -g root -d $(tmp)/usr/share/doc/$(package)
172 - install -m 755 -g root -d $(tmp)/usr/share/doc/$(package)/examples
173 - install -m 644 -g root debian/doc/README.auth_modules $(tmp)$(docdir)
174 - install -m 644 -g root helpers/basic_auth/SMB/README \
 185+ $(INSTALL_FILE) icons/*.gif ./$(tmp)$(datadir)/icons
 186+ $(INSTALL_DIR) $(tmp)/usr/share/doc/$(package)
 187+ $(INSTALL_DIR) $(tmp)/usr/share/doc/$(package)/examples
 188+ $(INSTALL_FILE) debian/doc/README.auth_modules $(tmp)$(docdir)
 189+ $(INSTALL_FILE) helpers/basic_auth/SMB/README \
175190 $(tmp)$(docdir)/README.auth_module.smb_auth
176191 umask 022; head -19 helpers/basic_auth/NCSA/ncsa_auth.c > \
177192 $(tmp)$(docdir)/README.auth_module.ncsa_auth
178193 umask 022; head -56 helpers/basic_auth/PAM/pam_auth.c > \
179194 $(tmp)$(docdir)/README.auth_module.pam_auth
180 - install -m 644 -g root debian/README.ldap_auth \
 195+ $(INSTALL_FILE) debian/README.ldap_auth \
181196 $(tmp)$(docdir)/README.auth_module.ldap_auth
182 - install -m 644 -g root helpers/basic_auth/MSNT/README.html \
 197+ $(INSTALL_FILE) helpers/basic_auth/MSNT/README.html \
183198 $(tmp)$(docdir)/README.auth_module.msnt_auth.html
184199 umask 022; head -21 helpers/basic_auth/getpwnam/getpwnam_auth.c > \
185200 $(tmp)$(docdir)/README.auth_module.getpwnam_auth
186201 umask 022; head -26 helpers/digest_auth/password/digest_pw_auth.c > \
187202 $(tmp)$(docdir)/README.auth_module.digest_pw_auth
188 - install -m 644 -g root helpers/external_acl/ip_user/README \
 203+ $(INSTALL_FILE) helpers/external_acl/ip_user/README \
189204 $(tmp)$(docdir)/README.auth_module.ip_user
190 - install -m 644 -g root helpers/external_acl/ip_user/example.conf \
 205+ $(INSTALL_FILE) helpers/external_acl/ip_user/example.conf \
191206 $(tmp)$(docdir)/examples/ip_user-example.conf
192 - install -m 644 -g root helpers/external_acl/unix_group/README \
 207+ $(INSTALL_FILE) helpers/external_acl/unix_group/README \
193208 $(tmp)$(docdir)/README.auth_module.unix_group
194 - install -m 644 -g root CONTRIBUTORS QUICKSTART RELEASENOTES.html \
 209+ $(INSTALL_FILE) CONTRIBUTORS QUICKSTART RELEASENOTES.html \
195210 README debian/doc/README.transparent-proxy \
196211 debian/doc/README.morefds doc/debug-sections.txt \
197212 $(tmp)/usr/share/doc/$(package)
198213 gzip -9f `find debian/tmp/usr/share/doc/squid/* | grep -v examples`
199 - install -m 644 -g root debian/doc/FAQ*.html $(tmp)/usr/share/doc/$(package)
 214+ $(INSTALL_FILE) debian/doc/FAQ*.html $(tmp)/usr/share/doc/$(package)
200215 dpkg-gencontrol -isp -psquid-common
201216 dpkg --build $(tmp) ..
202217 rm -f debian/substvars
——@@ -206,102 +221,93 @@
207222 #
208223 # Build squid package.
209224 #
210 - install -m 755 -g root -d $(tmp)/DEBIAN
211 - install -m 755 -g root -d $(tmp)/etc/{squid,logrotate.d,init.d}
212 - install -m 755 -g root -d $(tmp)/etc/resolvconf/update-libc.d
213 - install -m 755 -g root -d $(tmp)/usr/{bin,sbin}
214 - install -m 755 -g root -d $(tmp)/usr/share/doc/$(package)
215 - install -m 755 -g root -d $(tmp)/usr/share/doc/$(package)/examples
216 - install -m 755 -g root -d $(tmp)/usr/lib/squid
217 - install -m 755 -g root -d $(tmp)/var/{log,spool}
 225+ $(INSTALL_DIR) $(tmp)/DEBIAN
 226+ $(INSTALL_DIR) $(tmp)/etc/squid
 227+ $(INSTALL_DIR) $(tmp)/etc/logrotate.d
 228+ $(INSTALL_DIR) $(tmp)/etc/init.d
 229+ $(INSTALL_DIR) $(tmp)/etc/resolvconf/update-libc.d
 230+ $(INSTALL_DIR) $(tmp)/usr/bin
 231+ $(INSTALL_DIR) $(tmp)/usr/sbin
 232+ $(INSTALL_DIR) $(tmp)/usr/share/doc/$(package)
 233+ $(INSTALL_DIR) $(tmp)/usr/share/doc/$(package)/examples
 234+ $(INSTALL_DIR) $(tmp)/usr/lib/squid
 235+ $(INSTALL_DIR) $(tmp)/var/{log,spool}
218236 install -m 750 -o proxy -g proxy -d $(tmp)/var/log/squid
219237 install -m 750 -o proxy -g proxy -d $(tmp)/var/spool/squid
220 - install -m 755 -g root -d $(tmp)/usr/share/man/man8
 238+ $(INSTALL_DIR) $(tmp)/usr/share/man/man8
221239 #
222 - install -s -m 755 -g root src/squid $(tmp)/usr/sbin
223 - install -s -m 755 -g root src/unlinkd src/fs/diskd-daemon \
224 - $(tmp)/usr/lib/squid
225 - #install -s -m 4754 -g proxy src/pinger $(tmp)/usr/lib/squid
226 - #
227 - install -m 644 -g root debian/logrotate \
228 - $(tmp)/etc/logrotate.d/squid
229 - # Added for resolvconf
230 - install -m 755 -g root debian/squid.resolvconf \
231 - $(tmp)/etc/resolvconf/update-libc.d/squid
232 - # TO BE REMOVED (left in for people with an old /etc/init.d/squid)
233 - install -m 755 -g root debian/squid.RunCache \
234 - $(tmp)/$(libexecdir)/RunCache
235 - #
236 - install -m 755 -g root -s helpers/basic_auth/SMB/smb_auth $(tmp)$(libexecdir)
237 - install -m 755 -g root helpers/basic_auth/SMB/smb_auth.sh \
238 - $(tmp)$(libexecdir)
239 - install -m 755 -g root -s helpers/basic_auth/NCSA/ncsa_auth \
240 - $(tmp)$(libexecdir)
 240+ $(INSTALL_PROGRAM) src/squid $(tmp)/usr/sbin
 241+ $(INSTALL_PROGRAM) src/unlinkd src/fs/diskd-daemon $(tmp)/usr/lib/squid
 242+ $(INSTALL_FILE) debian/logrotate $(tmp)/etc/logrotate.d/squid
 243+ $(INSTALL_SCRIPT) debian/squid.resolvconf $(tmp)/etc/resolvconf/update-libc.d/squid
 244+ $(INSTALL_PROGRAM) helpers/basic_auth/SMB/smb_auth $(tmp)$(libexecdir)
 245+ $(INSTALL_SCRIPT) helpers/basic_auth/SMB/smb_auth.sh $(tmp)$(libexecdir)
 246+ $(INSTALL_PROGRAM) helpers/basic_auth/NCSA/ncsa_auth $(tmp)$(libexecdir)
241247 install -m 2750 -o proxy -g shadow -s helpers/basic_auth/PAM/pam_auth \
242248 $(tmp)$(libexecdir)
243 - install -m 755 -g root -s helpers/basic_auth/LDAP/squid_ldap_auth \
 249+ $(INSTALL_PROGRAM) helpers/basic_auth/LDAP/squid_ldap_auth \
244250 $(tmp)$(libexecdir)/ldap_auth
245 - install -m 755 -g root -s helpers/basic_auth/YP/yp_auth \
 251+ $(INSTALL_PROGRAM) helpers/basic_auth/YP/yp_auth \
246252 $(tmp)$(libexecdir)/yp_auth
247 - install -m 755 -g root -s helpers/basic_auth/MSNT/msnt_auth \
 253+ $(INSTALL_PROGRAM) helpers/basic_auth/MSNT/msnt_auth \
248254 $(tmp)$(libexecdir)/msnt_auth
249255 install -m 2750 -o proxy -g shadow -s \
250256 helpers/basic_auth/getpwnam/getpwname_auth \
251257 $(tmp)$(libexecdir)/getpwnam_auth
252 - install -m 755 -g root -s helpers/digest_auth/password/digest_pw_auth \
 258+ $(INSTALL_PROGRAM) helpers/digest_auth/password/digest_pw_auth \
253259 $(tmp)$(libexecdir)/digest_pw_auth
254 - install -m 755 -g root -s helpers/external_acl/ip_user/ip_user_check \
 260+ $(INSTALL_PROGRAM) helpers/external_acl/ip_user/ip_user_check \
255261 $(tmp)$(libexecdir)/ip_user_check
256 - install -m 755 -g root -s helpers/external_acl/ldap_group/squid_ldap_group \
 262+ $(INSTALL_PROGRAM) helpers/external_acl/ldap_group/squid_ldap_group \
257263 $(tmp)$(libexecdir)/squid_ldap_group
258 - install -m 644 helpers/external_acl/ldap_group/squid_ldap_group.8 \
 264+ $(INSTALL_FILE) helpers/external_acl/ldap_group/squid_ldap_group.8 \
259265 $(tmp)/usr/share/man/man8/squid_ldap_group.8
260 - install -m 755 -g root -s helpers/external_acl/session/squid_session \
 266+ $(INSTALL_PROGRAM) helpers/external_acl/session/squid_session \
261267 $(tmp)$(libexecdir)/squid_session
262 - install -m 644 helpers/external_acl/session/squid_session.8 \
 268+ $(INSTALL_FILE) helpers/external_acl/session/squid_session.8 \
263269 $(tmp)/usr/share/man/man8/squid_session.8
264 - install -m 755 -g root -s helpers/external_acl/unix_group/squid_unix_group \
 270+ $(INSTALL_PROGRAM) helpers/external_acl/unix_group/squid_unix_group \
265271 $(tmp)$(libexecdir)/squid_unix_group
266 - install -m 644 helpers/external_acl/unix_group/squid_unix_group.8 \
 272+ $(INSTALL_FILE) helpers/external_acl/unix_group/squid_unix_group.8 \
267273 $(tmp)/usr/share/man/man8/squid_unix_group.8
268 - install -m 755 -g root helpers/external_acl/wbinfo_group/wbinfo_group.pl \
 274+ $(INSTALL_SCRIPT) helpers/external_acl/wbinfo_group/wbinfo_group.pl \
269275 $(tmp)$(libexecdir)/wbinfo_group.pl
270 - install -m 755 -g root -s helpers/ntlm_auth/SMB/ntlm_auth \
 276+ $(INSTALL_PROGRAM) helpers/ntlm_auth/SMB/ntlm_auth \
271277 $(tmp)$(libexecdir)/ntlm_auth
272278 # the examples. Most have been removed from upstream :/
273 - install -m 644 -g root src/squid.conf.default \
 279+ $(INSTALL_FILE) src/squid.conf.default \
274280 $(tmp)/usr/share/doc/$(package)/examples/squid.conf
275 - install -m 644 -g root debian/default.squid \
 281+ $(INSTALL_FILE) debian/default.squid \
276282 $(tmp)/usr/share/doc/$(package)/examples
277283
278284 #
279 - install -m 644 -g root ChangeLog $(tmp)/usr/share/doc/$(package)/changelog
280 - install -m 644 -g root debian/changelog \
 285+ $(INSTALL_FILE) ChangeLog $(tmp)/usr/share/doc/$(package)/changelog
 286+ $(INSTALL_FILE) debian/changelog \
281287 $(tmp)/usr/share/doc/$(package)/changelog.Debian
282 - install -m 644 -g root debian/README.Debian \
 288+ $(INSTALL_FILE) debian/README.Debian \
283289 $(tmp)/usr/share/doc/$(package)/README.Debian
284 - install -m 644 -g root debian/NEWS.Debian \
 290+ $(INSTALL_FILE) debian/NEWS.Debian \
285291 $(tmp)/usr/share/doc/$(package)/README.Debian
286292 gzip -9f `find debian/tmp/usr/share/doc/squid/* | grep -v examples`
287 - #$(tmp)/usr/share/doc/$(package)/[A-Za-df-z]*
288 - install -m 644 -g root debian/copyright $(tmp)/usr/share/doc/$(package)
289 - install -m 644 doc/squid.8 $(tmp)/usr/share/man/man8
 293+ $(INSTALL_FILE) debian/copyright $(tmp)/usr/share/doc/$(package)
 294+ $(INSTALL_FILE) doc/squid.8 $(tmp)/usr/share/man/man8
290295 gzip -9f $(tmp)/usr/share/man/man?/*
291 - install -m 755 debian/squid.rc $(tmp)/etc/init.d/squid
 296+ $(INSTALL_SCRIPT) debian/squid.rc $(tmp)/etc/init.d/squid
292297 #
293 - install -m 755 debian/preinst $(tmp)/DEBIAN/preinst
294 - install -m 755 debian/postinst $(tmp)/DEBIAN/postinst
295 - install -m 755 debian/prerm $(tmp)/DEBIAN/prerm
296 - install -m 755 debian/postrm $(tmp)/DEBIAN/postrm
297 - install -m 644 debian/conffiles $(tmp)/DEBIAN/conffiles
298 - #install -m 644 debian/templates $(tmp)/DEBIAN/templates
 298+ $(INSTALL_SCRIPT) debian/preinst $(tmp)/DEBIAN/preinst
 299+ $(INSTALL_SCRIPT) debian/postinst $(tmp)/DEBIAN/postinst
 300+ $(INSTALL_SCRIPT) debian/prerm $(tmp)/DEBIAN/prerm
 301+ $(INSTALL_SCRIPT) debian/postrm $(tmp)/DEBIAN/postrm
 302+ $(INSTALL_FILE) debian/conffiles $(tmp)/DEBIAN/conffiles
 303+ #$(INSTALL_FILE) debian/templates $(tmp)/DEBIAN/templates
299304 po2debconf debian/templates > debian/templates.merged
300 - install -m 644 debian/templates.merged $(tmp)/DEBIAN/templates
301 - install -m 755 debian/config $(tmp)/DEBIAN/config
 305+ $(INSTALL_FILE) debian/templates.merged $(tmp)/DEBIAN/templates
 306+ $(INSTALL_SCRIPT) debian/config $(tmp)/DEBIAN/config
302307
303308 # overrides file
304 - install -m 755 -g root -d $(tmp)/usr/share/lintian/overrides/
305 - install -m 644 debian/squid.overrides $(tmp)/usr/share/lintian/overrides/squid
 309+ $(INSTALL_DIR) $(tmp)/usr/share/lintian/overrides/
 310+ $(INSTALL_FILE) debian/squid.overrides \
 311+ $(tmp)/usr/share/lintian/overrides/squid
306312
307313 dpkg-shlibdeps $(tmp)/usr/sbin/* $(tmp)$(libexecdir)/*
308314 dpkg-gencontrol -isp -p$(package)
——@@ -311,22 +317,22 @@
312318 #
313319 # Generate squidclient package.
314320 #
315 - install -m 755 -g root -d $(tmp)/DEBIAN
316 - install -m 755 -g root -d $(tmp)/usr/bin
317 - install -m 755 -g root -d $(tmp)/usr/share/doc/squidclient
318 - install -m 755 -g root -d $(tmp)/usr/share/man/man1
 321+ $(INSTALL_DIR) $(tmp)/DEBIAN
 322+ $(INSTALL_DIR) $(tmp)/usr/bin
 323+ $(INSTALL_DIR) $(tmp)/usr/share/doc/squidclient
 324+ $(INSTALL_DIR) $(tmp)/usr/share/man/man1
319325 #
320 - install -s -m 755 -g root tools/squidclient $(tmp)/usr/bin/squidclient
321 - install -m 644 -g root debian/squidclient.1 $(tmp)/usr/share/man/man1
322 - install -m 644 -g root ChangeLog $(tmp)/usr/share/doc/squidclient/changelog
323 - install -m 644 -g root debian/changelog \
 326+ $(INSTALL_PROGRAM) tools/squidclient $(tmp)/usr/bin/squidclient
 327+ $(INSTALL_FILE) debian/squidclient.1 $(tmp)/usr/share/man/man1
 328+ $(INSTALL_FILE) ChangeLog $(tmp)/usr/share/doc/squidclient/changelog
 329+ $(INSTALL_FILE) debian/changelog \
324330 $(tmp)/usr/share/doc/squidclient/changelog.Debian
325331 gzip -9f $(tmp)/usr/share/doc/squidclient/*
326 - install -m 644 -g root debian/copyright $(tmp)/usr/share/doc/squidclient
 332+ $(INSTALL_FILE) debian/copyright $(tmp)/usr/share/doc/squidclient
327333 gzip -9f $(tmp)/usr/share/man/man?/*
328334 #
329 - install -m 755 debian/postinst.squidclient $(tmp)/DEBIAN/prerm
330 - install -m 755 debian/prerm.squidclient $(tmp)/DEBIAN/prerm
 335+ $(INSTALL_SCRIPT) debian/postinst.squidclient $(tmp)/DEBIAN/postinst
 336+ $(INSTALL_SCRIPT) debian/prerm.squidclient $(tmp)/DEBIAN/prerm
331337 dpkg-shlibdeps tools/squidclient
332338 dpkg-gencontrol -isp -psquidclient
333339 dpkg --build $(tmp) ..
——@@ -335,35 +341,34 @@
336342 #
337343 # Generate squid-cgi package.
338344 #
339 - install -m 755 -g root -d $(tmp)/DEBIAN
340 - install -m 755 -g root -d $(tmp)/etc/squid
341 - install -m 755 -g root -d $(tmp)/usr/lib/cgi-bin
342 - install -m 755 -g root -d $(tmp)/usr/share/doc/squid-cgi
343 - install -m 755 -g root -d $(tmp)/usr/share/man/man8
 345+ $(INSTALL_DIR) $(tmp)/DEBIAN
 346+ $(INSTALL_DIR) $(tmp)/etc/squid
 347+ $(INSTALL_DIR) $(tmp)/usr/lib/cgi-bin
 348+ $(INSTALL_DIR) $(tmp)/usr/share/doc/squid-cgi
 349+ $(INSTALL_DIR) $(tmp)/usr/share/man/man8
344350 #
345 - install -m 644 tools/cachemgr.conf $(tmp)/etc/squid/cachemgr.conf
346 - install -s -m 755 -g root tools/cachemgr.cgi $(tmp)/usr/lib/cgi-bin/
347 - install -m 644 -g root debian/squid-cgi.8 $(tmp)/usr/share/man/man8
348 - install -m 644 -g root ChangeLog $(tmp)/usr/share/doc/squid-cgi/changelog
349 - install -m 644 -g root debian/changelog \
 351+ $(INSTALL_FILE) tools/cachemgr.conf $(tmp)/etc/squid/cachemgr.conf
 352+ $(INSTALL_PROGRAM) tools/cachemgr.cgi $(tmp)/usr/lib/cgi-bin/
 353+ $(INSTALL_FILE) debian/squid-cgi.8 $(tmp)/usr/share/man/man8
 354+ $(INSTALL_FILE) ChangeLog $(tmp)/usr/share/doc/squid-cgi/changelog
 355+ $(INSTALL_FILE) debian/changelog \
350356 $(tmp)/usr/share/doc/squid-cgi/changelog.Debian
351 - install -m 644 -g root debian/doc/cachemgr.README \
 357+ $(INSTALL_FILE) debian/doc/cachemgr.README \
352358 $(tmp)/usr/share/doc/squid-cgi/README.cachemgr
353359 gzip -9f $(tmp)/usr/share/doc/squid-cgi/*
354 - install -m 644 -g root debian/copyright $(tmp)/usr/share/doc/squid-cgi
355 - install -m 644 -g root debian/doc/cachemgrfaq.html \
 360+ $(INSTALL_FILE) debian/copyright $(tmp)/usr/share/doc/squid-cgi
 361+ $(INSTALL_FILE) debian/doc/cachemgrfaq.html \
356362 $(tmp)/usr/share/doc/squid-cgi
357363 gzip -9f $(tmp)/usr/share/man/man8/*
358 - install -m 755 -g root -d $(tmp)/usr/share/doc/squid-cgi/examples
359 - install -m 644 -g root debian/doc/cachemgr.html \
 364+ $(INSTALL_DIR) $(tmp)/usr/share/doc/squid-cgi/examples
 365+ $(INSTALL_FILE) debian/doc/cachemgr.html \
360366 $(tmp)/usr/share/doc/squid-cgi/examples
361367 #
362 - install -m 755 debian/postinst.squid-cgi $(tmp)/DEBIAN/postinst
363 - install -m 755 debian/postrm.squid-cgi $(tmp)/DEBIAN/postrm
364 - install -m 755 debian/prerm.squid-cgi $(tmp)/DEBIAN/prerm
365 - #install -m 644 debian/templates $(tmp)/DEBIAN/templates
366 - install -m 644 debian/conffiles.squid-cgi $(tmp)/DEBIAN/conffiles
367 - install -m 644 debian/templates.merged $(tmp)/DEBIAN/templates
 368+ $(INSTALL_SCRIPT) debian/postinst.squid-cgi $(tmp)/DEBIAN/postinst
 369+ $(INSTALL_SCRIPT) debian/postrm.squid-cgi $(tmp)/DEBIAN/postrm
 370+ $(INSTALL_SCRIPT) debian/prerm.squid-cgi $(tmp)/DEBIAN/prerm
 371+ $(INSTALL_FILE) debian/conffiles.squid-cgi $(tmp)/DEBIAN/conffiles
 372+ $(INSTALL_FILE) debian/templates.merged $(tmp)/DEBIAN/templates
368373 dpkg-shlibdeps tools/cachemgr.cgi
369374 dpkg-gencontrol -isp -psquid-cgi
370375 dpkg --build $(tmp) ..