← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to debian/patches/repos-templates.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2005-06-29 13:09:32 UTC
  • mfrom: (1.1.1 upstream) (0.1.2 sarge)
  • Revision ID: james.westby@ubuntu.com-20050629130932-vzt4595e7q8wtfqy
Tags: 1.2.0-1ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/repos-templates.patch
1
 
Index: subversion-1.1.0-rc2/subversion/libsvn_repos/repos.c
 
1
Index: subversion/libsvn_repos/repos.c
2
2
===================================================================
3
 
--- subversion-1.1.0-rc2.orig/subversion/libsvn_repos/repos.c   2004-07-31 15:27:23.000000000 -0700
4
 
+++ subversion-1.1.0-rc2/subversion/libsvn_repos/repos.c        2004-09-06 22:24:34.040975573 -0700
5
 
@@ -443,7 +443,7 @@
 
3
--- subversion/libsvn_repos/repos.c.orig        2005-04-20 12:55:44.000000000 -0700
 
4
+++ subversion/libsvn_repos/repos.c     2005-06-11 08:34:06.147929175 -0700
 
5
@@ -504,7 +504,7 @@
6
6
       APR_EOL_STR
7
7
       "# the commit on the files and directories being modified."
8
8
       APR_EOL_STR
11
11
       "|| exit 1"
12
12
       APR_EOL_STR
13
13
       APR_EOL_STR
14
 
@@ -659,9 +659,7 @@
 
14
@@ -743,7 +743,7 @@
 
15
       APR_EOL_STR
 
16
       "# (Maybe this script could send email to the to the lock owner?)"
 
17
       APR_EOL_STR
 
18
-      "SVNLOOK=/usr/local/bin/svnlook"
 
19
+      "SVNLOOK=" SVN_BINDIR "svnlook"
 
20
       APR_EOL_STR
 
21
       "GREP=/bin/grep"
 
22
       APR_EOL_STR
 
23
@@ -1013,9 +1013,7 @@
15
24
       "REV=\"$2\""
16
25
       APR_EOL_STR
17
26
       APR_EOL_STR
22
31
       APR_EOL_STR;
23
32
 
24
33
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
25
 
@@ -759,7 +757,7 @@
26
 
       "PROPNAME=\"$4\""
 
34
@@ -1121,7 +1119,7 @@
 
35
       APR_EOL_STR
 
36
       "# Send email to interested parties, let them know a lock was created:"
 
37
       APR_EOL_STR
 
38
-      "mailer.py lock \"$REPOS\" \"$USER\" /path/to/mailer.conf"
 
39
+      "/usr/lib/subversion/hook-scripts/mailer.py lock \"$REPOS\" \"$USER\" /path/to/mailer.conf"
 
40
       APR_EOL_STR;
 
41
 
 
42
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
 
43
@@ -1223,7 +1221,7 @@
 
44
       APR_EOL_STR
 
45
       "# Send email to interested parties, let them know a lock was removed:"
 
46
       APR_EOL_STR
 
47
-      "mailer.py unlock \"$REPOS\" \"$USER\" /path/to/mailer.conf"
 
48
+      "/usr/lib/subversion/hook-scripts/mailer.py unlock \"$REPOS\" \"$USER\" /path/to/mailer.conf"
 
49
       APR_EOL_STR;
 
50
 
 
51
     SVN_ERR_W (svn_io_file_create (this_path, contents, pool),
 
52
@@ -1333,7 +1331,7 @@
 
53
       "ACTION=\"$5\""
27
54
       APR_EOL_STR
28
55
       APR_EOL_STR
29
56
-      "propchange-email.pl \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" "