r2589 - in branches/1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-10 09:22:31 +0100 (Mon, 10 Mar 2008)
New Revision: 2589

Added:
   branches/1.2/debian/varnish.docs
Removed:
   branches/1.2/debian/docs
Modified:
   branches/1.2/
Log:
Merged revisions 2588 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2588 | ssm | 2008-03-10 09:17:23 +0100 (Mon, 10 Mar 2008) | 1 line
  
  Debian packaging: Move control file "docs" to "varnish.docs" for consistency, add HTML changelogs from the doc/ directory to the packaging
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583,2586
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583,2586,2588

Deleted: branches/1.2/debian/docs
===================================================================
--- branches/1.2/debian/docs	2008-03-10 08:17:23 UTC (rev 2588)
+++ branches/1.2/debian/docs	2008-03-10 08:22:31 UTC (rev 2589)
@@ -1 +0,0 @@
-README

Copied: branches/1.2/debian/varnish.docs (from rev 2588, trunk/varnish-cache/debian/varnish.docs)
===================================================================
--- branches/1.2/debian/varnish.docs	                        (rev 0)
+++ branches/1.2/debian/varnish.docs	2008-03-10 08:22:31 UTC (rev 2589)
@@ -0,0 +1,3 @@
+README
+INSTALL
+doc/*.html