summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Samuelson <peter@p12n.org>2010-04-20 03:36:21 +0000
committerPeter Samuelson <peter@p12n.org>2010-04-20 03:36:21 +0000
commitfb1665e0dda2be548757c5e09671571a0d298b9c (patch)
tree0f2288dc074b3c0679a972c51fb2c133541d56e2
parent58715a2e000962637525883822c6d3baf5b38e43 (diff)
1.6.11.
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/repos-templates4
-rw-r--r--debian/patches/rpath2
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 5cc9428..a466527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+subversion (1.6.11dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version. Rediff a patch or two.
+
+ -- Peter Samuelson <peter@p12n.org> Fri, 16 Apr 2010 16:44:28 -0500
+
subversion (1.6.9dfsg-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates
index 3d07bc6..d103e20 100644
--- a/debian/patches/repos-templates
+++ b/debian/patches/repos-templates
@@ -11,8 +11,8 @@
"# For more examples and pre-written hooks, see those in" NL \
- "# the Subversion repository at" NL \
+ "# /usr/share/subversion/hook-scripts, and in the repository at" NL \
- "# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and" NL \
- "# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/" NL
+ "# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and" NL \
+ "# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/" NL
@@ -345,8 +345,11 @@
"REPOS=\"$1\"" NL
diff --git a/debian/patches/rpath b/debian/patches/rpath
index 6b0c597..d50883d 100644
--- a/debian/patches/rpath
+++ b/debian/patches/rpath
@@ -16,7 +16,7 @@
# special link rule for mod_dav_svn
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
-@@ -677,7 +678,9 @@
+@@ -678,7 +679,9 @@
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL