Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (a4c16767fb8a6836aa5922cbf2ec24c52ec7acd3)

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 master grimoire by Arwed von Merkatz (a4c16767fb8a6836aa5922cbf2ec24c52ec7acd3)
  • Date: Wed, 16 May 2007 16:19:27 -0500

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

editors/vim/DETAILS | 2 +-
editors/vim/HISTORY | 5 +++++
editors/vim/PRE_BUILD | 3 +++
editors/vim/new_changelog_entry.patch | 11 +++++++++++
video/ffmpeg-svn/DETAILS | 2 +-
video/ffmpeg-svn/HISTORY | 4 ++++
6 files changed, 25 insertions(+), 2 deletions(-)

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

ffmpeg-svn: FORCE_DOWNLOAD for all versions

commit ba2421fb4d296e5c96cc207c3077f30ea0880e2c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

vim: fixed the NewChangelogEntry command

diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 6aa31b1..a9cc468 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -29,7 +29,7 @@ fi
ENTERED=20010922
UPDATED=20050919
KEYWORDS="editors"
- PATCHLEVEL=1
+ PATCHLEVEL=2
SHORT="VIM is an improved version of vi."
cat << EOF
VIM is an improved version of the editor vi, one of the standard text
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 5ab346c..a492375 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,8 @@
+2007-05-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, new_changelog_entry.patch: fix :NewChangelogEntry
+ command
+ * DETAILS: PATCHLEVEL++
+
2007-05-13 Pieter Lenaerts <e-type AT sourcemage.org>
* DETAILS: updated to 7.1

diff --git a/editors/vim/PRE_BUILD b/editors/vim/PRE_BUILD
new file mode 100755
index 0000000..ad0828f
--- /dev/null
+++ b/editors/vim/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/new_changelog_entry.patch
diff --git a/editors/vim/new_changelog_entry.patch
b/editors/vim/new_changelog_entry.patch
new file mode 100644
index 0000000..7ad3c08
--- /dev/null
+++ b/editors/vim/new_changelog_entry.patch
@@ -0,0 +1,11 @@
+--- runtime/ftplugin/changelog.vim~ 2007-05-06 21:58:26.000000000 +0200
++++ runtime/ftplugin/changelog.vim 2007-05-16 22:13:44.000000000 +0200
+@@ -131,7 +131,7 @@
+
+ " Regular expression used to find the end of a date entry
+ if !exists('g:changelog_date_end_entry_search')
+- let g:changelog_date_entry_search = '^\s*$'
++ let g:changelog_date_end_entry_search = '^\s*$'
+ endif
+
+
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index d4495c8..e469bef 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffmpeg-svn
if test "$FFMPEG_SVN_AUTOUPDATE" = "y"; then
VERSION=$(date +%Y%m%d)
- FORCE_DOWNLOAD=on
else
VERSION=svn
fi
+ FORCE_DOWNLOAD=on
SOURCE=$SPELL.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 3cc46fe..4d6c2a3 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2007-05-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: move FORCE_DOWNLOAD out of the conditional so it applies
+ to all versions
+
2007-02-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFLICTS: removed ffmpeg-cvs, deprecation complete




  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (a4c16767fb8a6836aa5922cbf2ec24c52ec7acd3), Arwed von Merkatz, 05/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page