Your message dated Tue, 2 Nov 2010 18:19:06 +0100 with message-id <20101102171906.GA22963@patate.is-a-geek.org> and subject line Re: Bug#602098: unblock: xfce4-dev-tools/4.7.3-1 (pre-ack) has caused the Debian Bug report #602098, regarding unblock: xfce4-dev-tools/4.7.3-1 (pre-ack) to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 602098: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602098 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: xfce4-dev-tools/4.7.3-1 (pre-ack)
- From: Lionel Le Folgoc <mrpouit@gmail.com>
- Date: Mon, 01 Nov 2010 16:43:14 +0100
- Message-id: <20101101154314.7959.70706.reportbug@urgo.lefolgoc.net>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: freeze-exception Hi, Xfce4-dev-tools contains some tools to work with the upstream git repository (autogen, commit, etc.). A new 4.7.3 version has been released a few days ago. It mostly adds automake-1.11 support (already carried as a patch in 4.7.2-3), and a new automake macro for documentation, which some upstream projects use. This means that xfce4-dev-tools >= 4.7.3 is required to build them from git. See 'debiff.patch', which contains the debdiff between 4.7.2-3 and the candidate package for 4.7.3-1 (autofoo files stripped); 'changes.patch' is the git diff between the two upstream tags xfce4-dev-tools-4.7.2 and xfce4-dev-tools-4.7.3. Is it okay to upload, so squeeze users can build these modules without issue? Thanks! Cheers, Lionel -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (101, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.36-trunk-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dashdiffstat for xfce4-dev-tools-4.7.2 xfce4-dev-tools-4.7.3 debian/changelog | 8 ++++ debian/control | 3 + debian/patches/01_support-automake1.11.patch | 22 ------------ scripts/xdt-autogen.in.in | 48 ++++++++++++++++++++++++--- xfce4-dev-tools.spec | 2 - 5 files changed, 54 insertions(+), 29 deletions(-) diff -Nru --exclude configure --exclude configure.in --exclude aclocal.m4 --exclude ChangeLog --exclude Makefile.am --exclude Makefile.in --exclude INSTALL --exclude NEWS --exclude install-sh --exclude missing xfce4-dev-tools-4.7.2/debian/changelog xfce4-dev-tools-4.7.3/debian/changelog --- xfce4-dev-tools-4.7.2/debian/changelog 2010-11-01 16:28:16.000000000 +0100 +++ xfce4-dev-tools-4.7.3/debian/changelog 2010-11-01 16:28:16.000000000 +0100 @@ -1,3 +1,11 @@ +xfce4-dev-tools (4.7.3-1) UNRELEASED; urgency=low + + * New upstream release. + * debian/patches/01_support-automake1.11.patch: dropped, included upstream. + * debian/control: add myself to Uploaders. + + -- Lionel Le Folgoc <mrpouit@gmail.com> Mon, 01 Nov 2010 16:09:42 +0100 + xfce4-dev-tools (4.7.2-3) unstable; urgency=low * debian/control: diff -Nru --exclude configure --exclude configure.in --exclude aclocal.m4 --exclude ChangeLog --exclude Makefile.am --exclude Makefile.in --exclude INSTALL --exclude NEWS --exclude install-sh --exclude missing xfce4-dev-tools-4.7.2/debian/control xfce4-dev-tools-4.7.3/debian/control --- xfce4-dev-tools-4.7.2/debian/control 2010-11-01 16:28:16.000000000 +0100 +++ xfce4-dev-tools-4.7.3/debian/control 2010-11-01 16:28:16.000000000 +0100 @@ -2,7 +2,8 @@ Section: xfce Priority: optional Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org> -Uploaders: Yves-Alexis Perez <corsac@debian.org>, Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li> +Uploaders: Yves-Alexis Perez <corsac@debian.org>, Emanuele Rocca <ema@debian.org>, + Simon Huggins <huggie@earth.li>, Lionel Le Folgoc <mrpouit@gmail.com> Build-Depends: debhelper (>= 7), autotools-dev, cdbs Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/ diff -Nru --exclude configure --exclude configure.in --exclude aclocal.m4 --exclude ChangeLog --exclude Makefile.am --exclude Makefile.in --exclude INSTALL --exclude NEWS --exclude install-sh --exclude missing xfce4-dev-tools-4.7.2/debian/patches/01_support-automake1.11.patch xfce4-dev-tools-4.7.3/debian/patches/01_support-automake1.11.patch --- xfce4-dev-tools-4.7.2/debian/patches/01_support-automake1.11.patch 2010-11-01 16:28:16.000000000 +0100 +++ xfce4-dev-tools-4.7.3/debian/patches/01_support-automake1.11.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in -index 2d14ef8..5e2ce49 100644 ---- a/scripts/xdt-autogen.in.in -+++ b/scripts/xdt-autogen.in.in -@@ -429,7 +429,7 @@ done - ## simply aclocal. - ## - test -z "${XDT_PROG_ACLOCAL}" && --for i in aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do -+for i in aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do - (${i} --version) </dev/null >/dev/null 2>&1 && - XDT_PROG_ACLOCAL=${i} && break - done -@@ -473,7 +473,7 @@ done - ## simply automake. - ## - test -z "${XDT_PROG_AUTOMAKE}" && --for i in automake-1.10 automake-1.9 automake-1.8 automake; do -+for i in automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake; do - (${i} --version) </dev/null >/dev/null 2>&1 && - XDT_PROG_AUTOMAKE=${i} && break - done diff -Nru --exclude configure --exclude configure.in --exclude aclocal.m4 --exclude ChangeLog --exclude Makefile.am --exclude Makefile.in --exclude INSTALL --exclude NEWS --exclude install-sh --exclude missing xfce4-dev-tools-4.7.2/scripts/xdt-autogen.in.in xfce4-dev-tools-4.7.3/scripts/xdt-autogen.in.in --- xfce4-dev-tools-4.7.2/scripts/xdt-autogen.in.in 2009-08-27 00:01:34.000000000 +0200 +++ xfce4-dev-tools-4.7.3/scripts/xdt-autogen.in.in 2010-10-31 15:10:34.000000000 +0100 @@ -70,7 +70,7 @@ ## parse_configure_subdirs() { - cat "$1" | tr '\\n\\t\\\\' ' ' | sed -ne 's|.*AC_CONFIG_SUBDIRS(\[\{0,1\}\([[:alnum:]_ @/-]\{1,\}\).*|\1|p' + test -f "$1" && cat "$1" | tr '\\n\\t\\\\' ' ' | sed -ne 's|.*AC_CONFIG_SUBDIRS(\[\{0,1\}\([[:alnum:]_ @/-]\{1,\}\).*|\1|p' } ## @@ -197,8 +197,11 @@ } if ! do_version_check; then - echo "This version of xdt-autogen ($VERSION) is too old. Version" >&2 - echo "$XDT_AUTOGEN_REQUIRED_VERSION or greater is required." >&2 + cat >&2 <<EOF +xdt-autogen: This version of xdt-autogen ($VERSION) is too old. + Version $XDT_AUTOGEN_REQUIRED_VERSION or greater is required. +EOF + exit 1 fi @@ -215,6 +218,41 @@ MASTER_DIR=`pwd`; test -z "${MASTER_DIR}" && MASTER_DIR="." ## +## Check for documentation submodule +## +if test -n "$XDT_AUTOGEN_CHECK_DOCS"; then + if test ! -f "$MASTER_DIR/$XDT_AUTOGEN_CHECK_DOCS/Makefile.am"; then + # Check for git and needed files, if found, automatically + # update the submodule + if test -d .git -a -f .gitmodules; then + echo "xdt-autogen: Automaticcaly initializing the $XDT_AUTOGEN_CHECK_DOCS submodule." + + # Run git command to get the lastest docs revision + res=0 && git submodule sync $XDT_AUTOGEN_CHECK_DOCS && \ + git submodule update --init $XDT_AUTOGEN_CHECK_DOCS && res=1 + + if test $res -eq 0; then + cat >&2 <<EOF +xdt-autogen: Pulling the xfce4-docs git submodule failed. See errors + above for more information and take a look at + http://wiki.xfce.org/documentation. +EOF + exit 1 + fi + else + cat >&2 <<EOF +xdt-autogen: The directory $XDT_AUTOGEN_CHECK_DOCS does not contain + the required files to run configure. See + http://wiki.xfce.org/documentation for more information. +EOF + exit 1 + fi + #else + # We could warn about out-of-date submodules here. + fi +fi + +## ## First we do some substitutions to generate configure.{ac,in} if necessary ## CONFIGURE_AC_IN_FILES=`lookup_configure_ac_in_files "$MASTER_DIR"` @@ -429,7 +467,7 @@ ## simply aclocal. ## test -z "${XDT_PROG_ACLOCAL}" && -for i in aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do +for i in aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do (${i} --version) </dev/null >/dev/null 2>&1 && XDT_PROG_ACLOCAL=${i} && break done @@ -473,7 +511,7 @@ ## simply automake. ## test -z "${XDT_PROG_AUTOMAKE}" && -for i in automake-1.10 automake-1.9 automake-1.8 automake; do +for i in automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake; do (${i} --version) </dev/null >/dev/null 2>&1 && XDT_PROG_AUTOMAKE=${i} && break done diff -Nru --exclude configure --exclude configure.in --exclude aclocal.m4 --exclude ChangeLog --exclude Makefile.am --exclude Makefile.in --exclude INSTALL --exclude NEWS --exclude install-sh --exclude missing xfce4-dev-tools-4.7.2/xfce4-dev-tools.spec xfce4-dev-tools-4.7.3/xfce4-dev-tools.spec --- xfce4-dev-tools-4.7.2/xfce4-dev-tools.spec 2009-09-20 21:43:07.000000000 +0200 +++ xfce4-dev-tools-4.7.3/xfce4-dev-tools.spec 2010-10-31 15:10:37.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Xfce developer tools Name: xfce4-dev-tools -Version: 4.7.2 +Version: 4.7.3 Release: 1 License: GPL URL: http://xfce.org/~benny/projects/xfce4-dev-tools/ChangeLog | 478 --------------------------------------------- ChangeLog.pre-git | 342 -------------------------------- Makefile.am | 9 + NEWS | 7 + configure.in.in | 2 +- scripts/xdt-autogen.in.in | 48 ++++- 6 files changed, 60 insertions(+), 826 deletions(-) diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 6f3c727..0000000 --- a/ChangeLog +++ /dev/null @@ -1,478 +0,0 @@ -2009-09-19 Brian J. Tarricone <brian@tarricone.org> - - * ChangeLog, configure.in.in: == 4.7.2 released! == - - * NEWS, configure.in.in, m4macros/xdt-features.m4: fix typo that breaks - XDT_FEATURE_LINKER_OPTS - - * ChangeLog, configure.in.in: == 4.7.1 released! == - - * m4macros/xdt-features.m4: put --disable-debug back and fix defaults for - visibility and linker opts also make the non-defaults explicit and therefore - less confusing (it worked before due to default autoconf shell-ification of - the first arg, but that's not immediately clear) - -2009-09-19 Jannis Pohlmann <jannis@xfce.org> - - * m4macros/xdt-features.m4: Fix XDT_FEATURE_LINKER_OPTS and - XDT_FEATURE_VISIBILITY. AC_ARG_ENABLE executes the code its last parameter - if the --enable flag is not provided, not if the --disable flag is not - provided. That's why we need to set the value to "no", not to "yes". Also - don't show the --disable-debug option (with weird indentation) because the - help message already explains that there are --disable variants for all - --enable options. - - * m4macros/xdt-features.m4: Fix default detection and $enable_debug value in - XDT_FEATURE_DEBUG(). This uses the m4_default() macro instead of the custom - code to check which debug level should be used as the default. $default_level - was not set when running configure with --help before. It seems we also need - to use [enable_debug=$enableval] in AC_ARG_ENABLE() for enable_debug to be - set. Tested it and it works fine. - -2009-09-18 Brian J. Tarricone <brian@tarricone.org> - - * NEWS, m4macros/xdt-features.m4: beef up the XDT_FEATURE_DEBUG macro a bit - - * README: s/SVN/Git/ - - * NEWS, m4macros/xdt-features.m4: add XDT_FEATURE_LINKER_OPTS - - * NEWS, m4macros/xdt-features.m4: add XDT_FEATURE_VISIBILITY - -2009-08-26 Brian J. Tarricone <brian@tarricone.org> - - * scripts/xdt-autogen.in.in: add do-not-edit warning to top of autogenerated - configure.{ac,in} - - * scripts/xdt-autogen.in.in: remove configure.{ac,in} on 'clean' if - configure.{ac,in}.in exists - - * scripts/xdt-autogen.in.in: print warning if attempting to compare git - revision versions we can't tell version ordering, but it's possible it's - fine, so just print a warning and proceed. autogen.sh writers shouldn't - depend on particular git revisions, only on release versions, but let's - soft-allow it. - - * scripts/xdt-autogen.in.in: make lookup_configure_ac_files act like - lookup_configure_ac_in_files - - * .gitignore: add gitignore - - * scripts/xdt-autogen.in.in: rename CONFIGURE_FILES to CONFIGURE_AC_FILES for - clarity also rename some similar vars/functions for the same reason - - * scripts/xdt-autogen.in.in: be a little more portable, and select the best - awk implementation - - * NEWS, scripts/xdt-autogen.in.in: also recognize new-school - AC_CONFIG_HEADERS() as requiring autoheader - - * scripts/xdt-autogen.in.in: the -q option to grep is specified by POSIX, so - no reason not to use it - -2009-08-18 Brian J. Tarricone <brian@tarricone.org> - - * configure.in.in: re-add git revision tag - - * configure.in.in: == 4.7.0 released! == - - * ChangeLog, ChangeLog.pre-git: rename ChangeLog and autogenerate new one - - * scripts/Makefile.am: fix distcheck (output is in builddir, not srcdir) - - * autogen.sh, configure.in.in: use git for revision substitution - - * NEWS, scripts/xdt-autogen.in.in: do @REVISION@ and @LINGUAS@ substitution - in xdt-autogen - -2009-08-12 Brian J. Tarricone <brian@tarricone.org> - - * module.xml: add module description file - -2009-07-28 Brian Tarricone <brian@tarricone.org> - - * ChangeLog, NEWS, configure.in.in, scripts/Makefile.am, - scripts/xdt-autogen.in, scripts/xdt-autogen.in.in: add --version and -V - options, add required minimum version check. users who wish to require a - minimum version of xdt-autogen should export XDT_AUTOGEN_REQUIRED_VERSION, - set to the minimum required version that is supported. (Old svn revision: - 30414) - - * ChangeLog, NEWS, scripts/xdt-autogen.in: also support the newer - IT_PROG_INTLTOOL macro (Old svn revision: 30408) - -2009-05-04 Brian Tarricone <brian@tarricone.org> - - * ChangeLog, m4macros/xdt-features.m4: * m4macros/xdt-features.m4: Add a - bunch more compiler warning options when --enable-debug={yes,full} is - specified. (Old svn revision: 29924) - -2009-02-25 Stephan Arts <stephan@xfce.org> - - * ChangeLog, NEWS, configure.in.in: Update Changelog, NEWS and version-info - (Old svn revision: 29589) - -2009-01-25 Jannis Pohlmann <jannis@xfce.org> - - * ChangeLog, configure.in.in: * == 4.5.99.1 released! == * configure.in.in: - Bump version. (Old svn revision: 29313) - -2009-01-14 Jannis Pohlmann <jannis@xfce.org> - - * ChangeLog, configure.in.in: * configure.in.in: Post-release version bump. - (Old svn revision: 29243) - -2009-01-12 Jannis Pohlmann <jannis@xfce.org> - - * ChangeLog, configure.in.in: * == 4.5.93 released! == * configure.in.in: - Bump version. (Old svn revision: 29189) - -2009-01-10 Jannis Pohlmann <jannis@xfce.org> - - * ChangeLog, NEWS: * NEWS: Update NEWS for the upcoming 4.5.93 release. (Old - svn revision: 29128) - -2008-11-17 Brian Tarricone <brian@tarricone.org> - - * ChangeLog, scripts/xdt-autogen.in: * scripts/xdt-autogen.in: Remove - intltool auto-patch: it wasn't terribly reliable, and Xfce doesn't need it - anymore anyway. (Old svn revision: 28835) - -2008-11-14 Stephan Arts <stephan@xfce.org> - - * configure.in.in: Bump version number (Old svn revision: 28799) - -2008-10-13 Stephan Arts <stephan@xfce.org> - - * configure.in.in: Bump version number (Old svn revision: 28218) - -2008-10-12 Brian Tarricone <brian@tarricone.org> - - * ChangeLog, NEWS, scripts/xdt-autogen.in: * scripts/xdt-autogen.in: Only - attempt to patch intltool merge for versions of intltool < 0.40.0. Versions - starting from 0.40.4 are fixed, and earlier 0.40.x versions aren't patchable - because they use a systemwide copy of intltool-merge. (Old svn revision: - 28165) - -2008-09-12 Jannis Pohlmann <jannis@xfce.org> - - * ChangeLog, NEWS: * NEWS: Updated for the alpha release. * configure.in.in: - Bump version number. * INSTALL: Remove INSTALL, this is auto-generated by - autotools these days anyways. * Remove xfce 4.6 alpha tag. (Old svn - revision: 27848) - -2008-09-06 Stephan Arts <stephan@xfce.org> - - * INSTALL, configure.in.in: Bump version number remove INSTALL, this is - auto-generated by autotools these days anyways. Remove xfce 4.6 alpha tag - (Old svn revision: 27681) - -2008-09-04 Jannis Pohlmann <jannis@xfce.org> - - * ChangeLog, autogen.sh: * autogen.sh: Fix typo. (Old svn revision: 27650) - - * ChangeLog, autogen.sh: * autogen.sh: Add support for git svn revision - versioning. (Old svn revision: 27649) - -2008-08-25 Brian Tarricone <brian@tarricone.org> - - * ChangeLog, scripts/xdt-autogen.in: 2008-08-24 Brian Tarricone - <kelnos@xfce.org> * scripts/xdt-autogen.in: add intltool-merge.in patch to - fix merging translations to .desktop keys that have dashes in them (Old svn - revision: 27551) - -2008-08-17 Stephan Arts <stephan@xfce.org> - - * configure.in.in: Bump version number (Old svn revision: 27496) - -2007-11-17 Brian Tarricone <brian@tarricone.org> - - * configure.in.in: post-release version bump, add back svn release tag (Old - svn revision: 26361) - - * ChangeLog: update changelogs; ready to tag 4.4.2 (Old svn revision: - 26341) - - * configure.in.in: remove svn version tag for release (Old svn revision: - 26339) - - * INSTALL: various pre-release updates - po files, docs, etc. mainly - autogenerated stuff (Old svn revision: 26337) - -2007-11-16 Nick Schermer <nick@xfce.org> - - * NEWS: Update NEWS, not really sure if trunk will be released as 4.4.1 - tho... (Old svn revision: 26312) - -2007-10-24 Brian Tarricone <brian@tarricone.org> - - * configure.in.in: remove trailing parens on AC_INIT version info to work - around bug in intltool 0.35.x and 0.36.x (Old svn revision: 26180) - -2007-01-20 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, configure.in.in: 2007-01-20 Benedikt Meurer <benny@xfce.org> * - configure.in.in: Post-release version bump. (Old svn revision: 24610) - - * ChangeLog, NEWS, configure.in.in: 2007-01-20 Benedikt Meurer - <benny@xfce.org> * === Released 4.4.0 === * NEWS, configure.in.in: Bump - version. (Old svn revision: 24608) - -2007-01-15 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-i18n.m4, scripts/xdt-autogen.in: - 2007-01-15 Benedikt Meurer <benny@xfce.org> * scripts/xdt-autogen.in: Apply - patch from Olivier Fourdan <fourdan@xfce.org> to update xdt-autogen to use - the latest GNU autotools if available. Bug #2755. * - m4macros/xdt-i18n.m4(XDT_I18N): Make sure xgettext treats source code as - UTF-8. (Old svn revision: 24486) - -2006-11-04 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, configure.in.in: 2006-11-04 Benedikt Meurer <benny@xfce.org> * - configure.in.in: Post-release version bump. (Old svn revision: 23638) - - * ChangeLog, NEWS, configure.in.in: 2006-11-04 Benedikt Meurer - <benny@xfce.org> * === Released 4.3.99.2 === * NEWS, configure.in.in: Bump - version. (Old svn revision: 23636) - -2006-09-02 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, configure.in.in: 2006-09-02 Benedikt Meurer <benny@xfce.org> * - configure.in.in: Post-release version bump. (Old svn revision: 23007) - - * ChangeLog, NEWS, configure.in.in: 2006-09-02 Benedikt Meurer - <benny@xfce.org> * === Released 4.3.99.1 === * NEWS, configure.in.in: Bump - version. (Old svn revision: 23005) - - * ChangeLog, m4macros/xdt-features.m4: 2006-09-02 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-features.m4: Set gcc specific compiler flags - only if gcc is being used. Bug #2251. (Old svn revision: 22990) - -2006-07-09 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, NEWS, configure.in.in: 2006-07-09 Benedikt Meurer - <benny@xfce.org> * === Released 4.3.90.2 === * NEWS, configure.in.in: Bump - version. (Old svn revision: 22332) - -2006-05-08 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-depends.m4, m4macros/xdt-features.m4, - m4macros/xdt-i18n.m4, m4macros/xdt-python.m4, m4macros/xdt-xfce.m4, - scripts/xdt-autogen.in: 2006-05-08 Benedikt Meurer <benny@xfce.org> * - m4macros/, scripts/: Add GPL boilerplate. Bug #1786. (Old svn revision: - 21591) - -2006-04-16 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, configure.in.in: 2006-04-16 Benedikt Meurer <benny@xfce.org> * - configure.in.in: Post-release version bump. (Old svn revision: 20980) - - * ChangeLog, NEWS, configure.in.in, xfce4-dev-tools.spec.in: 2006-04-16 - Benedikt Meurer <benny@xfce.org> * === Released 4.3.90.1 === * NEWS, - configure.in.in: Bump version. * xfce4-dev-tools.spec.in: Update RPM spec - file. (Old svn revision: 20978) - -2006-04-15 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, NEWS, xfce4-dev-tools.spec.in: 2006-04-16 Benedikt Meurer - <benny@xfce.org> * NEWS: Update NEWS. * xfce4-dev-tools.spec.in: CVS -> SVN. - Fix URL. (Old svn revision: 20957) - -2006-03-09 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-depends.m4: 2006-03-09 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-depends.m4: Apply Brian's patch to fix - stupid typo in a variable name. Bug #1558. (Old svn revision: 20306) - -2006-03-05 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-features.m4: 2006-03-05 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-features.m4(XDT_FEATURE_DEBUG): Do not add - G_DISABLE_DEPRECATED to CFLAGS. (Old svn revision: 20238) - -2006-02-25 Daichi Kawahata <daichi.k@aioros.ocn.ne.jp> - - * autogen.sh: Fixed NULL revision string for certain locales. (Old svn - revision: 20044) - -2005-09-01 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, autogen.sh: 2005-09-01 Benedikt Meurer <benny@xfce.org> * - autogen.sh: Don't depend on xfce4-dev-tools in autogen.sh. (Old svn - revision: 17247) - -2005-08-31 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, autogen.sh, configure.ac, configure.in.in: 2005-08-31 - Benedikt Meurer <benny@xfce.org> * configure.in.in, autogen.sh: Merge build - framework changes from libexo. (Old svn revision: 17214) - -2005-07-09 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, NEWS, configure.ac: 2005-07-09 Benedikt Meurer - <benny@xfce.org> * configure.ac, NEWS: Bump version after release - (4.3.1svn). (Old svn revision: 16202) - - * ChangeLog, HACKING, Makefile.am, NEWS, README, configure.ac: 2005-07-09 - Benedikt Meurer <benny@xfce.org> * Makefile.am: Set proper automake - options. * HACKING, README: CVS -> SVN. * NEWS, configure.ac: Version 4.3.0. - (Old svn revision: 16200) - - * ChangeLog: Revert the b0rkage to ChangeLog! (Old svn revision: 16199) - -2005-05-14 Olivier Fourdan <fourdan.olivier@wanadoo.fr> - - * ChangeLog: Update ChangeLog (Old svn revision: 14410) - -2005-05-04 Olivier Fourdan <fourdan.olivier@wanadoo.fr> - - * ChangeLog: Update ChangeLog (Old svn revision: 14001) - -2005-04-21 Brian Tarricone <brian@tarricone.org> - - * ChangeLog, scripts/xdt-autogen.in: * Modify checks for autoheader and - autoconf so they first check for versioned binaries (-2.59, -2.58, -2.57, - -2.53) before falling back to a non-versioned binary. * Modify checks for - automake and aclocal so they first check for versioned binaries (-1.9, -1.8) - before falling back to a non- versioned binary. * Fix two typos; 2>&0 -> - 2>&1, autoconf -> automake. (Old svn revision: 13702) - -2005-04-17 Olivier Fourdan <fourdan.olivier@wanadoo.fr> - - * configure.ac: REverting my last change, it's my Ubuntu install that is - broken, not that script. (Old svn revision: 13650) - -2005-04-16 Olivier Fourdan <fourdan.olivier@wanadoo.fr> - - * configure.ac: The package did not build for me (Old svn revision: 13633) - -2005-04-12 Jasper Huijsmans <jbhuijsmans@home.nl> - - * scripts/xdt-autogen.in: Not all gmo files were removed; this at least - works. (Old svn revision: 13539) - -2005-04-06 Jens Luedicke <jens.luedicke@gmail.com> - - * .cvsignore, m4macros/.cvsignore, scripts/.cvsignore: remove .cvsignore - cruft (Old svn revision: 13312) - -2005-03-19 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-features.m4: 2005-03-19 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-features.m4: Fix typo. (Old svn revision: - 2282) - - * ChangeLog, m4macros/xdt-features.m4: 2005-03-19 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-features.m4: --enable-final is now on by - default again. The glib assertions are now toggled by --disable-asserts, as - suggested by Olivier. (Old svn revision: 2281) - -2005-03-17 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-features.m4: 2005-03-17 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-features.m4: --enable-final is now disabled - by default and glib assertions will only be disabled if --enable-final is - specified and debugging is disabled. (Old svn revision: 2280) - - * ChangeLog, scripts/xdt-autogen.in: 2005-03-17 Benedikt Meurer - <benny@xfce.org> * scripts/xdt-autogen.in: Escape the special characters in - the tr sets twice as they are also expanded by the shell. (Old svn - revision: 2279) - -2005-03-08 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-i18n.m4: 2005-03-08 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-i18n.m4: Fix typo, its Q_() not O_(). (Old - svn revision: 2278) - - * ChangeLog, m4macros/xdt-i18n.m4, scripts/xdt-autogen.in: 2005-03-08 - Benedikt Meurer <benny@xfce.org> * scripts/xdt-autogen.in, - m4macros/xdt-i18n.m4: Add better handling of XGETTEXT_ARGS to automatically - support the O_() translation keyword. (Old svn revision: 2277) - -2005-03-05 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, scripts/xdt-autogen.in: 2005-03-05 Benedikt Meurer - <benny@xfce.org> * scripts/xdt-autogen.in: Fix a type where configure.ac was - still hardcoded into the script. (Old svn revision: 2276) - -2005-03-04 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, scripts/.cvsignore, scripts/xdt-autogen.in: 2005-03-04 - Benedikt Meurer <benny@xfce.org> * scripts/.cvsignore: Add vim swap files. * - scripts/xdt-autogen.in: Add support for AC_CONFIG_SUBDIRS(), currently - required by xfcalendar. Improve the clean logic. (Old svn revision: 2275) - -2005-02-19 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/Makefile.am, m4macros/xdt-python.m4: 2005-02-19 - Benedikt Meurer <benny@xfce.org> * m4macros/xdt-python.m4, - m4macros/Makefile.am: Add M4 file for Python related checks, currently - contains an autoconf check to find header files required to build Python - extensions on the target system. (Old svn revision: 2274) - -2005-01-31 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/.cvsignore, m4macros/xdt-depends.m4: 2005-01-31 - Benedikt Meurer <benny@xfce.org> * m4macros/xdt-depends.m4: - XDT_CHECK_OPTIONAL_PACKAGE() also sets an automake conditional for - HAVE_VARNAME now. (Old svn revision: 2273) - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-depends.m4: 2005-01-27 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-depends.m4: AC_REQUIRE() doesn't work - properly with conditional shell code. (Old svn revision: 2272) - - * ChangeLog, scripts/xdt-autogen.in: 2005-01-27 Benedikt Meurer - <benny@xfce.org> * scripts/xdt-autogen.in: Fix typo in the error message of - the gtk-doc check. (Old svn revision: 2271) - - * ChangeLog, scripts/xdt-autogen.in: 2005-01-27 Benedikt Meurer - <benny@xfce.org> * scripts/xdt-autogen.in: Remove gtk-doc.make as well when - cleaning autogenerated files. (Old svn revision: 2270) - - * ChangeLog, Makefile.am, configure.ac: 2005-01-27 Benedikt Meurer - <benny@xfce.org> * configure.ac: Fix tag name. Fix order of autoconf macros. - Use autoconf values to initialize automake. * Makefile.am: Fix - distclean-local target. Strip down EXTRA_DIST list. (Old svn revision: - 2269) - - * ChangeLog, m4macros/xdt-i18n.m4, scripts/xdt-autogen.in: 2005-01-27 - Benedikt Meurer <benny@xfce.org> * scripts/xdt-autogen.in: Added commands to - clean all autogenerated files from the current source directory. Just run - "xdt-autogen clean". * m4macros/xdt-i18n.m4: Use the macros provided by - glib-gettext.m4 instead of our own replacements, in order to make sure that - they play well with the Makefile.in.in generated by glib-gettextize. * - m4macros/xdt-i18n.m4: Fix typos in localedir substitution. * - scripts/xdt-autogen.in: Added support for intltool. (Old svn revision: - 2268) - - * ChangeLog, autogen.sh, scripts/xdt-autogen.in: 2005-01-27 Benedikt - Meurer <benny@xfce.org> * autogen.sh, scripts/xdt-autogen.in: Don't run the - configure script if the environment variable NOCONFIGURE is set. (Old svn - revision: 2267) - -2005-01-26 Benedikt Meurer <benny@xfce.org> - - * ChangeLog, m4macros/xdt-i18n.m4: 2005-01-26 Benedikt Meurer - <benny@xfce.org> * m4macros/xdt-i18n.m4: Need to use AC_DEFINE_UNQUOTED() - when using shell variables. (Old svn revision: 2266) - - * .cvsignore, ChangeLog, autogen.sh, m4macros/.cvsignore, - m4macros/xdt-i18n.m4, scripts/.cvsignore: 2005-01-26 Benedikt Meurer - <benny@xfce.org> * autogen.sh: Be sure to pass command line parameters to - xdt-autogen and configure. * m4macros/xdt-i18n.m4: Add missing fi, so now - XDT_I18N() works properly. * .cvsignore, m4macros/.cvsignore, - scripts/.cvsignore: Shut up CVS. (Old svn revision: 2265) - - * ChangeLog, HACKING: 2005-01-26 Benedikt Meurer <benny@xfce.org> * - HACKING: Added notes for developers with write access to the Xfce CVS - repository. (Old svn revision: 2264) - - * AUTHORS, COPYING, ChangeLog, HACKING, INSTALL, Makefile.am, NEWS, README, - autogen.sh, configure.ac, m4macros/Makefile.am, m4macros/xdt-depends.m4, - m4macros/xdt-features.m4, m4macros/xdt-i18n.m4, m4macros/xdt-xfce.m4, - scripts/Makefile.am, scripts/xdt-autogen.in, xfce4-dev-tools.spec.in: Initial - revision (Old svn revision: 2260) diff --git a/ChangeLog.pre-git b/ChangeLog.pre-git deleted file mode 100644 index f9e1047..0000000 --- a/ChangeLog.pre-git +++ /dev/null @@ -1,342 +0,0 @@ -2009-07-28 Brian Tarricone <brian@tarricone.org> - - * scripts/xdt-autogen.in: Renamed to xdt-autogen.in.in. - * scripts/xdt-autogen.in.in: Add --version and -V options. Add a - minimum required version check via the XDT_AUTOGEN_REQUIRED_VERSION - env var. - -2009-07-27 Brian Tarricone <brian@tarricone.org> - - * scripts/xdt-autogen.in: Also support newer IT_PROG_INTLTOOL - macro. - -2009-05-04 Brian Tarricone <bjt23@cornell.edu> - - * m4macros/xdt-features.m4: Add a bunch more compiler warning - options when --enable-debug={yes,full} is specified. - -2009-02-25 Stephan Arts <stephan@xfce.org> - - * == 4.6.0 Released! == - * configure.in.in: Bump version - * NEWS: Update NEWS - -2009-02-17 Jannis Pohlmann <jannis@xfce.org> - - * scripts/xdt-commit: Replace grep -P with awk and thus make the - script more portable. Properly detect changed ChangeLogs in SVN. - This should get rid the empty lines when committing several - changed ChangeLogs (bug #4716). Patch provided by Alexander - Toresson. - -2009-01-25 Jannis Pohlmann <jannis@xfce.org> - - * == 4.5.99.1 released! == - * configure.in.in: Bump version. - -2009-01-14 Jannis Pohlmann <jannis@xfce.org> - - * configure.in.in: Post-release version bump. - -2009-01-11 Jannis Pohlmann <jannis@xfce.org> - - * == 4.5.93 released! == - * configure.in.in: Bump version. - -2009-01-11 Jannis Pohlmann <jannis@xfce.org> - - * NEWS: Update NEWS for the upcoming 4.5.93 release. - -2008-11-16 Brian Tarricone <bjt23@cornell.edu> - - * scripts/xdt-autogen.in: Remove intltool auto-patch: it wasn't - terribly reliable, and Xfce doesn't need it anymore anyway. - -2008-11-11 Jannis Pohlmann <jannis@xfce.org> - - * scripts/xdt-commit: Use !/bin/bash instead of !/bin/sh in the - script header just to make sure everything works as it should. - -2008-11-01 Jannis Pohlmann <jannis@xfce.org> - - * scripts/xdt-commit: Automatically add ChangeLog files of git - repositories to the commit with "git add ${CHANGELOG}". Use "git - diff --cached" instead of "git diff HEAD" for the commit messages. - -2008-10-18 Brian Tarricone <bjt23@cornell.edu> - - * scripts/xdt-commit: Support git/git-svn as well as svn (bug 4491). - * configure.in.in: Re-add 'svn' version tag. - -2008-10-12 Brian Tarricone <bjt23@cornell.edu> - - * scripts/xdt-autogen.in: Only attempt to patch intltool merge for - versions of intltool < 0.40.0. Versions starting from 0.40.4 are - fixed, and earlier 0.40.x versions aren't patchable because they - use a systemwide copy of intltool-merge. - -2008-09-12 Jannis Pohlmann <jannis@xfce.org> - - * NEWS: Updated for the alpha release. - -2008-09-06 Stephan Arts <stephan@xfce.org> - - * configure.in.in: Bump version number. - * INSTALL: Remove INSTALL, this is auto-generated by autotools - these days anyways. - * Remove xfce 4.6 alpha tag. - -2008-09-04 Jannis Pohlmann <jannis@xfce.org> - - * autogen.sh: Fix typo. - -2008-09-04 Jannis Pohlmann <jannis@xfce.org> - - * autogen.sh: Add support for git svn revision versioning. - -2008-08-24 Brian Tarricone <kelnos@xfce.org> - - * scripts/xdt-autogen.in: add intltool-merge.in patch to fix - merging translations to .desktop keys that have dashes in them - -2007-11-17 Brian Tarricone <kelnos@xfce.org> - - * === Released 4.4.0.1 === - -2007-10-22 Brian Tarricone <kelnos@xfce.org> - - * scripts/Makefile.am: fix 'make distcheck'; include - xdt-commit in EXTRA_DIST - -2007-02-13 Jannis Pohlmann <jannis@xfce.org> - - * scripts/xdt-commit: Too much quoting - all input files were - treated as one string. - -2007-02-13 Jannis Pohlmann <jannis@xfce.org> - - * scripts/xdt-commit: Add more quotes around variables. Use - "type svn" to check whether Subversion is installed. - -2007-02-12 Jannis Pohlmann <jannis@xfce.org> - - * scripts/Makefile.am, scripts/xdt-commit: Add script for - generating commit messages from ChangeLogs on the fly. - -2007-01-20 Benedikt Meurer <benny@xfce.org> - - * configure.in.in: Post-release version bump. - -2007-01-20 Benedikt Meurer <benny@xfce.org> - - * === Released 4.4.0 === - * NEWS, configure.in.in: Bump version. - -2007-01-15 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in: Apply patch from Olivier Fourdan - <fourdan@xfce.org> to update xdt-autogen to use the latest - GNU autotools if available. Bug #2755. - * m4macros/xdt-i18n.m4(XDT_I18N): Make sure xgettext treats - source code as UTF-8. - -2006-11-04 Benedikt Meurer <benny@xfce.org> - - * configure.in.in: Post-release version bump. - -2006-11-04 Benedikt Meurer <benny@xfce.org> - - * === Released 4.3.99.2 === - * NEWS, configure.in.in: Bump version. - -2006-09-02 Benedikt Meurer <benny@xfce.org> - - * configure.in.in: Post-release version bump. - -2006-09-02 Benedikt Meurer <benny@xfce.org> - - * === Released 4.3.99.1 === - * NEWS, configure.in.in: Bump version. - -2006-09-02 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-features.m4: Set gcc specific compiler flags only if - gcc is being used. Bug #2251. - -2006-07-09 Benedikt Meurer <benny@xfce.org> - - * === Released 4.3.90.2 === - * NEWS, configure.in.in: Bump version. - -2006-05-08 Benedikt Meurer <benny@xfce.org> - - * m4macros/, scripts/: Add GPL boilerplate. Bug #1786. - -2006-04-16 Benedikt Meurer <benny@xfce.org> - - * configure.in.in: Post-release version bump. - -2006-04-16 Benedikt Meurer <benny@xfce.org> - - * === Released 4.3.90.1 === - * NEWS, configure.in.in: Bump version. - * xfce4-dev-tools.spec.in: Update RPM spec file. - -2006-04-16 Benedikt Meurer <benny@xfce.org> - - * NEWS: Update NEWS. - * xfce4-dev-tools.spec.in: CVS -> SVN. Fix URL. - -2006-03-09 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-depends.m4: Apply Brian's patch to fix stupid typo in a - variable name. Bug #1558. - -2006-03-05 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-features.m4(XDT_FEATURE_DEBUG): Do not add - G_DISABLE_DEPRECATED to CFLAGS. - -2005-09-01 Benedikt Meurer <benny@xfce.org> - - * autogen.sh: Don't depend on xfce4-dev-tools in autogen.sh. - -2005-08-31 Benedikt Meurer <benny@xfce.org> - - * configure.in.in, autogen.sh: Merge build framework changes from - libexo. - -2005-07-09 Benedikt Meurer <benny@xfce.org> - - * configure.ac, NEWS: Bump version after release (4.3.1svn). - -2005-07-09 Benedikt Meurer <benny@xfce.org> - - * Makefile.am: Set proper automake options. - * HACKING, README: CVS -> SVN. - * NEWS, configure.ac: Version 4.3.0. - -2005-04-20 Brian Tarricone <bjt23@cornell.edu> - - * scripts/xdt-autogen.in: Modify checks for autoheader and autoconf - so they first check for versioned binaries (-2.59, -2.58, -2.57, - -2.53) before falling back to a non-versioned binary. - * scripts/xdt-autogen.in: Modify checks for automake and aclocal so - they first check for versioned binaries (-1.9, -1.8) before falling - back to a non-versioned binary. - * scripts/xdt-autogen.in: Fix two typos; 2>&0 -> 2>&1, - autoconf -> automake. - -2005-03-19 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-features.m4: Fix typo. - -2005-03-19 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-features.m4: --enable-final is now on by default again. - The glib assertions are now toggled by --disable-asserts, as suggested - by Olivier. - -2005-03-17 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-features.m4: --enable-final is now disabled by default - and glib assertions will only be disabled if --enable-final is - specified and debugging is disabled. - -2005-03-17 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in: Escape the special characters in the tr sets - twice as they are also expanded by the shell. - -2005-03-08 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-i18n.m4: Fix typo, its Q_() not O_(). - -2005-03-08 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in, m4macros/xdt-i18n.m4: Add better handling - of XGETTEXT_ARGS to automatically support the O_() translation - keyword. - -2005-03-05 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in: Fix a type where configure.ac was still - hardcoded into the script. - -2005-03-04 Benedikt Meurer <benny@xfce.org> - - * scripts/.cvsignore: Add vim swap files. - * scripts/xdt-autogen.in: Add support for AC_CONFIG_SUBDIRS(), currently - required by xfcalendar. Improve the clean logic. - -2005-02-19 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-python.m4, m4macros/Makefile.am: Add M4 file for Python - related checks, currently contains an autoconf check to find header - files required to build Python extensions on the target system. - -2005-01-31 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-depends.m4: XDT_CHECK_OPTIONAL_PACKAGE() also - sets an automake conditional for HAVE_VARNAME now. - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-depends.m4: AC_REQUIRE() doesn't work properly with - conditional shell code. - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in: Fix typo in the error message of the - gtk-doc check. - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in: Remove gtk-doc.make as well when cleaning - autogenerated files. - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * configure.ac: Fix tag name. Fix order of autoconf macros. Use - autoconf values to initialize automake. - * Makefile.am: Fix distclean-local target. Strip down EXTRA_DIST - list. - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * scripts/xdt-autogen.in: Added commands to clean all autogenerated - files from the current source directory. Just run "xdt-autogen clean". - * m4macros/xdt-i18n.m4: Use the macros provided by glib-gettext.m4 - instead of our own replacements, in order to make sure that they - play well with the Makefile.in.in generated by glib-gettextize. - * m4macros/xdt-i18n.m4: Fix typos in localedir substitution. - * scripts/xdt-autogen.in: Added support for intltool. - -2005-01-27 Benedikt Meurer <benny@xfce.org> - - * autogen.sh, scripts/xdt-autogen.in: Don't run the configure script - if the environment variable NOCONFIGURE is set. - -2005-01-26 Benedikt Meurer <benny@xfce.org> - - * m4macros/xdt-i18n.m4: Need to use AC_DEFINE_UNQUOTED() when - using shell variables. - -2005-01-26 Benedikt Meurer <benny@xfce.org> - - * autogen.sh: Be sure to pass command line parameters to xdt-autogen - and configure. - * m4macros/xdt-i18n.m4: Add missing fi, so now XDT_I18N() works - properly. - * .cvsignore, m4macros/.cvsignore, scripts/.cvsignore: Shut up CVS. - -2005-01-26 Benedikt Meurer <benny@xfce.org> - - * HACKING: Added notes for developers with write access to the - Xfce CVS repository. - -2005-01-26 Benedikt Meurer <benny@xfce.org> - - * Initial import. - -# vi:set ts=8 sw=8 noet ai nocindent: diff --git a/Makefile.am b/Makefile.am index 8363b99..b629476 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,15 @@ rpm: dist rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz @rm -f $(PACKAGE)-$(VERSION).tar.gz +.PHONY: ChangeLog + +ChangeLog: Makefile + (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \ + && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \ + || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + EXTRA_DIST = \ HACKING \ xfce4-dev-tools.spec diff --git a/NEWS b/NEWS index bd2e4e3..3e02eab 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +4.7.3 +===== +- Build ChangeLog from GIT. +- Add check stage for documentation submodules. +- Check for automake 1.11. +- Check if $1 is a file before calling cat (bug #6101). + 4.7.2 ===== - Brown bag: fix typo that breaks XDT_FEATURE_LINKER_OPTS diff --git a/configure.in.in b/configure.in.in index 8e3b48a..c8af429 100644 --- a/configure.in.in +++ b/configure.in.in @@ -11,7 +11,7 @@ dnl *** Version information *** dnl *************************** m4_define([xdt_version_major], [4]) m4_define([xdt_version_minor], [7]) -m4_define([xdt_version_micro], [2]) +m4_define([xdt_version_micro], [3]) m4_define([xdt_version_nano], []) m4_define([xdt_version_build], [@REVISION@]) m4_define([xdt_version_tag], []) diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in index 2d14ef8..bbfa626 100644 --- a/scripts/xdt-autogen.in.in +++ b/scripts/xdt-autogen.in.in @@ -70,7 +70,7 @@ fi ## parse_configure_subdirs() { - cat "$1" | tr '\\n\\t\\\\' ' ' | sed -ne 's|.*AC_CONFIG_SUBDIRS(\[\{0,1\}\([[:alnum:]_ @/-]\{1,\}\).*|\1|p' + test -f "$1" && cat "$1" | tr '\\n\\t\\\\' ' ' | sed -ne 's|.*AC_CONFIG_SUBDIRS(\[\{0,1\}\([[:alnum:]_ @/-]\{1,\}\).*|\1|p' } ## @@ -197,8 +197,11 @@ do_version_check() { } if ! do_version_check; then - echo "This version of xdt-autogen ($VERSION) is too old. Version" >&2 - echo "$XDT_AUTOGEN_REQUIRED_VERSION or greater is required." >&2 + cat >&2 <<EOF +xdt-autogen: This version of xdt-autogen ($VERSION) is too old. + Version $XDT_AUTOGEN_REQUIRED_VERSION or greater is required. +EOF + exit 1 fi @@ -215,6 +218,41 @@ export XDG_DATA_DIRS XDG_DATA_HOME MASTER_DIR=`pwd`; test -z "${MASTER_DIR}" && MASTER_DIR="." ## +## Check for documentation submodule +## +if test -n "$XDT_AUTOGEN_CHECK_DOCS"; then + if test ! -f "$MASTER_DIR/$XDT_AUTOGEN_CHECK_DOCS/Makefile.am"; then + # Check for git and needed files, if found, automatically + # update the submodule + if test -d .git -a -f .gitmodules; then + echo "xdt-autogen: Automaticcaly initializing the $XDT_AUTOGEN_CHECK_DOCS submodule." + + # Run git command to get the lastest docs revision + res=0 && git submodule sync $XDT_AUTOGEN_CHECK_DOCS && \ + git submodule update --init $XDT_AUTOGEN_CHECK_DOCS && res=1 + + if test $res -eq 0; then + cat >&2 <<EOF +xdt-autogen: Pulling the xfce4-docs git submodule failed. See errors + above for more information and take a look at + http://wiki.xfce.org/documentation. +EOF + exit 1 + fi + else + cat >&2 <<EOF +xdt-autogen: The directory $XDT_AUTOGEN_CHECK_DOCS does not contain + the required files to run configure. See + http://wiki.xfce.org/documentation for more information. +EOF + exit 1 + fi + #else + # We could warn about out-of-date submodules here. + fi +fi + +## ## First we do some substitutions to generate configure.{ac,in} if necessary ## CONFIGURE_AC_IN_FILES=`lookup_configure_ac_in_files "$MASTER_DIR"` @@ -429,7 +467,7 @@ done ## simply aclocal. ## test -z "${XDT_PROG_ACLOCAL}" && -for i in aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do +for i in aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal; do (${i} --version) </dev/null >/dev/null 2>&1 && XDT_PROG_ACLOCAL=${i} && break done @@ -473,7 +511,7 @@ done ## simply automake. ## test -z "${XDT_PROG_AUTOMAKE}" && -for i in automake-1.10 automake-1.9 automake-1.8 automake; do +for i in automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake; do (${i} --version) </dev/null >/dev/null 2>&1 && XDT_PROG_AUTOMAKE=${i} && break done
--- End Message ---
--- Begin Message ---
- To: Lionel Le Folgoc <mrpouit@gmail.com>, 602098-done@bugs.debian.org
- Subject: Re: Bug#602098: unblock: xfce4-dev-tools/4.7.3-1 (pre-ack)
- From: Julien Cristau <jcristau@debian.org>
- Date: Tue, 2 Nov 2010 18:19:06 +0100
- Message-id: <20101102171906.GA22963@patate.is-a-geek.org>
- In-reply-to: <20101101154314.7959.70706.reportbug@urgo.lefolgoc.net>
- References: <20101101154314.7959.70706.reportbug@urgo.lefolgoc.net>
On Mon, Nov 1, 2010 at 16:43:14 +0100, Lionel Le Folgoc wrote: > Xfce4-dev-tools contains some tools to work with the upstream git repository > (autogen, commit, etc.). > > A new 4.7.3 version has been released a few days ago. It mostly adds > automake-1.11 support (already carried as a patch in 4.7.2-3), and a new > automake macro for documentation, which some upstream projects use. This means > that xfce4-dev-tools >= 4.7.3 is required to build them from git. > > See 'debiff.patch', which contains the debdiff between 4.7.2-3 and the > candidate package for 4.7.3-1 (autofoo files stripped); 'changes.patch' is the > git diff between the two upstream tags xfce4-dev-tools-4.7.2 and > xfce4-dev-tools-4.7.3. > > Is it okay to upload, so squeeze users can build these modules without issue? > Thanks! > I think it's ok to upload, but won't make it to squeeze. Cheers, JulienAttachment: signature.asc
Description: Digital signature
--- End Message ---