Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (813ab243f9b1af05ea152a953896bf75afa710d9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pieter Lenaerts <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (813ab243f9b1af05ea152a953896bf75afa710d9)
  • Date: Thu, 18 Sep 2008 10:17:39 -0500

GIT changes to master grimoire by Pieter Lenaerts <e-type AT sourcemage.org>:

editors/bless/DETAILS | 2 +-
editors/bless/HISTORY | 5 +++++
editors/bless/PRE_BUILD | 2 +-
editors/bless/bless-0.5.1-no_scrollkeeper.patch | 15 ---------------
editors/bless/bless-0.6.0-no_scrollkeeper.patch | 16 ++++++++++++++++
5 files changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 813ab243f9b1af05ea152a953896bf75afa710d9
Author: Pieter Lenaerts <e-type AT sourcemage.org>
Commit: Pieter Lenaerts <e-type AT sourcemage.org>

bless: updated to 0.6.0

diff --git a/editors/bless/DETAILS b/editors/bless/DETAILS
index c1fc723..796c836 100755
--- a/editors/bless/DETAILS
+++ b/editors/bless/DETAILS
@@ -1,5 +1,5 @@
SPELL=bless
- VERSION=0.5.1
+ VERSION=0.6.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://download.gna.org/${SPELL}/${SOURCE}
SOURCE2=${SOURCE}.sig
diff --git a/editors/bless/HISTORY b/editors/bless/HISTORY
index a2e5feb..38def78 100644
--- a/editors/bless/HISTORY
+++ b/editors/bless/HISTORY
@@ -1,3 +1,8 @@
+2008-09-18 Pieter Lenaerts <e-type AT sourcemage.org>
+ * DETAILS: updated to 0.6.0
+ * PRE_BUILD: now uses ${VERSION} to find patch as the problem persists
+ through versions
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: added missing parameter to the is_depends_enabled call

diff --git a/editors/bless/PRE_BUILD b/editors/bless/PRE_BUILD
index 54ad484..e20a3fd 100755
--- a/editors/bless/PRE_BUILD
+++ b/editors/bless/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
if ! is_depends_enabled $SPELL scrollkeeper ; then
patch -p1 -d ${SOURCE_DIRECTORY} < \
- ${SCRIPT_DIRECTORY}/bless-0.5.1-no_scrollkeeper.patch
+ ${SCRIPT_DIRECTORY}/bless-${VERSION}-no_scrollkeeper.patch
fi
diff --git a/editors/bless/bless-0.5.1-no_scrollkeeper.patch
b/editors/bless/bless-0.5.1-no_scrollkeeper.patch
deleted file mode 100644
index 1b4b3f8..0000000
--- a/editors/bless/bless-0.5.1-no_scrollkeeper.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urNp bless-0.5.1.orig/doc/user/Makefile.in
bless-0.5.1/doc/user/Makefile.in
---- bless-0.5.1.orig/doc/user/Makefile.in 2007-06-05 20:28:00.000000000
+0200
-+++ bless-0.5.1/doc/user/Makefile.in 2007-06-05 20:32:05.000000000 +0200
-@@ -330,11 +330,7 @@ uninstall-am: uninstall-local
-
-
- $(OMF): $(OMF).in
-- if [ -x `which scrollkeeper-preinstall` ]; then \
-- scrollkeeper-preinstall
file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml
$(OMF).in $(OMF); \
-- else \
- cp $(OMF).in $(OMF); \
-- fi
-
- doc:
- xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
bless-manual.xml
diff --git a/editors/bless/bless-0.6.0-no_scrollkeeper.patch
b/editors/bless/bless-0.6.0-no_scrollkeeper.patch
new file mode 100644
index 0000000..f51847e
--- /dev/null
+++ b/editors/bless/bless-0.6.0-no_scrollkeeper.patch
@@ -0,0 +1,16 @@
+diff -urNp bless-0.6.0.orig/doc/user/Makefile.in
bless-0.6.0/doc/user/Makefile.in
+--- bless-0.6.0.orig/doc/user/Makefile.in 2008-09-18 16:46:07.000000000
+0200
++++ bless-0.6.0/doc/user/Makefile.in 2008-09-18 17:11:20.000000000 +0200
+@@ -332,11 +332,7 @@ uninstall-am: uninstall-local
+
+
+ $(OMF): $(OMF).in
+- if [ -x `which scrollkeeper-preinstall` ]; then \
+- scrollkeeper-preinstall
file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \
+- else \
+- cp $(OMF).in $(OMF); \
+- fi
++ cp $(OMF).in $(OMF);
+
+ doc:
+ xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
bless-manual.xml



  • [SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (813ab243f9b1af05ea152a953896bf75afa710d9), Pieter Lenaerts, 09/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page