Hello community,
here is the log from the commit of package xfce4-dev-tools for openSUSE:Factory
checked in at Thu Aug 13 01:54:17 CEST 2009.
--------
--- xfce4-dev-tools/xfce4-dev-tools.changes 2007-12-03 22:26:15.000000000 +0100
+++ xfce4-dev-tools/xfce4-dev-tools.changes 2009-02-27 13:54:18.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Feb 27 13:53:58 CET 2009 - prusnak@suse.cz
+
+- updated to 4.6.0 (Xfce 4.6.0 release)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xfce4-dev-tools-4.4.0.1.tar.bz2
New:
----
xfce4-dev-tools-4.6.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-dev-tools.spec ++++++
--- /var/tmp/diff_new_pack.y8HDSy/_old 2009-08-13 01:53:06.000000000 +0200
+++ /var/tmp/diff_new_pack.y8HDSy/_new 2009-08-13 01:53:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xfce4-dev-tools (Version 4.4.0.1)
+# spec file for package xfce4-dev-tools (Version 4.6.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,17 +19,14 @@
Name: xfce4-dev-tools
-BuildRequires: dbus-1-devel gtk2-devel libxml2-devel perl-XML-Parser startup-notification update-desktop-files
-BuildRequires: libxfcegui4-devel >= 4.3
Summary: The Xfce development tools
-Version: 4.4.0.1
-Release: 97
+Version: 4.6.0
+Release: 1
License: GPL v2 or later
Url: http://foo-projects.org/~benny/projects/xfce4-dev-tools/
Source: %{name}-%{version}.tar.bz2
Group: System/GUI/XFCE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: libxfcegui4 >= 4.3
%description
The Xfce development tools are a collection of tools and macros for
@@ -57,12 +54,11 @@
%files
%defattr(-,root,root)
-%doc README ChangeLog INSTALL COPYING AUTHORS HACKING
-%{_bindir}/xdt-autogen
-%{_bindir}/xdt-commit
-%{_datadir}/xfce4/dev-tools/m4macros/*.m4
+%doc AUTHORS COPYING ChangeLog HACKING NEWS README
+%{_bindir}/*
%dir %{_datadir}/xfce4
%dir %{_datadir}/xfce4/dev-tools
%dir %{_datadir}/xfce4/dev-tools/m4macros
+%{_datadir}/xfce4/dev-tools/m4macros/*.m4
%changelog
++++++ xfce4-dev-tools-4.4.0.1.tar.bz2 -> xfce4-dev-tools-4.6.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/ChangeLog new/xfce4-dev-tools-4.6.0/ChangeLog
--- old/xfce4-dev-tools-4.4.0.1/ChangeLog 2007-11-17 20:18:07.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/ChangeLog 2009-02-25 07:32:27.000000000 +0100
@@ -1,8 +1,86 @@
-2007-11-17 Brian Tarricone
+2009-02-17 Jannis Pohlmann
- * === Released 4.4.0.1 ===
+ * 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.
-2007-10-22 Brian Tarricone
+2009-01-25 Jannis Pohlmann
+
+ * == 4.5.99.1 released! ==
+ * configure.in.in: Bump version.
+
+2009-01-14 Jannis Pohlmann
+
+ * configure.in.in: Post-release version bump.
+
+2009-01-11 Jannis Pohlmann
+
+ * == 4.5.93 released! ==
+ * configure.in.in: Bump version.
+
+2009-01-11 Jannis Pohlmann
+
+ * NEWS: Update NEWS for the upcoming 4.5.93 release.
+
+2008-11-16 Brian Tarricone
+
+ * 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
+
+ * 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
+
+ * 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
+
+ * 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
+
+ * 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
+
+ * NEWS: Updated for the alpha release.
+
+2008-09-06 Stephan Arts
+
+ * 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
+
+ * autogen.sh: Fix typo.
+
+2008-09-04 Jannis Pohlmann
+
+ * autogen.sh: Add support for git svn revision versioning.
+
+2008-08-24 Brian Tarricone
+
+ * 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
+
+ * === Released 4.4.0.1 ===
+
+2007-10-22 Brian Tarricone
* scripts/Makefile.am: fix 'make distcheck'; include
xdt-commit in EXTRA_DIST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/INSTALL new/xfce4-dev-tools-4.6.0/INSTALL
--- old/xfce4-dev-tools-4.4.0.1/INSTALL 2007-11-17 20:43:38.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/INSTALL 2009-02-25 07:39:55.000000000 +0100
@@ -2,7 +2,7 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/Makefile.in new/xfce4-dev-tools-4.6.0/Makefile.in
--- old/xfce4-dev-tools-4.4.0.1/Makefile.in 2007-11-17 20:43:38.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/Makefile.in 2009-02-25 07:39:55.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -272,8 +272,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -298,8 +298,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -309,13 +309,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -385,6 +384,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -412,6 +415,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -563,7 +568,7 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-local distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/NEWS new/xfce4-dev-tools-4.6.0/NEWS
--- old/xfce4-dev-tools-4.4.0.1/NEWS 2007-11-17 20:18:07.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/NEWS 2009-02-25 07:38:09.000000000 +0100
@@ -1,3 +1,29 @@
+4.6.0
+=====
+- 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).
+
+
+4.5.93
+======
+- Remove unreliable and not really needed intltool auto-patch.
+
+4.5.92
+======
+- Add support for git (and git-svn) to the xdt-commit script (bug 4491).
+
+4.5.91
+======
+- Don't try to patch intltool-merge.in for intltool 0.40.x: 0.40.4+ has
+ a fix for the bug, and 0.40.x earlier than that aren't patchable as they
+ run systemwide versions of the scripts.
+
+4.5.90
+======
+- Add intltool-merge.in patch to xdt-autogen.in to fix merging translations
+ to .desktop keys that have dashes in them.
+
4.4.2
=====
- Add script (xdt-commit) for generating commit messages from ChangeLogs
@@ -5,33 +31,27 @@
- Remove trailing parens on AC_INIT version info to work around bug
in intltool 0.35.x and 0.36.x.
-
4.4.1
=====
- No changes from 4.4.0
-
4.4.0
=====
- Add support for the latest GNU autotools (Bug #2755).
- Make sure xgettext uses UTF-8 encoding for source files.
-
4.3.99.2
========
- No changes for Xfce 4.4.0 RC2.
-
4.3.99.1
========
- GCC specific compiler flags will not be used unless the compiler supports it.
-
4.3.90.2
========
- Add GPL boilerplate to the installed scripts and macros.
-
4.3.90.1
========
- G_DISABLE_DEPRECATED is no longer automatically added to CFLAGS in
@@ -39,7 +59,6 @@
- The version number is displayed properly now when a required package is
not found in XDT_CHECK_PACKAGE().
-
4.3.0
=====
- xfce4-dev-tools is a new module in SVN, which includes tools, macros and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/aclocal.m4 new/xfce4-dev-tools-4.6.0/aclocal.m4
--- old/xfce4-dev-tools-4.4.0.1/aclocal.m4 2007-11-17 20:43:38.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/aclocal.m4 2009-02-25 07:39:48.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -47,8 +50,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -141,13 +146,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -252,16 +257,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -510,7 +516,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/configure new/xfce4-dev-tools-4.6.0/configure
--- old/xfce4-dev-tools-4.4.0.1/configure 2007-11-17 20:43:39.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/configure 2009-02-25 07:39:57.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Id: configure.in.in 26339 2007-11-17 18:24:17Z kelnos .
+# From configure.in Id: configure.in.in 29313 2009-01-25 00:28:44Z jannis .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xfce4-dev-tools 4.4.0.1.
+# Generated by GNU Autoconf 2.61 for xfce4-dev-tools 4.6.0.
#
# Report bugs to .
#
@@ -10,7 +10,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright (c) 2002-2007
+# Copyright (c) 2002-2008
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Benedikt Meurer .
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='xfce4-dev-tools'
PACKAGE_TARNAME='xfce4-dev-tools'
-PACKAGE_VERSION='4.4.0.1'
-PACKAGE_STRING='xfce4-dev-tools 4.4.0.1'
+PACKAGE_VERSION='4.6.0'
+PACKAGE_STRING='xfce4-dev-tools 4.6.0'
PACKAGE_BUGREPORT='xfce4-dev@xfce.org'
ac_subst_vars='SHELL
@@ -1154,7 +1154,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-dev-tools 4.4.0.1 to adapt to many kinds of systems.
+\`configure' configures xfce4-dev-tools 4.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1220,7 +1220,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-dev-tools 4.4.0.1:";;
+ short | recursive ) echo "Configuration of xfce4-dev-tools 4.6.0:";;
esac
cat <<\_ACEOF
@@ -1291,7 +1291,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-dev-tools configure 4.4.0.1
+xfce4-dev-tools configure 4.6.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1299,7 +1299,7 @@
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright (c) 2002-2007
+Copyright (c) 2002-2008
The Xfce development team. All rights reserved.
Written for Xfce by Benedikt Meurer .
@@ -1310,7 +1310,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-dev-tools $as_me 4.4.0.1, which was
+It was created by xfce4-dev-tools $as_me 4.6.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2003,7 +2003,7 @@
# Define the identity of the package.
PACKAGE=xfce4-dev-tools
- VERSION=4.4.0.1
+ VERSION=4.6.0
cat >>confdefs.h <<_ACEOF
@@ -2688,7 +2688,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-dev-tools $as_me 4.4.0.1, which was
+This file was extended by xfce4-dev-tools $as_me 4.6.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2731,7 +2731,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xfce4-dev-tools config.status 4.4.0.1
+xfce4-dev-tools config.status 4.6.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/configure.in new/xfce4-dev-tools-4.6.0/configure.in
--- old/xfce4-dev-tools-4.4.0.1/configure.in 2007-11-17 20:43:36.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/configure.in 2009-02-25 07:39:30.000000000 +0100
@@ -1,6 +1,6 @@
-dnl $Id: configure.in.in 26339 2007-11-17 18:24:17Z kelnos $
+dnl $Id: configure.in.in 29313 2009-01-25 00:28:44Z jannis $
dnl
-dnl Copyright (c) 2002-2007
+dnl Copyright (c) 2002-2008
dnl The Xfce development team. All rights reserved.
dnl
dnl Written for Xfce by Benedikt Meurer .
@@ -10,10 +10,10 @@
dnl *** Version information ***
dnl ***************************
m4_define([xdt_version_major], [4])
-m4_define([xdt_version_minor], [4])
+m4_define([xdt_version_minor], [6])
m4_define([xdt_version_micro], [0])
-m4_define([xdt_version_nano], [1])
-m4_define([xdt_version_build], [r26361])
+m4_define([xdt_version_nano], [])
+m4_define([xdt_version_build], [r29585])
m4_define([xdt_version_tag], [])
m4_define([xdt_version], [xdt_version_major().xdt_version_minor().xdt_version_micro()ifelse(xdt_version_nano(), [], [], [.xdt_version_nano()])ifelse(xdt_version_tag(), [svn], [xdt_version_tag()-xdt_version_build()], [])])
@@ -26,11 +26,11 @@
dnl *** Initialize autoconf ***
dnl ***************************
AC_INIT([xfce4-dev-tools], [xdt_version], [xfce4-dev@xfce.org])
-AC_COPYRIGHT([Copyright (c) 2002-2007
+AC_COPYRIGHT([Copyright (c) 2002-2008
The Xfce development team. All rights reserved.
Written for Xfce by Benedikt Meurer .])
-AC_REVISION([$Id: configure.in.in 26339 2007-11-17 18:24:17Z kelnos $])
+AC_REVISION([$Id: configure.in.in 29313 2009-01-25 00:28:44Z jannis $])
dnl ***************************
dnl *** Initialize automake ***
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/install-sh new/xfce4-dev-tools-4.6.0/install-sh
--- old/xfce4-dev-tools-4.4.0.1/install-sh 2007-11-17 20:43:38.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/install-sh 2009-02-25 07:39:53.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;
- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t) dstarg=$2
- shift
- shift
- continue;;
-
- -T) no_target_directory=true
- shift
- continue;;
+ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
+ shift;;
+
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/m4macros/Makefile.in new/xfce4-dev-tools-4.6.0/m4macros/Makefile.in
--- old/xfce4-dev-tools-4.4.0.1/m4macros/Makefile.in 2007-11-17 20:43:38.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/m4macros/Makefile.in 2009-02-25 07:39:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/scripts/Makefile.in new/xfce4-dev-tools-4.6.0/scripts/Makefile.in
--- old/xfce4-dev-tools-4.4.0.1/scripts/Makefile.in 2007-11-17 20:43:38.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/scripts/Makefile.in 2009-02-25 07:39:55.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/scripts/xdt-autogen.in new/xfce4-dev-tools-4.6.0/scripts/xdt-autogen.in
--- old/xfce4-dev-tools-4.4.0.1/scripts/xdt-autogen.in 2007-11-17 20:18:07.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/scripts/xdt-autogen.in 2009-02-25 07:32:08.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: xdt-autogen.in 24486 2007-01-15 17:47:49Z benny $
+# $Id: xdt-autogen.in 28835 2008-11-17 02:16:02Z kelnos $
#
# Copyright (c) 2002-2006
# The Xfce development team. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/scripts/xdt-commit new/xfce4-dev-tools-4.6.0/scripts/xdt-commit
--- old/xfce4-dev-tools-4.4.0.1/scripts/xdt-commit 2007-11-17 20:18:07.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/scripts/xdt-commit 2009-02-25 07:32:08.000000000 +0100
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
#
-# $Id: xdt-commit 24978 2007-02-14 12:18:04Z jannis $
+# $Id: xdt-commit 29499 2009-02-17 15:55:43Z jannis $
#
-# Copyright (c) 2007
+# Copyright (c) 2007-2008
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Jannis Pohlmann .
@@ -26,20 +26,39 @@
##
-## Check if SVN is installed
+## Check what kind of repo we have
##
-if ! type svn &> /dev/null; then
- echo "Subversion needs to be installed."
+if [ -d .git ]; then
+ repo_type=git
+elif [ -d .svn ]; then
+ repo_type=svn
+else
+ echo "This doesn't appear to be the root of a versioned source tree." >&2
exit 1
fi
##
-## Check if we are in a versioned directory
+## Check if needed tools are installed
##
-if ! svn info &> /dev/null; then
- echo "Current working directory is not versioned."
- exit 1
+if [ "$repo_type" = "git" ]; then
+ if ! type git &>/dev/null; then
+ echo "Git needs to be installed." >&2
+ exit 1
+ fi
+elif [ "$repo_type" = "svn" ]; then
+ if ! type svn &> /dev/null; then
+ echo "Subversion needs to be installed." >&2
+ exit 1
+ fi
+
+ ##
+ ## Check if we are in a versioned directory
+ ##
+ if ! svn info &> /dev/null; then
+ echo "Current working directory is not versioned." >&2
+ exit 1
+ fi
fi
@@ -53,7 +72,7 @@
## Detect all ChangeLog's inside this directory by scanning it
## recursively
##
-CHANGELOGS=$(find . -type f -iname ChangeLog)
+CHANGELOGS=$(find . -type f -iname ChangeLog | sed 's:^\./::')
##
@@ -62,20 +81,38 @@
for CHANGELOG in $CHANGELOGS; do
# Make sure the file exists
if [ -f "$CHANGELOG" ]; then
- # Determine SVN status
- STATUS=$(svn status "${CHANGELOG}")
- STATUS=${STATUS:0:1}
+ if [ "$repo_type" = "svn" ]; then
+ # Determine SVN status
+ STATUS=$(svn status "${CHANGELOG}")
+ if [ -z "$STATUS" ]; then
+ STATUS='?'
+ fi
+ elif [ "$repo_type" = "git" ]; then
+ # Determine git status, and fake it into svn-style status
+ STATUS=$(git status | grep -E "(modified|new file):[[:space:]]+${CHANGELOG}")
+ [ "$STATUS" ] || STATUS='?' # signal no changes or not versioned
+ fi
# Check if file is versioned
if [ "$STATUS" != "?" ]; then
+ # Add changelog to the commit
+ if [ "$repo_type" = "git" ]; then
+ git add "${CHANGELOG}"
+ fi
+
# Parse output
- MSG=$(svn diff "${CHANGELOG}" | grep -P '^\+\t' | sed 's/^+//')
+ if [ "$repo_type" = "svn" ]; then
+ MSG=$(svn diff "${CHANGELOG}")
+ elif [ "$repo_type" = "git" ]; then
+ MSG=$(git diff --cached "${CHANGELOG}")
+ fi
+ MSG=$(echo "$MSG" | awk '/^+\t/' | sed 's/^+//')
# Append to commit message (and insert newline between ChangeLogs)
if [ -z "$COMMIT_MSG" ]; then
COMMIT_MSG="$MSG"
else
- COMMIT_MSG=$(echo "$COMMIT_MSG" $'\n' "$MSG")
+ COMMIT_MSG=$(echo "$COMMIT_MSG"$'\n'"$MSG")
fi
fi
fi
@@ -87,7 +124,15 @@
## files is empty, ask the user to enter a commit message himself
##
if [ -n "$COMMIT_MSG" ]; then
- svn commit $FILES -m "$COMMIT_MSG"
+ if [ "$repo_type" = "svn" ]; then
+ svn commit $FILES -m "$COMMIT_MSG"
+ elif [ "$repo_type" = "git" ]; then
+ git commit $FILES -m "$COMMIT_MSG"
+ fi
else
- svn commit $FILES
+ if [ "$repo_type" = "svn" ]; then
+ svn commit $FILES
+ elif [ "$repo_type" = "git" ]; then
+ git commit $FILES
+ fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-dev-tools-4.4.0.1/xfce4-dev-tools.spec new/xfce4-dev-tools-4.6.0/xfce4-dev-tools.spec
--- old/xfce4-dev-tools-4.4.0.1/xfce4-dev-tools.spec 2007-11-17 20:43:40.000000000 +0100
+++ new/xfce4-dev-tools-4.6.0/xfce4-dev-tools.spec 2009-02-25 07:40:00.000000000 +0100
@@ -1,6 +1,6 @@
Summary: Xfce developer tools
Name: xfce4-dev-tools
-Version: 4.4.0.1
+Version: 4.6.0
Release: 1
License: GPL
URL: http://xfce.org/~benny/projects/xfce4-dev-tools/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org