From 4787c5564fbd05f29a193bb3b957ac2fc7e68aa0d5211c77a55fa54127829ef2 Mon Sep 17 00:00:00 2001
From: Frank Sundermeyer <fs@suse.com>
Date: Mon, 19 Sep 2011 11:20:18 +0000
Subject: [PATCH] - Completely rewrote the verbosity stuff:   * Verbosity none:
 only display on line with result (default)   * Verbosity 1 (-v, --verbose=1):
 print the most important target results   * Verbosity 2 (-vv --verbose=2):
 print all commands called by make   * Default verbosity level can be
 overwritten in ~/.daps/config via     VERBOSITY=(0|1|2) - General option -d
 is no longer supported to avoid confusion with   subcommand option -d (draft
 mode) - use --debug instead - Replaced target clean-book with clean-results -
 Updated BUGS and TODO - Stylesheets:   * fixed bnc#573835 (PDF metadata) -
 Bugfix: BUILD_DIR is now set in the makefiles - Packaging:   * added script
 that generates the source tarball via     svn export   * added %{ext_man} to
 spec file

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=46
---
 daps-0.9beta7.tar.bz2 |  4 +--
 daps.changes          | 21 +++++++++++++
 fetch_source          | 70 +++++++++++++++++++++++++++++++++++++++++++
 fetchdapsspec         |  7 -----
 4 files changed, 93 insertions(+), 9 deletions(-)
 create mode 100644 fetch_source
 delete mode 100644 fetchdapsspec

diff --git a/daps-0.9beta7.tar.bz2 b/daps-0.9beta7.tar.bz2
index fb93659..b4ddbf4 100644
--- a/daps-0.9beta7.tar.bz2
+++ b/daps-0.9beta7.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2844a4e78cd7a833cbeae1d68ce12c587747a96296b045e8857bc7794942f55
-size 753215
+oid sha256:bba4c0d60395948d8f7be603832836d64214bac887b3dbbdea2db182b051cab8
+size 759814
diff --git a/daps.changes b/daps.changes
index 083ab34..906f0f3 100644
--- a/daps.changes
+++ b/daps.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Sep 19 10:46:07 UTC 2011 - fsundermeyer@opensuse.org
+
+- Completely rewrote the verbosity stuff:
+  * Verbosity none: only display on line with result (default)
+  * Verbosity 1 (-v, --verbose=1): print the most important target results
+  * Verbosity 2 (-vv --verbose=2): print all commands called by make
+  * Default verbosity level can be overwritten in ~/.daps/config via
+    VERBOSITY=(0|1|2)
+- General option -d is no longer supported to avoid confusion with
+  subcommand option -d (draft mode) - use --debug instead
+- Replaced target clean-book with clean-results
+- Updated BUGS and TODO
+- Stylesheets:
+  * fixed bnc#573835 (PDF metadata)
+- Bugfix: BUILD_DIR is now set in the makefiles
+- Packaging:
+  * added script that generates the source tarball via
+    svn export
+  * added %{ext_man} to spec file
+
 -------------------------------------------------------------------
 Mon Sep 19 06:58:53 UTC 2011 - toms@suse.de
 
diff --git a/fetch_source b/fetch_source
new file mode 100644
index 0000000..f689c2c
--- /dev/null
+++ b/fetch_source
@@ -0,0 +1,70 @@
+#!/bin/bash
+#
+#
+# Create DAPS source tarball from SVN
+#
+# Copyright (C) 2004 - 2011 SUSE Linux Products GmbH
+#
+# Author:
+# Frank Sundermeyer <fsundermeyer at opensuse dot org>
+#
+
+NAME=daps
+VERSION=
+SPECFILE=${NAME}.spec
+SVNPATH=https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/tools/daps
+TMPDIR=$(mktemp -q -d --tmpdir daps_XXXXXXXX)
+EXCLUDES=${TMPDIR}/${NAME}/packaging/exclude-files_for_daps_package.txt
+
+#----------
+# Functions
+#----------
+
+# exit on error
+#
+function exit_on_error {
+    echo -e "$1"
+    rm -rf $TMPDIR
+    exit 1
+}
+#-----
+# MAIN
+#-----
+#
+# This script needs to be called from the daps osc checkout directory, so
+# lets check whethter we are in the correct directory
+#
+if [[ ! -s daps.spec && ! -d .osc ]]; then
+    echo "Looks like you are not in the daps checkout directory."
+    read -p "Continue anyway (y/n) [n]: " CONT
+    if [[ n = $CONT || N = $CONT ]]; then
+        exit_on_error "Aborted by user."
+    fi
+fi
+
+#
+# Export daps from SVN 
+#
+svn export -q $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed"
+
+#
+# Get the version number
+#
+VERSION=$(egrep "^Version:\s*" ${TMPDIR}/${NAME}/packaging/$SPECFILE | sed 's/^Version:\s*//')
+
+if [[ -z $VERSION ]]; then
+    exit_on_error "Couldn't get version number from spec-file."
+fi
+
+#
+# Create the tarball
+#
+export BZIP2=--best
+tar cjhf ${NAME}-${VERSION}.tar.bz2 -C ${TMPDIR} \
+    --exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the tarball."
+
+echo "Successfully created ${NAME}-${VERSION}.tar.bz2"
+
+rm -rf ${TMPDIR}
+
+exit 0
diff --git a/fetchdapsspec b/fetchdapsspec
deleted file mode 100644
index e170981..0000000
--- a/fetchdapsspec
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Fetch the DAPS SPEC file from our SVN
-
-
-
-[ -e daps.spec ] && old daps.spec
-svn cat https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/tools/daps/packaging/daps.spec > daps.spec