Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.42 grimoire by Arwed von Merkatz (f58f470c765ba1d9c20c5c99f4f28973b71c770b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.42 grimoire by Arwed von Merkatz (f58f470c765ba1d9c20c5c99f4f28973b71c770b)
  • Date: Mon, 12 Apr 2010 11:19:16 -0500

GIT changes to stable-0.42 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

VERSION | 2 +-
devel/git/DEPENDS | 5 +++++
devel/git/HISTORY | 4 ++++
disk/fuse/BUILD | 4 +++-
disk/fuse/DETAILS | 4 ++--
disk/fuse/HISTORY | 4 ++++
6 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit f58f470c765ba1d9c20c5c99f4f28973b71c770b
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.42-4

commit 5efbcd6329e192c3a830fb5ce4b3ab31f768dac6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

fuse: corrected pkgconfig dir, b0rked by some of the previous commits
(cherry picked from commit 29956bb0c827d1159d5bb57a3fc69215e77615a1)

commit 59ba78863e24377e091b2149447b5f73a3a7cfb3
Author: David Kowis <dkowis AT shlrm.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

git: fixed bug 15652

http://bugs.sourcemage.org/show_bug.cgi?id=15652
Makes python an optional dependency for the git_remote_helpers

diff --git a/VERSION b/VERSION
index 7331241..fa0ee32 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.42-3
+0.42-4
diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index 76628e9..e14a372 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -25,6 +25,11 @@ optional_depends tk \
"--without-tcltk" \
"for interactive GUI and graphical history browser" &&

+optional_depends python \
+ "" \
+ "--without-python" \
+ "for git_remote_helpers end users don't typically use
these. (see git's man page and look for the helper commands)" &&
+
suggest_depends dbd-sqlite "" "" "for git-cvsserver" &&
suggest_depends bash-completion "" "" "for bash completion of Git commands"
&&
suggest_depends rsync "" "" "for syncing repos with rsync"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 39586c7..632f426 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,7 @@
+2010-04-09 David Kowis <dkowis AT shlrm.org>
+ * DEPENDS: added optional dependency on python
+ Noted what you'd lose if you don't include python
+
2010-02-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7.0

diff --git a/disk/fuse/BUILD b/disk/fuse/BUILD
index 2277ee7..4538a62 100755
--- a/disk/fuse/BUILD
+++ b/disk/fuse/BUILD
@@ -2,7 +2,9 @@ if [[ $CVS == y ]]; then
OPTS="$OPTS --disable-mtab"
fi &&

-OPTS="--exec-prefix=$INSTALL_ROOT/ $OPTS" &&
+OPTS="--exec-prefix=$INSTALL_ROOT/ \
+ --with-pkgconfigdir=$INSTALL_ROOT/usr/lib/pkgconfig \
+ $OPTS" &&

default_build_configure &&

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index c63443e..36ad8e6 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -20,9 +20,9 @@ fi
WEB_SITE=http://fuse.sourceforge.net/
ENTERED=20040209
LICENSE[0]=GPL
- PATCHLEVEL=1
+ PATCHLEVEL=2
KEYWORDS="disk"
- SHORT="FUSE is an interface for filesystems implemented in
userspace"
+ SHORT="interface for filesystems implemented in userspace"
cat << EOF
FUSE (Filesystem in USErspace) is an interface for filesystems implemented
in userspace.
EOF
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 1522af9..fd0e928 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,7 @@
+2010-03-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL+=1; fixed short desc
+ * BUILD: corrected pkgconfig dir, b0rked by some of the previous
commits
+
2010-03-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* BUIlD: Install binaries to / (Bug #15622)



  • [SM-Commit] GIT changes to stable-0.42 grimoire by Arwed von Merkatz (f58f470c765ba1d9c20c5c99f4f28973b71c770b), Arwed von Merkatz, 04/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page