Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32676
Modified Files:
libapache2-mod-svn.info svn.info
Log Message:
Remove cruft
Index: libapache2-mod-svn.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/libapache2-mod-svn.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- libapache2-mod-svn.info 12 Jan 2007 19:32:58 -0000 1.11
+++ libapache2-mod-svn.info 12 Jan 2007 20:47:38 -0000 1.12
@@ -68,28 +68,6 @@
PreInstScript: <<
if [ "$1" = upgrade ]; then
if dpkg --compare-versions "$2" lt "1.2.0"; then
-<<<<<<< libapache2-mod-svn.info
- echo ""
- echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
- echo "If you are upgrading from an earlier version and you are using"
- echo "BDB repositories please read"
- echo ""
- echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
- echo ""
- echo "and"
- echo ""
- echo " http://subversion.tigris.org/faq.html#dumpload";
- echo ""
- echo "To install svnadmin binary linked to an older Berkeley DB version"
- echo "please install the fink package 'svnadmin-dbXX', e.g. by typing"
- echo ""
- echo " fink install svnadmin-db43"
- echo "and following the documentation of svnadmin-dbXX, e.g.:"
- echo ""
- echo " fink info svnadmin-db43"
- echo ""
- /bin/echo "Do you want to continue [Y/n] ? \c";
-=======
/bin/echo ""
/bin/echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
/bin/echo "If you are upgrading from an earlier version and you are using"
@@ -111,7 +89,6 @@
/bin/echo " fink info svnadmin-db43"
/bin/echo ""
/bin/echo "Do you want to continue [Y/n] ?\c";
->>>>>>> 1.10
if read -t 3600 CONTINUECHOICE; then
case $CONTINUECHOICE in
y|Y|'' ) ;;
Index: svn.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/svn.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- svn.info 12 Jan 2007 19:32:58 -0000 1.17
+++ svn.info 12 Jan 2007 20:47:38 -0000 1.18
@@ -165,28 +165,6 @@
PreInstScript: <<
if [ "$1" = upgrade ]; then
if dpkg --compare-versions "$2" lt "1.2.0"; then
-<<<<<<< svn.info
- echo ""
- echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
- echo "If you are upgrading from an earlier version and you are using"
- echo "BDB repositories please read"
- echo ""
- echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
- echo ""
- echo "and"
- echo ""
- echo " http://subversion.tigris.org/faq.html#dumpload";
- echo ""
- echo "To install svnadmin binary linked to an older Berkeley DB version"
- echo "please install the fink package 'svnadmin-dbXX', e.g. by typing"
- echo ""
- echo " fink install svnadmin-db43"
- echo "and following the documentation of svnadmin-dbXX, e.g.:"
- echo ""
- echo " fink info svnadmin-db43"
- echo ""
- /bin/echo "Do you want to continue [Y/n] ? \c";
-=======
/bin/echo ""
/bin/echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
/bin/echo "If you are upgrading from an earlier version and you are using"
@@ -208,7 +186,6 @@
/bin/echo " fink info svnadmin-db43"
/bin/echo ""
/bin/echo "Do you want to continue [Y/n] ?\c";
->>>>>>> 1.16
if read -t 3600 CONTINUECHOICE; then
case $CONTINUECHOICE in
y|Y|'' ) ;;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
