------------------------------------------------------------
revno: 13690
revision-id: squid3@treenet.co.nz-20141218125251-i8p72hzkyblze0tw
parent: squid3@treenet.co.nz-20141218124734-4fpfoxb5ti8mda3f
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2014-12-18 04:52:51 -0800
message:
  SourceLayout: shuffle Sys-V init script to tools/sysvinit/
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141218125251-i8p72hzkyblze0tw
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: e85a4174fbf488e9fc889c7774fc2f7503962737
# timestamp: 2014-12-18 13:50:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141218124734-\
#   4fpfoxb5ti8mda3f
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2014-12-09 14:09:33 +0000
+++ configure.ac	2014-12-18 12:52:51 +0000
@@ -3839,8 +3839,9 @@
 	helpers/storeid_rewrite/Makefile
 	helpers/storeid_rewrite/file/Makefile
 	tools/Makefile
+	tools/purge/Makefile
 	tools/squidclient/Makefile
-	tools/purge/Makefile
+	tools/sysvinit/Makefile
 ])
 
 # must configure libltdl subdir unconditionally for "make distcheck" to work

=== modified file 'contrib/Makefile.am'
--- contrib/Makefile.am	2014-10-30 14:44:26 +0000
+++ contrib/Makefile.am	2014-12-18 12:52:51 +0000
@@ -10,13 +10,12 @@
 # using a SVR4-based startup mechanism/file system layout
 #
 
-SQUID_RC        = squid.rc
+SQUID_RC        = $(top_srcdir)/tools/sysvinit/squid.rc
 SQUID_OPTIONS   = squid.options
 
 EXTRA_DIST = \
 	squid.options \
 	config.site \
-	squid.rc \
 	rredir.c \
 	rredir.pl \
 	user-agents.pl \

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2014-09-13 13:20:21 +0000
+++ tools/Makefile.am	2014-12-18 12:52:51 +0000
@@ -12,7 +12,7 @@
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 
-SUBDIRS = purge squidclient
+SUBDIRS = purge squidclient sysvinit
 EXTRA_DIST = 
 man_MANS = 
 DISTCLEANFILES = 

=== added directory 'tools/sysvinit'
=== added file 'tools/sysvinit/Makefile.am'
--- tools/sysvinit/Makefile.am	1970-01-01 00:00:00 +0000
+++ tools/sysvinit/Makefile.am	2014-12-18 12:52:51 +0000
@@ -0,0 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+EXTRA_DIST = squid.rc

=== renamed file 'contrib/squid.rc' => 'tools/sysvinit/squid.rc'
--- contrib/squid.rc	2002-10-09 03:19:02 +0000
+++ tools/sysvinit/squid.rc	2014-12-18 12:52:51 +0000
@@ -1,7 +1,14 @@
-#!/sbin/sh
+#!/bin/sh
+#
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 # Squid Internet Object Cache startup
-# AUTHOR: Markus Gyger
+# AUTHOR: Markus Gyger <mgyger@itr.ch>
 # This is squid's startup file /sbin/init.d/squid or /etc/init.d/squid