You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/08/04 22:18:51 UTC
svn commit: r1153995 - in /subversion/branches/1.7.x: ./ STATUS build.conf
Author: hwright
Date: Thu Aug 4 20:18:50 2011
New Revision: 1153995
URL: http://svn.apache.org/viewvc?rev=1153995&view=rev
Log:
Merge r1149627 from trunk:
* r1149627
Adjust library order in build.conf for kwallet/gnome-keyring.
Justification:
Fixes "make install DESTDIR=..." which is used by packagers. I suspect
this is not a regression.
Votes:
+1: philip, danielsh, gstein
+0: cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build.conf
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 4 20:18:50 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152282,1152726,1153416,1153799,1153807
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152282,1152726,1153416,1153799,1153807
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1153995&r1=1153994&r2=1153995&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 4 20:18:50 2011
@@ -209,12 +209,3 @@ Approved changes:
this revision depends for a clean merge).
Votes:
+1: rhuijben, danielsh, cmpilato
-
- * r1149627
- Adjust library order in build.conf for kwallet/gnome-keyring.
- Justification:
- Fixes "make install DESTDIR=..." which is used by packagers. I suspect
- this is not a regression.
- Votes:
- +1: philip, danielsh, gstein
- +0: cmpilato
Modified: subversion/branches/1.7.x/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build.conf?rev=1153995&r1=1153994&r2=1153995&view=diff
==============================================================================
--- subversion/branches/1.7.x/build.conf (original)
+++ subversion/branches/1.7.x/build.conf Thu Aug 4 20:18:50 2011
@@ -180,7 +180,7 @@ description = Subversion GNOME Keyring L
type = lib
install = gnome-keyring-lib
path = subversion/libsvn_auth_gnome_keyring
-libs = apr gnome-keyring libsvn_subr
+libs = libsvn_subr apr gnome-keyring
# Support for KWallet
[libsvn_auth_kwallet]
@@ -188,7 +188,7 @@ description = Subversion KWallet Library
type = lib
install = kwallet-lib
path = subversion/libsvn_auth_kwallet
-libs = apr kwallet libsvn_subr
+libs = libsvn_subr apr kwallet
link-cmd = $(LINK_CXX_LIB)
# Library needed by all subversion clients