From 8cb8bdd418cec8e9f95f93a2169327f2d16927cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Oct 2004 14:28:05 +0000
Subject: [PATCH] * Subversion 1.0.8 and 1.1.0.

svn path=/nixpkgs/trunk/; revision=1533
---
 .../{subversion => subversion-1.0.x}/builder.sh             | 0
 .../{subversion => subversion-1.0.x}/default.nix            | 6 +++---
 .../{subversion-1.1rc => subversion-1.1.x}/builder.sh       | 0
 .../{subversion-1.1rc => subversion-1.1.x}/default.nix      | 6 +++---
 .../{subversion-1.1rc => subversion-1.1.x}/javahl.patch     | 0
 pkgs/system/all-packages-generic.nix                        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename pkgs/applications/version-management/{subversion => subversion-1.0.x}/builder.sh (100%)
 rename pkgs/applications/version-management/{subversion => subversion-1.0.x}/default.nix (85%)
 rename pkgs/applications/version-management/{subversion-1.1rc => subversion-1.1.x}/builder.sh (100%)
 rename pkgs/applications/version-management/{subversion-1.1rc => subversion-1.1.x}/default.nix (93%)
 rename pkgs/applications/version-management/{subversion-1.1rc => subversion-1.1.x}/javahl.patch (100%)

diff --git a/pkgs/applications/version-management/subversion/builder.sh b/pkgs/applications/version-management/subversion-1.0.x/builder.sh
similarity index 100%
rename from pkgs/applications/version-management/subversion/builder.sh
rename to pkgs/applications/version-management/subversion-1.0.x/builder.sh
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion-1.0.x/default.nix
similarity index 85%
rename from pkgs/applications/version-management/subversion/default.nix
rename to pkgs/applications/version-management/subversion-1.0.x/default.nix
index 63eeb05ca5f..fed8a6f973b 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion-1.0.x/default.nix
@@ -13,12 +13,12 @@ assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl)
 assert swigBindings -> swig != null && swig.pythonSupport;
 
 stdenv.mkDerivation {
-  name = "subversion-1.0.6";
+  name = "subversion-1.0.8";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.0.6.tar.bz2;
-    md5 = "bb05fe041fef7491b3555904d97f5e1c";
+    url = http://subversion.tigris.org/tarballs/subversion-1.0.8.tar.bz2;
+    md5 = "b2378b7d9d00653249877531a61ef1db";
   };
 
   openssl = if sslSupport then openssl else null;
diff --git a/pkgs/applications/version-management/subversion-1.1rc/builder.sh b/pkgs/applications/version-management/subversion-1.1.x/builder.sh
similarity index 100%
rename from pkgs/applications/version-management/subversion-1.1rc/builder.sh
rename to pkgs/applications/version-management/subversion-1.1.x/builder.sh
diff --git a/pkgs/applications/version-management/subversion-1.1rc/default.nix b/pkgs/applications/version-management/subversion-1.1.x/default.nix
similarity index 93%
rename from pkgs/applications/version-management/subversion-1.1rc/default.nix
rename to pkgs/applications/version-management/subversion-1.1.x/default.nix
index d2c371a52b3..0c01370395c 100644
--- a/pkgs/applications/version-management/subversion-1.1rc/default.nix
+++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix
@@ -15,12 +15,12 @@ assert pythonBindings -> swig != null && swig.pythonSupport;
 assert javaBindings -> swig != null && swig.javaSupport;
 
 stdenv.mkDerivation {
-  name = "subversion-1.1.0pre-rc2";
+  name = "subversion-1.1.0";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.1.0-rc2.tar.bz2;
-    md5 = "ecd53e9f065739023da768891b83b70e";
+    url = http://subversion.tigris.org/tarballs/subversion-1.1.0.tar.bz2;
+    md5 = "a91b0d79b8c8ab8747587037c044c6c9";
   };
 
   # This is a hopefully temporary fix for the problem that
diff --git a/pkgs/applications/version-management/subversion-1.1rc/javahl.patch b/pkgs/applications/version-management/subversion-1.1.x/javahl.patch
similarity index 100%
rename from pkgs/applications/version-management/subversion-1.1rc/javahl.patch
rename to pkgs/applications/version-management/subversion-1.1.x/javahl.patch
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 0b6699a2080..5ce66b94b97 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -758,7 +758,7 @@ rec {
 
   ### APPLICATIONS
 
-  subversion = (import ../applications/version-management/subversion) {
+  subversion = (import ../applications/version-management/subversion-1.0.x) {
     inherit fetchurl stdenv openssl db4 expat swig;
     localServer = true;
     httpServer = false;
@@ -766,7 +766,7 @@ rec {
     httpd = apacheHttpd;
   };
 
-  subversionWithJava = (import ../applications/version-management/subversion-1.1rc) {
+  subversionWithJava = (import ../applications/version-management/subversion-1.1.x) {
     inherit fetchurl stdenv openssl db4 expat;
     swig = swigWithJava;
     localServer = true;