[Pkg-samba-maint] r3489 - in branches/talloc/experimental: . debian
jelmer at alioth.debian.org
jelmer at alioth.debian.org
Sun May 23 01:43:20 UTC 2010
Author: jelmer
Date: 2010-05-23 01:43:19 +0000 (Sun, 23 May 2010)
New Revision: 3489
Removed:
branches/talloc/experimental/buildtools/
branches/talloc/experimental/lib/
Modified:
branches/talloc/experimental/autogen-waf.sh
branches/talloc/experimental/debian/build-orig.sh
branches/talloc/experimental/debian/changelog
branches/talloc/experimental/doxy.config
branches/talloc/experimental/talloc.h
Log:
Fix build-orig.sh for waf.
Modified: branches/talloc/experimental/autogen-waf.sh
===================================================================
--- branches/talloc/experimental/autogen-waf.sh 2010-05-19 20:13:17 UTC (rev 3488)
+++ branches/talloc/experimental/autogen-waf.sh 2010-05-23 01:43:19 UTC (rev 3489)
@@ -1 +1 @@
-link buildtools/scripts/autogen-waf.sh
\ No newline at end of file
+link ../../buildtools/scripts/autogen-waf.sh
\ No newline at end of file
Modified: branches/talloc/experimental/debian/build-orig.sh
===================================================================
--- branches/talloc/experimental/debian/build-orig.sh 2010-05-19 20:13:17 UTC (rev 3488)
+++ branches/talloc/experimental/debian/build-orig.sh 2010-05-23 01:43:19 UTC (rev 3489)
@@ -1,28 +1,24 @@
#!/bin/bash
-REFSPEC=$1
-GIT_URL=$2
+GIT_URL=$1
+REFSPEC=$2
shift 2
if [ -z "$GIT_URL" ]; then
GIT_URL=git://git.samba.org/samba.git
fi
-if [ -z "$REFSPEC" ]; then
- REFSPEC=origin/master
-fi
-
TALLOCTMP=$TMPDIR/$RANDOM.talloc.git
-version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
-git clone --depth 1 -l $GIT_URL $TALLOCTMP
+git clone --depth 1 $GIT_URL $TALLOCTMP
if [ ! -z "$REFSPEC" ]; then
pushd $TALLOCTMP
git checkout $REFSPEC || exit 1
popd
fi
-
-mv $TALLOCTMP/lib/talloc "talloc-$version"
-mv $TALLOCTMP/lib/replace "talloc-$version/libreplace"
+pushd $TALLOCTMP/lib/talloc
+./autogen-waf.sh
+./configure
+make dist
+popd
+version=$( dpkg-parsechangelog -l`dirname $0`/changelog | sed -n 's/^Version: \(.*:\|\)//p' | sed 's/-[0-9.]\+$//' )
+mv $TALLOCTMP/lib/talloc/talloc-*.tar.gz talloc-$version.tar.gz
rm -rf $TALLOCTMP
-pushd "talloc-$version" && ./autogen.sh && popd
-tar cvz "talloc-$version" > "talloc_$version.orig.tar.gz"
-rm -rf "talloc-$version"
Modified: branches/talloc/experimental/debian/changelog
===================================================================
--- branches/talloc/experimental/debian/changelog 2010-05-19 20:13:17 UTC (rev 3488)
+++ branches/talloc/experimental/debian/changelog 2010-05-23 01:43:19 UTC (rev 3489)
@@ -1,3 +1,9 @@
+talloc (2.0.3~git20100517-1) lucid; urgency=low
+
+ * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at debian.org> Fri, 21 May 2010 00:22:17 +0200
+
talloc (2.0.3~git20100506-2) experimental; urgency=low
* Add dependency on python for waf. Closes: #580743
Modified: branches/talloc/experimental/doxy.config
===================================================================
--- branches/talloc/experimental/doxy.config 2010-05-19 20:13:17 UTC (rev 3488)
+++ branches/talloc/experimental/doxy.config 2010-05-23 01:43:19 UTC (rev 3489)
@@ -1247,13 +1247,13 @@
# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.
-MACRO_EXPANSION = NO
+MACRO_EXPANSION = YES
# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
# then the macro expansion is limited to the macros specified with the
# PREDEFINED and EXPAND_AS_DEFINED tags.
-EXPAND_ONLY_PREDEF = NO
+EXPAND_ONLY_PREDEF = YES
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.
@@ -1281,7 +1281,7 @@
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED = DOXYGEN
+PREDEFINED = DOXYGEN PRINTF_ATTRIBUTE(x,y)=
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: branches/talloc/experimental/talloc.h
===================================================================
--- branches/talloc/experimental/talloc.h 2010-05-19 20:13:17 UTC (rev 3488)
+++ branches/talloc/experimental/talloc.h 2010-05-23 01:43:19 UTC (rev 3489)
@@ -1265,7 +1265,31 @@
* @return The duplicated string, NULL on error.
*/
char *talloc_strdup(const void *t, const char *p);
+
+/**
+ * @brief Append a string to given string and duplicate the result.
+ *
+ * @param[in] s The destination to append to.
+ *
+ * @param[in] a The string you want to append.
+ *
+ * @return The duplicated string, NULL on error.
+ *
+ * @see talloc_strdup()
+ */
char *talloc_strdup_append(char *s, const char *a);
+
+/**
+ * @brief Append a string to a given buffer and duplicate the result.
+ *
+ * @param[in] s The destination buffer to append to.
+ *
+ * @param[in] a The string you want to append.
+ *
+ * @return The duplicated string, NULL on error.
+ *
+ * @see talloc_strdup()
+ */
char *talloc_strdup_append_buffer(char *s, const char *a);
/**
@@ -1289,7 +1313,39 @@
* @return The duplicated string, NULL on error.
*/
char *talloc_strndup(const void *t, const char *p, size_t n);
+
+/**
+ * @brief Append at most n characters of a string to given string and duplicate
+ * the result.
+ *
+ * @param[in] s The destination string to append to.
+ *
+ * @param[in] a The source string you want to append.
+ *
+ * @param[in] n The number of characters you want to append from the
+ * string.
+ *
+ * @return The duplicated string, NULL on error.
+ *
+ * @see talloc_strndup()
+ */
char *talloc_strndup_append(char *s, const char *a, size_t n);
+
+/**
+ * @brief Append at most n characters of a string to given buffer and duplicate
+ * the result.
+ *
+ * @param[in] s The destination buffer to append to.
+ *
+ * @param[in] a The source string you want to append.
+ *
+ * @param[in] n The number of characters you want to append from the
+ * string.
+ *
+ * @return The duplicated string, NULL on error.
+ *
+ * @see talloc_strndup()
+ */
char *talloc_strndup_append_buffer(char *s, const char *a, size_t n);
/**
@@ -1314,7 +1370,37 @@
* @return The formatted string, NULL on error.
*/
char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) PRINTF_ATTRIBUTE(2,0);
+
+/**
+ * @brief Format a string given a va_list and append it to the given destination
+ * string.
+ *
+ * @param[in] s The destination string to append to.
+ *
+ * @param[in] fmt The format string.
+ *
+ * @param[in] ap The parameters used to fill fmt.
+ *
+ * @return The formatted string, NULL on error.
+ *
+ * @see talloc_vasprintf()
+ */
char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) PRINTF_ATTRIBUTE(2,0);
+
+/**
+ * @brief Format a string given a va_list and append it to the given destination
+ * buffer.
+ *
+ * @param[in] s The destination buffer to append to.
+ *
+ * @param[in] fmt The format string.
+ *
+ * @param[in] ap The parameters used to fill fmt.
+ *
+ * @return The formatted string, NULL on error.
+ *
+ * @see talloc_vasprintf()
+ */
char *talloc_vasprintf_append_buffer(char *s, const char *fmt, va_list ap) PRINTF_ATTRIBUTE(2,0);
/**
More information about the Pkg-samba-maint
mailing list