--- subcommander-2.0.0~b4.orig/debian/subcommander.menu +++ subcommander-2.0.0~b4/debian/subcommander.menu @@ -0,0 +1,8 @@ +?package(subcommander):\ + needs="X11" \ + section="Applications/Programming" \ + title="Subcommander" \ + hints="Version control,subversion" \ + longtitle="Subcommander - graphical subversion frontend" \ + icon="/usr/share/pixmaps/subcommander.xpm" \ + command="/usr/bin/subcommander" --- subcommander-2.0.0~b4.orig/debian/subcommander-doc.install +++ subcommander-2.0.0~b4/debian/subcommander-doc.install @@ -0,0 +1 @@ +usr/share/doc/subcommander/html --- subcommander-2.0.0~b4.orig/debian/subcommander-doc.doc-base +++ subcommander-2.0.0~b4/debian/subcommander-doc.doc-base @@ -0,0 +1,11 @@ +Document: subcommander-user-guide +Title: The Subcommander Guide +Author: Martin Hauner +Abstract: The User Guide for Subcommander. + This manual describes subcommander, a graphical client for + Subversion. +Section: Programming + +Format: HTML +Index: /usr/share/doc/subcommander/html/index.html +Files: /usr/share/doc/subcommander/html/*.html --- subcommander-2.0.0~b4.orig/debian/changelog +++ subcommander-2.0.0~b4/debian/changelog @@ -0,0 +1,163 @@ +subcommander (2.0.0~b4-4) unstable; urgency=low + + * Uprgade build-dependencies: + + use libdb-dev instead of libdb4.6-dev (closes: #530482); + + switch to boost 1.38. + * Standards-Version: 3.8.1 (no changes) + + -- Robert Luberda Sun, 07 Jun 2009 09:41:28 +0200 + +subcommander (2.0.0~b4-3) unstable; urgency=low + + * 90-FTBFS-gcc4.4.patch: fix FTBFS with gcc4.4 (closes: #506781). + * Fix build system not to regenerate autoconf files at build time: + + 10-maintainer-mode.patch: add AM_MAINTAINER_MODE to configure.ac; + + 999-autostuff.patch: autogenerated changes from autoreconf; + + refresh other patches; + + debian/rules: pass --disable-maintainer-mode to configure. + * Fix linitian infos/warnings: + + spelling error in description and doc-base file; + + add missing patch descriptions. + * Replace libbost1.35-dev with libboost1.37-dev in build-dependencies. + + -- Robert Luberda Sun, 01 Feb 2009 08:18:29 +0100 + +subcommander (2.0.0~b4-2) unstable; urgency=low + + * Upload to unstable. + * Improve man pages (closes: #413137). + + -- Robert Luberda Mon, 17 Nov 2008 20:39:39 +0100 + +subcommander (2.0.0~b4-1) experimental; urgency=low + + * Adopt package (closes: #491019). + * New upstream release (beta version): + + loggraph segfault fixed by upstream (closes: #428978). + * Switch to quilt, update patches for the new upstream version. + * 20-create-doc.patch: don't require net connection to generate docs. + * 60-url-from-trunk-crash.patch: new, fix segmentation fault on getting url + from trunk. + * 70-disable-neon.patch: don't link with neon (closes: #490351, #483996). + * 80-po-Makefile.patch: fix po's Makefile. + * Add a debian/watch file (lintian). + * Standards-Version: 3.8.0 + * debian/control: Add homepage url + * Add simple desktop file. + * Update Build-Depends: + + depend on libqt4-dev and libx11-dev; + + switch to debhelper v7; + + add libboost1.35-dev as an alternative to libboost-dev; + + remove libneon-dev + * Update section of doc-base and menu files. + + -- Robert Luberda Sat, 08 Nov 2008 12:24:08 +0100 + +subcommander (1.2.2-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Added debian/patches/50-ftbfs-gcc-4.3.dpatch to fix FTBFS with gcc 4.3 + (Closes: #417713) + Thanks for the patch to Martin Michlmayr + * Adjusted build depends to get this thing compiling + + -- Alexander Schmehl Sun, 06 Apr 2008 01:01:45 +0200 + +subcommander (1.2.2-1) unstable; urgency=medium + + * New upstream *stable* release. No new functionality, fixes + the following upstream bugs: + - (build) fix "if" statements in configure + - (build) fix "extra qualification" compile error + - (build) [Issue 180] fix missing include file + - (subcommander) [Issue 176] fixed urls with spaces + - (subcommander) [Issue 179] property conflicts can be set to resolved + - (submerge) [Issue 177] fixed crash with files that have CR line endings + - (submerge) drag and drop crash with an "empty" submerge + - (submerge) drag and drop fileorder issue + * debian/control: changed build dependency from libneon25-dev to libneon26-dev + (closes: #400104) + * Added debtags to central tags database and added them to debian/control + (closes: #385541) + * debian/patches: removed 10-extra-qual.dpatch, adjusted 00list. + Patch is now part of upstream + * debian/compat: changed debhelper compat 4 to 5 + * debian/control: changed build dependency on debhelper to >> 5.0.0 + + -- Andreas Fester Mon, 20 Nov 2006 21:13:20 +0100 + +subcommander (1.2.1-1) unstable; urgency=low + + * New upstream release (closes: #384669) + * debian/patches/10-extra-qual.dpatch: fixes compile error + + -- Andreas Fester Tue, 24 Oct 2006 09:04:35 +0200 + +subcommander (1.2.0-2) unstable; urgency=medium + + * debian/control: changed build dependency libapr0-dev to libapr1-dev + (closes: #391635) + + -- Andreas Fester Sun, 8 Oct 2006 21:59:47 +0200 + +subcommander (1.2.0-1) unstable; urgency=low + + * New upstream release + * Officially renames the binaries to subcommander and submerge, + including the default diff and merge settings (closes: #383306) + * debian/rules: no need to rename the binaries anymore + * debian/control: adjusted build dependencies, added Loic Minier as Uploader + * debian/patches/20-create-doc.dpatch: fix Makefile to create the html + documentation + + -- Andreas Fester Wed, 4 Oct 2006 20:18:18 +0200 + +subcommander (1.1.1-4) unstable; urgency=low + + * debian/control: Build-depend on dpkg-dev >= 1.13.19 for ${source:Version} + feature + * debian/patches/40-sample-project.dpatch: add hint how to use the + preconfigured subcommander repository + + -- Andreas Fester Sun, 13 Aug 2006 11:50:26 +0200 + +subcommander (1.1.1-3) unstable; urgency=low + + * debian/patches/20-create-doc.dpatch: added parameter to ignore + image widths in the html pages + + -- Andreas Fester Sat, 12 Aug 2006 14:57:38 +0200 + +subcommander (1.1.1-2) unstable; urgency=low + + * debian/control: Improved descriptions; added Suggests: doc-base for + subcommander-doc; added build-dependency on autotools-dev; + use ${source:Version} for bin-NMU safe package + * debian/rules: removed unnecessary handling of "nostrip" option; + update config.{sub,guess} at build time; use dh_install to create package + directories; removed unnecessary dh_installdirs call + * debian/copyright: Added additional license information + * debian/subcommander-doc.install, debian/subcommander.install: new files + + -- Andreas Fester Wed, 9 Aug 2006 21:56:51 +0200 + +subcommander (1.1.1-1) unstable; urgency=low + + * New upstream release + * Removed debian/patches/10-macstyle.dpatch and + debian/patches/15-diff.dpatch (now part of upstream) + * debian/patches/20-create-doc.dpatch: use html instead of xhtml, + create separate file also for first section of each chapter + * debian/subcommander.1, debian/submerge.1: fixed typo + + -- Andreas Fester Sat, 5 Aug 2006 12:00:28 +0200 + +subcommander (1.1.0-1) unstable; urgency=low + + * Initial Release (Closes: #322340) + * The binaries /usr/bin/sc and /usr/bin/sm are renamed to + /usr/bin/subcommander and /usr/bin/submerge to avoid name + clashes with other binaries. + * Added patches from 1.1.1 snapshot + + -- Andreas Fester Sat, 22 Jul 2006 22:36:40 +0200 --- subcommander-2.0.0~b4.orig/debian/subcommander.install +++ subcommander-2.0.0~b4/debian/subcommander.install @@ -0,0 +1,5 @@ +usr/bin +usr/share/pixmaps +usr/share/locale +usr/share/subcommander/icons/default/*.png +../subcommander.desktop usr/share/applications --- subcommander-2.0.0~b4.orig/debian/control +++ subcommander-2.0.0~b4/debian/control @@ -0,0 +1,37 @@ +Source: subcommander +Section: devel +Priority: optional +Maintainer: Robert Luberda +Build-Depends: debhelper (>> 7.0.0), quilt (>= 0.46), libqt4-dev (>= 4.4), libx11-dev, + libboost-dev|libboost1.38-dev, libapr1-dev, libdb-dev, libsvn-dev, + libssl-dev, xsltproc, docbook-xsl, autotools-dev, dpkg-dev (>= 1.13.19) +Standards-Version: 3.8.1 +Homepage: http://subcommander.tigris.org/ + +Package: subcommander +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: subcommander-doc (= ${source:Version}) +Description: Graphical client for Subversion + Subcommander is a graphical client for Subversion which supports most + Subversion features. Its tight integration of repository browser and + working copy status allows to switch quickly between these views. + Subcommander also contains submerge, a visual diff and merge tool for text + files. + . + This package contains the subcommander and submerge applications. +XB-Tag: devel::rcs, implemented-in::c++, interface::x11, role::program, uitoolkit::qt, x11::application + +Package: subcommander-doc +Section: doc +Architecture: all +Suggests: doc-base +Description: User guide for subcommander + Subcommander is a graphical client for Subversion which supports most + Subversion features. Its tight integration of repository browser and + working copy status allows to switch quickly between these views. + Subcommander also contains submerge, a visual diff and merge tool for text + files. + . + This package contains the user guides for subcommander and submerge. +XB-Tag: devel::rcs, made-of::data:html, role::documentation --- subcommander-2.0.0~b4.orig/debian/rules +++ subcommander-2.0.0~b4/debian/rules @@ -0,0 +1,164 @@ +#!/usr/bin/make -f +# +# $Id: rules 38 2009-01-31 23:05:04Z robert $ +# +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags = --build $(DEB_HOST_GNU_TYPE) +else + confflags = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CXXFLAGS = -g -Wall -O0 +else + CXXFLAGS = -g -Wall -O2 +endif + +LDFLAGS = -Wl,-z,defs -Wl,--as-needed + + +export QTDIR=/usr + +PKG_TMP=$(CURDIR)/debian/tmp +ifeq (,$(DEB_BUILD_ARCH)) + DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +endif + +include /usr/share/quilt/quilt.make + +autotools: autotools-clean + tar cvzf configs.tgz ac-helpers/config.sub ac-helpers/config.guess po/*.po + rm -f ac-helpers/config.sub ac-helpers/config.guess + ln -s /usr/share/misc/config.sub ac-helpers/config.sub + ln -s /usr/share/misc/config.guess ac-helpers/config.guess + +autotools-clean: + if [ -f configs.tgz ] ; then \ + set -e ; \ + rm -f ac-helpers/config.sub ac-helpers/config.guess ; \ + tar xvzf configs.tgz ; \ + rm -f configs.tgz ; \ + fi + + +configure: autotools configure-stamp +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + LDFLAGS="$(LDFLAGS)" \ + ./configure --prefix=/usr \ + --enable-nls \ + --disable-dependency-tracking \ + --disable-maintainer-mode \ + $(confflags) + touch "$@" + +build: autotools configure-stamp build-stamp +build-stamp: + dh_testdir + + # Create the binaries + $(MAKE) "CXXFLAGS=$(CXXFLAGS)" + + # Create the HTML documentation + $(MAKE) -C doc/docbook/guide + + $(MAKE) -C po + + touch "$@" + +clean-patched: + dh_testdir + dh_testroot + + rm -f build-stamp configure-stamp + dh_clean + + # Clean the build + -test -f Makefile && $(MAKE) distclean + -test -f doc/docbook/guide/Makefile && $(MAKE) -C doc/docbook/guide/ clean + -test -f po/Makefile && $(MAKE) -C po clean + rm -f po/*.mo po/Makefile po/Subcommander.pot + + +clean: clean-patched autotools-clean unpatch + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + + dh_prep + + # Install binaries and documentation into temporary directory + $(MAKE) install DESTDIR=$(PKG_TMP) + $(MAKE) -C doc/docbook/guide install DESTDIR=$(PKG_TMP)/usr/share/doc/subcommander/html + $(MAKE) -C po install DESTDIR=$(PKG_TMP) + + # Install the application icon (should be done in the upstream Makefile) + mkdir -p $(PKG_TMP)/usr/share/pixmaps + install --mode=644 pics/subcommander.xpm $(PKG_TMP)/usr/share/pixmaps + + dh_install --list-missing --sourcedir=$(PKG_TMP) + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs +# dh_installexamples + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installcatalogs +# dh_installpam +# dh_installmime +# dh_installinit + dh_installman +# dh_installcron +# dh_installinfo +# dh_installwm +# dh_installudev +# dh_lintian +# dh_undocumented + dh_strip + dh_link + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build install + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary-common binary install autotools autotools-clean --- subcommander-2.0.0~b4.orig/debian/compat +++ subcommander-2.0.0~b4/debian/compat @@ -0,0 +1 @@ +7 --- subcommander-2.0.0~b4.orig/debian/subcommander.docs +++ subcommander-2.0.0~b4/debian/subcommander.docs @@ -0,0 +1 @@ +README --- subcommander-2.0.0~b4.orig/debian/copyright +++ subcommander-2.0.0~b4/debian/copyright @@ -0,0 +1,208 @@ +This package was debianized by Andreas Fester on +Fri, 21 Jul 2006 13:04:04 +0200. + +It was downloaded from http://subcommander.tigris.org + +Upstream Author: Martin Hauner + + Subcommander is Copyright (c) 2003-2006, Martin Hauner + and Copyright (c) 2003-2006, The Subcommander Crew + + The files + + svn/VisualDiff.cpp + svn/subversion/client.h + svn/subversion/repos_diff2.c + svn/subversion/repos_diff2.h + svn/subversion/repos_diff_summarize.c + svn/subversion/repos_diff_summarize.h + subcommander/sc.rc + submerge/sc.rc + sublib/version.in.h + + are Copyright (c) 2000-2004 CollabNet + +>> doc/COPYING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + + + Subcommander is Copyright (c) 2003-2006, Martin Hauner + + + Subcommander is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Subcommander is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Subcommander; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General Public +License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. + + In addition, as a special exception, the copyright holder + gives permission to link the code of this program with the Qt + library (or with modified versions of Qt that use the same license + as Qt), and distribute linked combinations including the two. You + must obey the GNU General Public License in all respects for all of + the code used other than Qt. If you modify a file to which this + license applies, you may extend this exception to your version of + the file, but you are not obligated to do so. If you do not wish + to do so, delete this exception statement from your version. + + +>> doc/COPYING.CollabNet >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + + -- Subcommander Note -------------------------------------- begin -- + + This license applies only to the files + + subcommander/sc.rc + submerge/sc.rc + + which are based on subversions build/win32/svn.rc file + + + sublib/version.in.h + + which is based on subversions subversion/include/svn_version.h + + -- Subcommander Note ---------------------------------------- end -- + + ==================================================================== + + This is version 1 of this license. It is also available online at + http://subversion.tigris.org/license-1.html. If newer versions of + this license are posted there (the same URL, but with the version + number incremented: .../license-2.html, .../license-3.html, and so + on), you may use a newer version instead, at your option. + + ==================================================================== + Copyright (c) 2000-2004 CollabNet. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The end-user documentation included with the redistribution, if + any, must include the following acknowledgment: "This product includes + software developed by CollabNet (http://www.Collab.Net/)." + Alternately, this acknowledgment may appear in the software itself, if + and wherever such third-party acknowledgments normally appear. + + 4. The hosted project names must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact info@collab.net. + + 5. Products derived from this software may not use the "Tigris" name + nor may "Tigris" appear in their names without prior written + permission of CollabNet. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL COLLABNET OR ITS CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ==================================================================== + + This software consists of voluntary contributions made by many + individuals on behalf of CollabNet. + + +>> pics/icons/default/README >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + + + Subcommander Note: + + Nearly all icon parts are from the nuvola iconset. Only the double arrow + is from the crystal iconset and the prev/next/merge icons are from + Subcommander itself. + + + crystal license? + +The crystal icon set (http://www.everaldo.com/crystal.html) is licensed under the GPL. + + Below is the original README from the nuvola package (slightly reformatted). + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + This copyright and license notice covers the images in this directory. + Note the license notice contains an add-on. + ************************************************************************ + + TITLE: NUVOLA ICON THEME for KDE 3.x + AUTHOR: David Vignoni | ICON KING + SITE: http://www.icon-king.com + MAILING LIST: http://mail.icon-king.com/mailman/listinfo/nuvola_icon-king.com + + Copyright (c) 2003-2004 David Vignoni. + + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free + Software Foundation, version 2.1 of the License. + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. You should have received a copy of the GNU Lesser General Public + License along with this library (see the the LICENSE file); if not, write to + the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + + #######**** NOTE THIS ADD-ON ****####### + + The GNU Lesser General Public License or LGPL is written for software libraries + in the first place. The LGPL has to be considered valid for this artwork library + too. + Nuvola icon theme for KDE 3.x is a special kind of software library, it is an + artwork library, it's elements can be used in a Graphical User Interface, or GUI. + Source code, for this library means: + - raster png image* . + The LGPL in some sections obliges you to make the files carry notices. With + images this is in some cases impossible or hardly useful. With this library a + notice is placed at a prominent place in the directory containing the elements. + You may follow this practice. The exception in section 6 of the GNU Lesser + General Public License covers the use of elements of this art library in a GUI. + dave [at] icon-king.com + + Date: 15 October 2004 + Version: 1.0 + + DESCRIPTION: + + Icon theme for KDE 3.x. + Icons where designed using Adobe Illustrator, and then exported to PNG format. + Icons shadows and minor corrections were done using Adobe Photoshop. + Kiconedit was used to correct some 16x16 and 22x22 icons. + + LICENSE + + Released under GNU Lesser General Public License (LGPL) Look at the LICENSE file. + + On Debian systems, the complete text of the GNU Lesser General Public + License version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'. + + CONTACT + + David Vignoni + e-mail : david [at] icon-king.com + ICQ : 117761009 + http: http://www.icon-king.com --- subcommander-2.0.0~b4.orig/debian/subcommander.manpages +++ subcommander-2.0.0~b4/debian/subcommander.manpages @@ -0,0 +1,2 @@ +debian/subcommander.1 +debian/submerge.1 --- subcommander-2.0.0~b4.orig/debian/subcommander.1 +++ subcommander-2.0.0~b4/debian/subcommander.1 @@ -0,0 +1,19 @@ +.TH SUBCOMMANDER "1" "November 2008" "subcommander 2.0.0b4" "User Commands" +.SH NAME +subcommander \- Graphical subversion client. +.SH SYNOPSIS +\fBsubcommander\fR +.SH DESCRIPTION +\fBsubcommander\fR supports most subversion features. Its tight integration of +repository browser and working copy status view allows to switch quickly +between a working copy view and the repository view. +.SH SEE ALSO +.BR submerge (1), +.BR svn (1), +"The Subcommander Guide" in /usr/share/doc/subcommander/html/index.html, +http://subcommander.tigris.org/ +.SH AUTHOR +Subcommander was written by Martin Hauner . +.PP +This manual page was written by Andreas Fester, , +for the Debian Project and may be used freely by others. --- subcommander-2.0.0~b4.orig/debian/submerge.1 +++ subcommander-2.0.0~b4/debian/submerge.1 @@ -0,0 +1,52 @@ +.TH SUBMERGE "1" "November 2008" "submerge 2.0.0b4" "User commands" +.SH NAME +submerge \- Graphical merge tool for text files. +.SH SYNOPSIS +\fBsubmerge\fR +.br +\fBsubmerge\fR \fBdiff\fR | \fBdiff2\fR [\fIoptions\fR] \fIoriginal\fR \fImodified\fR +.br +\fBsubmerge\fR \fBdiff3\fR | \fBmerge\fR [\fIoptions\fR] \fIoriginal\fR \fImodified\fR \fIlatest\fR \fImerged\fR +.br +\fBsubmerge\fR \fBhelp\fR [ \fBdiff\fR | \fBdiff2\fR | \fBdiff3\fR | \fBmerged\fR ] +.SH DESCRIPTION +.B submerge +is a graphical diff and merge tool for text files. +.SH COMMANDS +.TP 4 +.BR diff " , "diff2 +display differences of two files. +.TP +.BR diff3 " , " merge +visually merge differences of modifed and latest. +.TP +.BR help +display short help message. +.SH OPTIONS +.TP +\fB\-e\fR | \fB\-\-encoding\fR \fIarg\fR +encoding/codepage (iconv) +.TP +\fB\-L\fR | \fB\-\-label\fR \fIarg\fR +label for a given file (per file) +.TP +\fB\-\-w\fR+ +whitespaces on +.TP +\fB\-\-w\-\fR +whitespaces off (ignore) +.SH SEE ALSO +.BR subcommander (1), +.BR svn (1), +"The Subcommander Guide" in /usr/share/doc/subcommander/html/index.html, +http://subcommander.tigris.org/ +.SH AUTHOR +Submerge was written by Martin Hauner . +.PP +This manual page was written by Andreas Fester, , +for the Debian Project and may be used freely by others. +.br +The page was improved by Robert Luberda with the help of +.BR help2man (1) +tool. + --- subcommander-2.0.0~b4.orig/debian/watch +++ subcommander-2.0.0~b4/debian/watch @@ -0,0 +1,5 @@ +# control file for the uscan(1) tool +version=3 +opts=dversionmangle=s/~// \ +http://subcommander.tigris.org/Releases.html \ + http://subcommander.tigris.org/files/.*/Subcommander-(\d[\d.ab]+)\.tar\.gz --- subcommander-2.0.0~b4.orig/debian/subcommander.desktop +++ subcommander-2.0.0~b4/debian/subcommander.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=Subcommander +GenericName=Subversion Client +Comment=A GUI Client for Subversion +Type=Application +Exec=subcommander +Icon=/usr/share/pixmaps/subcommander.xpm +Categories=Development; --- subcommander-2.0.0~b4.orig/debian/patches/50-ftbfs-gcc-4.3.patch +++ subcommander-2.0.0~b4/debian/patches/50-ftbfs-gcc-4.3.patch @@ -0,0 +1,55 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50-ftbfs-gcc-4.3.dpatch by Alexander Schmehl +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes #417713 a FTBFS with gcc 4.3 + +Index: subcommander/sublib/MsgHandler.cpp +=================================================================== +--- subcommander.orig/sublib/MsgHandler.cpp 2008-11-05 21:25:28.000000000 +0100 ++++ subcommander/sublib/MsgHandler.cpp 2008-11-05 21:31:28.000000000 +0100 +@@ -7,6 +7,8 @@ + * ==================================================================== + */ + ++#include ++ + // sc + #include "config.h" + #include "MsgHandler.h" +Index: subcommander/sublib/Utility.cpp +=================================================================== +--- subcommander.orig/sublib/Utility.cpp 2008-11-05 21:25:28.000000000 +0100 ++++ subcommander/sublib/Utility.cpp 2008-11-05 21:31:28.000000000 +0100 +@@ -26,6 +26,7 @@ + #endif // _WIN32 + + // sys ++#include + #include + + +Index: subcommander/util/Compare.cpp +=================================================================== +--- subcommander.orig/util/Compare.cpp 2008-11-05 21:32:28.000000000 +0100 ++++ subcommander/util/Compare.cpp 2008-11-05 21:32:43.000000000 +0100 +@@ -11,6 +11,7 @@ + #include "Compare.h" + #include "String.h" + #include "svn/Path.h" // \todo circular dependency between util <-> svn ++#include + + + int calcDepth( const sc::String& s ) +Index: subcommander/util/Stackframe.cpp +=================================================================== +--- subcommander.orig/util/Stackframe.cpp 2008-11-05 21:31:59.000000000 +0100 ++++ subcommander/util/Stackframe.cpp 2008-11-05 21:32:14.000000000 +0100 +@@ -9,6 +9,7 @@ + + // sc + #include "Stackframe.h" ++#include + + + Variable::Variable(VariableType type, sc::Size size) --- subcommander-2.0.0~b4.orig/debian/patches/80-po-Makefile.patch +++ subcommander-2.0.0~b4/debian/patches/80-po-Makefile.patch @@ -0,0 +1,19 @@ +Fix po's Makefile.am +Index: subcommander/po/Makefile.am +=================================================================== +--- subcommander.orig/po/Makefile.am 2009-01-31 13:43:00.000000000 +0100 ++++ subcommander/po/Makefile.am 2009-01-31 13:45:17.000000000 +0100 +@@ -1,11 +1,12 @@ + ## process this file with automake to produce Makefile.in + +-locdir=$(datadir)/locale ++locdir=$(DESTDIR)/$(datadir)/locale + + all: po-merge de.mo zh_CN.mo + + + install-data-local: ++ mkdir -p $(locdir)/de/LC_MESSAGES/ $(locdir)/zh_CN/LC_MESSAGES/ + cp de.mo $(locdir)/de/LC_MESSAGES/Subcommander.mo + cp zh_CN.mo $(locdir)/zh_CN/LC_MESSAGES/Subcommander.mo + --- subcommander-2.0.0~b4.orig/debian/patches/series +++ subcommander-2.0.0~b4/debian/patches/series @@ -0,0 +1,10 @@ +10-maintainer-mode.patch +20-create-doc.patch +30-app-icon.patch +40-sample-project.patch +50-ftbfs-gcc-4.3.patch +60-url-from-trunk-crash.patch +70-disable-neon.patch +80-po-Makefile.patch +90-FTBFS-gcc4.4.patch +999-autostuff.patch --- subcommander-2.0.0~b4.orig/debian/patches/60-url-from-trunk-crash.patch +++ subcommander-2.0.0~b4/debian/patches/60-url-from-trunk-crash.patch @@ -0,0 +1,14 @@ +Fix segmentation fault on getting url from trunk +Index: subcommander/subcommander/ProjectWizard.cpp +=================================================================== +--- subcommander.orig/subcommander/ProjectWizard.cpp 2008-11-05 21:36:39.000000000 +0100 ++++ subcommander/subcommander/ProjectWizard.cpp 2008-11-05 21:39:50.000000000 +0100 +@@ -346,6 +346,8 @@ + sc::String wcPath = sc::String(field("WcPath").toString().utf8()); + sc::String wcUrl; + ++ if ( wcPath.right(1) == "/" ) wcPath = wcPath.left(wcPath.getByteCnt() - 1); ++ + svn::Client::getUrlFromPath( wcPath, wcUrl ); + + setField( "TrunkUrl", QString::fromUtf8(wcUrl) ); --- subcommander-2.0.0~b4.orig/debian/patches/30-app-icon.patch +++ subcommander-2.0.0~b4/debian/patches/30-app-icon.patch @@ -0,0 +1,79 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30-app-icon.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Application icon in .xpm format + +Index: subcommander/pics/subcommander.xpm +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ subcommander/pics/subcommander.xpm 2008-11-05 21:18:36.000000000 +0100 +@@ -0,0 +1,68 @@ ++/* XPM */ ++static char * subcommander_xpm[] = { ++"32 32 33 1", ++" c None", ++". c #1B0A72", ++"+ c #1B0A71", ++"@ c #1A0A6D", ++"# c #190968", ++"$ c #170963", ++"% c #1A0A6F", ++"& c #19096A", ++"* c #180966", ++"= c #15085A", ++"- c #0D0535", ++"; c #12074B", ++"> c #1A0A6C", ++", c #1A0A6E", ++"' c #1B0A70", ++") c #110649", ++"! c #180968", ++"~ c #16085C", ++"{ c #0F0640", ++"] c #13074E", ++"^ c #080322", ++"/ c #1A0A70", ++"( c #19096B", ++"_ c #150857", ++": c #190969", ++"< c #170860", ++"[ c #140855", ++"} c #180964", ++"| c #130750", ++"1 c #180963", ++"2 c #1A096C", ++"3 c #140856", ++"4 c #0A042A", ++" ", ++" ", ++" ", ++" ", ++" .... ..... ", ++" ........ ........ ", ++" .....+@#$ ......%&#* ", ++" ..+ +...@ ", ++" .. =..+ ", ++" ..+- +.+ ", ++" ..+; .. ", ++" +..> .. ", ++" ,..' ..) ", ++" !..+ ..# ", ++" ~... ..{ ", ++" ]+.. ..%^ ", ++" /.. ..( ", ++" '.' ..( ", ++" .._ (..@ ", ++" %.: :../ ", ++" ..@ $..+ ", ++" ...< [+..% ", ++" ..... ,..+ ", ++" ....... }... ", ++" ..........+ |+..+ ", ++".........,1 #... ", ++" ..'2}3 |+( ", ++" 4 ", ++" ", ++" ", ++" ", ++" "}; --- subcommander-2.0.0~b4.orig/debian/patches/20-create-doc.patch +++ subcommander-2.0.0~b4/debian/patches/20-create-doc.patch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-create-doc.dpatch by > +## +## DP: Fixes Makefile to create the HTML version of the subcommander +## DP: user guide + + +Index: subcommander/doc/docbook/guide/Makefile +=================================================================== +--- subcommander.orig/doc/docbook/guide/Makefile 2008-11-06 23:58:55.000000000 +0100 ++++ subcommander/doc/docbook/guide/Makefile 2008-11-06 23:57:48.000000000 +0100 +@@ -1,9 +1,9 @@ + # Licensed to the public under the terms of the GNU GPL, + # see the file COPYING for details. + # +-# Creates the HTML version of the subcommander user guide. +-# +-# run ./gen_version.rb from the source root dir to generate ++# Creates the HTML version of the subcommander user guide. ++# ++# run ./gen_version.rb from the source root dir to generate + # version.out.xml + + STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl +@@ -11,9 +11,11 @@ + DEST_DIR=html/ + + html: ++ XML_CATALOG_FILES=$(CURDIR)/catalogs.xml \ + xsltproc -param chunk.first.sections 1 \ +- -param ignore.image.scaling 1 \ ++ -param ignore.image.scaling 1 \ + -stringparam base.dir $(DEST_DIR) \ ++ -nonet \ + --xinclude \ + $(STYLESHEET) $(SOURCE) + +Index: subcommander/doc/docbook/guide/catalogs.xml +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ subcommander/doc/docbook/guide/catalogs.xml 2008-11-06 23:56:20.000000000 +0100 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ ++ --- subcommander-2.0.0~b4.orig/debian/patches/40-sample-project.patch +++ subcommander-2.0.0~b4/debian/patches/40-sample-project.patch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40-sample-project.dpatch by > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add hint how to try out the preconfigured subcommander repository. + +Index: subcommander/subcommander/ListWidget.cpp +=================================================================== +--- subcommander.orig/subcommander/ListWidget.cpp 2008-11-09 08:31:47.000000000 +0100 ++++ subcommander/subcommander/ListWidget.cpp 2008-11-09 08:32:20.000000000 +0100 +@@ -93,12 +93,6 @@ + "any other issue please send your comments to dev@subcommander.tigris.org. " + "Thanks. :)" + "

" +-"Windows Installer Note:" +-"

" +-"This beta version will be installed in parallel to a normal Subcommander " +-"release. It will NOT overwrite the normal Subcommander installation but it " +-"will use the same configuration files. " +-"

" + "** CHANGES **" + "

" + "Here is a short overview of the new features:
" +@@ -114,7 +108,6 @@ + "* new: project setup wizard
" + "* new: ported to qt 4.3+
" + "

" +-"

" + "repository & working copy navigation" + "

" + "* the project bookmark view shows the repository and working copy bookmarks" +@@ -130,7 +123,7 @@ + "help" + "

" + "* pressing SHIFT-F1 in the working copy view will display a detailed" +-"description of the the columns and their possible values." ++" description of the the columns and their possible values." + "

" + "internationalization (i18n)" + "

" +@@ -147,6 +140,8 @@ + " repository folder as branch or tag folder. subcommander needs only to " + " know WHERE you keep your branches and tags. It does NOT require that they " + " are named 'branches' or 'tags'." ++"
* for anonymous (read only) access to the preconfigured subcommander" ++" repository, use the username 'guest' with an empty password." + "

" + "" + ); --- subcommander-2.0.0~b4.orig/debian/patches/10-maintainer-mode.patch +++ subcommander-2.0.0~b4/debian/patches/10-maintainer-mode.patch @@ -0,0 +1,17 @@ +Add AM_MAINTAINER_MODE +Add a foreign option to AM_INIT_AUTOMAKE, not to automake complain about non-existent +files like NEWS or ChangeLog +Index: subcommander/configure.ac +=================================================================== +--- subcommander.orig/configure.ac 2009-01-31 13:49:10.000000000 +0100 ++++ subcommander/configure.ac 2009-01-31 13:52:10.000000000 +0100 +@@ -8,7 +8,8 @@ + AM_CONFIG_HEADER(config.h) + AC_CONFIG_SRCDIR(sublib/version.in.h) + AC_CONFIG_AUX_DIR(ac-helpers) +-AM_INIT_AUTOMAKE(subdir-objects) ++AM_INIT_AUTOMAKE(subdir-objects foreign) ++AM_MAINTAINER_MODE + AH_TOP([ + #ifndef SC_CONFIG_H + #define SC_CONFIG_H --- subcommander-2.0.0~b4.orig/debian/patches/70-disable-neon.patch +++ subcommander-2.0.0~b4/debian/patches/70-disable-neon.patch @@ -0,0 +1,160 @@ +Don't try to link with neon. Closes: #490351, #482512 +Index: subcommander/subcommander/Makefile.am +=================================================================== +--- subcommander.orig/subcommander/Makefile.am 2009-01-31 15:17:33.000000000 +0100 ++++ subcommander/subcommander/Makefile.am 2009-01-31 15:18:27.000000000 +0100 +@@ -117,7 +117,7 @@ + ## by apr_time_from_sec + + AM_CPPFLAGS = -DQT_THREAD_SUPPORT @APR_CPPFLAGS@ @STLPORT_INCLUDES@ -I.. @QT_INCLUDES@ \ +- @SVN_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ @NEON_INCLUDES@ \ ++ @SVN_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ \ + @SSL_INCLUDES@ @BOOST_INCLUDES@ -D__STDC_CONSTANT_MACROS=1 + AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ +@@ -126,9 +126,9 @@ + + subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \ + -lz @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_client-1 -lsvn_subr-1 \ +- -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_ra_dav-1 \ +- -lsvn_ra_local-1 -lsvn_ra_svn-1 -lsvn_repos-1 -lsvn_fs-1 \ +- -lsvn_fs_fs-1 @STLPORT_LIBS@ @NEON_LIBS@ ++ -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 \ ++ -lsvn_repos-1 -lsvn_fs-1 \ ++ -lsvn_fs_fs-1 @STLPORT_LIBS@ + + subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a + +Index: subcommander/configure.ac +=================================================================== +--- subcommander.orig/configure.ac 2009-01-31 15:17:48.000000000 +0100 ++++ subcommander/configure.ac 2009-01-31 15:17:58.000000000 +0100 +@@ -263,52 +263,6 @@ + + + +-## +-# check for neon +-# +-AC_MSG_CHECKING([for neon]) +-AC_ARG_WITH( +- [neon], +- AC_HELP_STRING([--with-neon=DIR],[path to neon installation]), +- [ +- neon_path=$withval +- with_neon="yes" +- ],[ +- with_neon="no" +- ] +-) +- +-if test x$with_neon = xyes; then +- NEON_INCLUDES="-I$neon_path/include" +- NEON_LIBS="`$neon_path/bin/neon-config --libs`" +-else +- NEON_INCLUDES="" +- NEON_LIBS="" +-fi +- +-CPPFLAGS="$NEON_INCLUDES" +- +-AC_LANG(C++) +-AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( +- [[#include ]], +- [[ne_sock_exit()]] +- ), +- [ +- AC_MSG_RESULT([yes]) +- AC_MSG_RESULT([ headers $NEON_INCLUDES]) +- AC_MSG_RESULT([ libraries $NEON_LIBS]) +- ],[ +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([try setting --with-neon]) +- ] +-) +- +-AC_SUBST(NEON_INCLUDES) +-AC_SUBST(NEON_LIBS) +-# +-# end check for neon +-## + + + +Index: subcommander/subcommander/subcommander.cpp +=================================================================== +--- subcommander.orig/subcommander/subcommander.cpp 2009-01-31 15:17:33.000000000 +0100 ++++ subcommander/subcommander/subcommander.cpp 2009-01-31 15:17:58.000000000 +0100 +@@ -28,16 +28,12 @@ + #include + #include + +-// neon +-#include +-#include +- + // openssl + #include + #include + + +-// cleanup neon/ssl stuff to avoid a lot of noise when running with ++// cleanup ssl stuff to avoid a lot of noise when running with + // memory leak detection. + + void exit_ssl() +@@ -52,12 +48,6 @@ + #endif // _WIN32 + } + +-void exit_neon() +-{ +-#ifdef _WIN32 +- ne_sock_exit(); +-#endif // _WIN32 +-} + + + +@@ -82,8 +72,6 @@ + setAppName("subcommander"); + Q_INIT_RESOURCE(sublib); + +- // about dialog +- setNeonVersion( ne_version_string() ); + + #ifndef _MACOSX + // set icon +@@ -138,7 +126,6 @@ + config.save(); + + exit_ssl(); +- exit_neon(); + + TargetRepository::teardown(); + stopStackProcess(); +Index: subcommander/sublib/AboutDialog.cpp +=================================================================== +--- subcommander.orig/sublib/AboutDialog.cpp 2009-01-31 15:17:33.000000000 +0100 ++++ subcommander/sublib/AboutDialog.cpp 2009-01-31 15:17:58.000000000 +0100 +@@ -279,19 +279,6 @@ + #endif + " * * * "; + +- if( getLongAppName() == "subcommander" ) +- { +- about2 += +- "" +- ""; +- about2 += getNeonVersion(); +- about2 += +- "" +- "" "http://www.webdav.org" "" +- "" +- " * * * "; +- } +- + + about2 += + "" --- subcommander-2.0.0~b4.orig/debian/patches/999-autostuff.patch +++ subcommander-2.0.0~b4/debian/patches/999-autostuff.patch @@ -0,0 +1,1091 @@ +This patch contains changes generated by calling autoreconf +Index: subcommander/Makefile.in +=================================================================== +--- subcommander.orig/Makefile.in 2009-01-31 15:17:29.000000000 +0100 ++++ subcommander/Makefile.in 2009-01-31 15:19:21.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. +@@ -112,10 +112,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -208,7 +207,7 @@ + .SUFFIXES: + am--refresh: + @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -235,9 +234,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 +@@ -249,7 +248,7 @@ + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: $(am__configure_deps) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ +@@ -332,8 +331,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 + +@@ -358,8 +357,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) \ +@@ -369,13 +368,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(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 +@@ -446,6 +444,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) +@@ -472,6 +474,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*) \ +@@ -620,7 +624,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-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ +Index: subcommander/aclocal.m4 +=================================================================== +--- subcommander.orig/aclocal.m4 2009-01-31 15:17:29.000000000 +0100 ++++ subcommander/aclocal.m4 2009-01-31 15:18:45.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 -*- + +@@ -320,7 +325,7 @@ + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue +@@ -380,13 +385,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. +@@ -491,16 +496,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. + # +@@ -537,6 +543,35 @@ + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering ++ ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# 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 4 ++ ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) ++ ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++ + # Check to see how 'make' treats includes. -*- Autoconf -*- + + # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +@@ -806,7 +841,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]) + +Index: subcommander/configure +=================================================================== +--- subcommander.orig/configure 2009-01-31 15:17:29.000000000 +0100 ++++ subcommander/configure 2009-01-31 15:19:13.000000000 +0100 +@@ -638,6 +638,9 @@ + AMTAR + am__tar + am__untar ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT + CC + CFLAGS + LDFLAGS +@@ -678,8 +681,6 @@ + SVN_INCLUDES + SVN_LIBS + SVN_PATH +-NEON_INCLUDES +-NEON_LIBS + SSL_INCLUDES + SSL_LIBS + BDB_INCLUDES +@@ -1301,6 +1302,8 @@ + Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-universal enable universal build (MacOSX only) +@@ -1317,7 +1320,6 @@ + or the full path to apu-config + --with-boost=DIR path to boost installation + --with-subversion=DIR path to subversion installation, 1.4.4+ or 1.5.1+ +- --with-neon=DIR path to neon installation + --with-openssl=DIR path to openssl installation + --with-berkeley-db=DIR include path of berkeley db + --with-x use the X Window System +@@ -2255,6 +2257,28 @@ + + + ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ + + + +@@ -4709,104 +4733,6 @@ + + + +-## +-# check for neon +-# +-{ echo "$as_me:$LINENO: checking for neon" >&5 +-echo $ECHO_N "checking for neon... $ECHO_C" >&6; } +- +-# Check whether --with-neon was given. +-if test "${with_neon+set}" = set; then +- withval=$with_neon; +- neon_path=$withval +- with_neon="yes" +- +-else +- +- with_neon="no" +- +- +-fi +- +- +-if test x$with_neon = xyes; then +- NEON_INCLUDES="-I$neon_path/include" +- NEON_LIBS="`$neon_path/bin/neon-config --libs`" +-else +- NEON_INCLUDES="" +- NEON_LIBS="" +-fi +- +-CPPFLAGS="$NEON_INCLUDES" +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-ne_sock_exit() +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- { echo "$as_me:$LINENO: result: headers $NEON_INCLUDES" >&5 +-echo "${ECHO_T} headers $NEON_INCLUDES" >&6; } +- { echo "$as_me:$LINENO: result: libraries $NEON_LIBS" >&5 +-echo "${ECHO_T} libraries $NEON_LIBS" >&6; } +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- { { echo "$as_me:$LINENO: error: try setting --with-neon" >&5 +-echo "$as_me: error: try setting --with-neon" >&2;} +- { (exit 1); exit 1; }; } +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +- +-# +-# end check for neon +-## + + + +@@ -7301,6 +7227,13 @@ + LTLIBOBJS=$ac_ltlibobjs + + ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -7933,6 +7866,9 @@ + AMTAR!$AMTAR$ac_delim + am__tar!$am__tar$ac_delim + am__untar!$am__untar$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim + CC!$CC$ac_delim + CFLAGS!$CFLAGS$ac_delim + LDFLAGS!$LDFLAGS$ac_delim +@@ -7968,9 +7904,6 @@ + APR_INCLUDES!$APR_INCLUDES$ac_delim + APR_LIBS!$APR_LIBS$ac_delim + APU_INCLUDES!$APU_INCLUDES$ac_delim +-APU_LIBS!$APU_LIBS$ac_delim +-BOOST_INCLUDES!$BOOST_INCLUDES$ac_delim +-SVN_INCLUDES!$SVN_INCLUDES$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -8012,10 +7945,11 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++APU_LIBS!$APU_LIBS$ac_delim ++BOOST_INCLUDES!$BOOST_INCLUDES$ac_delim ++SVN_INCLUDES!$SVN_INCLUDES$ac_delim + SVN_LIBS!$SVN_LIBS$ac_delim + SVN_PATH!$SVN_PATH$ac_delim +-NEON_INCLUDES!$NEON_INCLUDES$ac_delim +-NEON_LIBS!$NEON_LIBS$ac_delim + SSL_INCLUDES!$SSL_INCLUDES$ac_delim + SSL_LIBS!$SSL_LIBS$ac_delim + BDB_INCLUDES!$BDB_INCLUDES$ac_delim +@@ -8042,7 +7976,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -8443,21 +8377,22 @@ + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -8494,7 +8429,7 @@ + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. +- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +Index: subcommander/po/Makefile.in +=================================================================== +--- subcommander.orig/po/Makefile.in 2009-01-31 15:17:29.000000000 +0100 ++++ subcommander/po/Makefile.in 2009-01-31 15:19:19.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. +@@ -84,10 +84,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -167,12 +166,12 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-locdir = $(datadir)/locale ++locdir = $(DESTDIR)/$(datadir)/locale + all: all-am + + .SUFFIXES: + .SUFFIXES: .mo .po +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -197,9 +196,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + tags: TAGS + TAGS: +@@ -333,6 +332,7 @@ + all: po-merge de.mo zh_CN.mo + + install-data-local: ++ mkdir -p $(locdir)/de/LC_MESSAGES/ $(locdir)/zh_CN/LC_MESSAGES/ + cp de.mo $(locdir)/de/LC_MESSAGES/Subcommander.mo + cp zh_CN.mo $(locdir)/zh_CN/LC_MESSAGES/Subcommander.mo + +Index: subcommander/subcommander/Makefile.in +=================================================================== +--- subcommander.orig/subcommander/Makefile.in 2009-01-31 15:17:29.000000000 +0100 ++++ subcommander/subcommander/Makefile.in 2009-01-31 15:19:20.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. +@@ -176,7 +176,7 @@ + moc/settings/SubversionSettingsWidget_moc.$(OBJEXT) \ + moc/settings/ToolsSettingsWidget_moc.$(OBJEXT) + subcommander_OBJECTS = $(am_subcommander_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/ac-helpers/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -242,10 +242,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -435,16 +434,16 @@ + $(icons)/LICENSE + + AM_CPPFLAGS = -DQT_THREAD_SUPPORT @APR_CPPFLAGS@ @STLPORT_INCLUDES@ -I.. @QT_INCLUDES@ \ +- @SVN_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ @NEON_INCLUDES@ \ ++ @SVN_INCLUDES@ @APR_INCLUDES@ @APU_INCLUDES@ \ + @SSL_INCLUDES@ @BOOST_INCLUDES@ -D__STDC_CONSTANT_MACROS=1 + + AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ + subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \ + -lz @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_client-1 -lsvn_subr-1 \ +- -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_ra_dav-1 \ +- -lsvn_ra_local-1 -lsvn_ra_svn-1 -lsvn_repos-1 -lsvn_fs-1 \ +- -lsvn_fs_fs-1 @STLPORT_LIBS@ @NEON_LIBS@ ++ -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 \ ++ -lsvn_repos-1 -lsvn_fs-1 \ ++ -lsvn_fs_fs-1 @STLPORT_LIBS@ + + subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a + noinst_HEADERS = AuthPromptProvider.h \ +@@ -889,7 +888,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -914,9 +913,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +@@ -1567,8 +1566,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 + +@@ -1580,8 +1579,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) \ +@@ -1591,13 +1590,12 @@ + CTAGS: $(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 +Index: subcommander/sublib/Makefile.in +=================================================================== +--- subcommander.orig/sublib/Makefile.in 2009-01-31 15:17:29.000000000 +0100 ++++ subcommander/sublib/Makefile.in 2009-01-31 15:19:20.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. +@@ -75,7 +75,7 @@ + moc/settings/ColorSettingsWidget_moc.$(OBJEXT) \ + moc/settings/SettingsWidget_moc.$(OBJEXT) + libsublib_a_OBJECTS = $(am_libsublib_a_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/ac-helpers/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -133,10 +133,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -326,7 +325,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -351,9 +350,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLIBRARIES: +@@ -505,8 +504,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 + +@@ -518,8 +517,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) \ +@@ -529,13 +528,12 @@ + CTAGS: $(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 +Index: subcommander/submerge/Makefile.in +=================================================================== +--- subcommander.orig/submerge/Makefile.in 2009-01-31 15:17:30.000000000 +0100 ++++ subcommander/submerge/Makefile.in 2009-01-31 15:19:21.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. +@@ -72,7 +72,7 @@ + moc/TextViewWidget_moc.$(OBJEXT) moc/TextWidget_moc.$(OBJEXT) \ + moc/settings/FontSettingsWidget_moc.$(OBJEXT) + submerge_OBJECTS = $(am_submerge_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/ac-helpers/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -138,10 +138,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -321,7 +320,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -346,9 +345,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +@@ -509,8 +508,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 + +@@ -522,8 +521,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) \ +@@ -533,13 +532,12 @@ + CTAGS: $(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 +Index: subcommander/svn/Makefile.in +=================================================================== +--- subcommander.orig/svn/Makefile.in 2009-01-31 15:17:30.000000000 +0100 ++++ subcommander/svn/Makefile.in 2009-01-31 15:19:21.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. +@@ -60,7 +60,7 @@ + VisualMerge.$(OBJEXT) WcEntry.$(OBJEXT) WcNotify.$(OBJEXT) \ + WcStatus.$(OBJEXT) + libsvn_a_OBJECTS = $(am_libsvn_a_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/ac-helpers/depcomp + am__depfiles_maybe = depfiles + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -118,10 +118,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -282,7 +281,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -307,9 +306,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLIBRARIES: +@@ -372,8 +371,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 + +@@ -385,8 +384,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) \ +@@ -396,13 +395,12 @@ + CTAGS: $(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 +Index: subcommander/util/Makefile.in +=================================================================== +--- subcommander.orig/util/Makefile.in 2009-01-31 15:17:30.000000000 +0100 ++++ subcommander/util/Makefile.in 2009-01-31 15:19:21.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. +@@ -114,10 +114,9 @@ + LTLIBOBJS = @LTLIBOBJS@ + MACOSX_UNIVERSAL_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@ + MACOSX_UNIVERSAL_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@ ++MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ +-NEON_INCLUDES = @NEON_INCLUDES@ +-NEON_LIBS = @NEON_LIBS@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -253,7 +252,7 @@ + + .SUFFIXES: + .SUFFIXES: .cpp .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +@@ -278,9 +277,9 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +-$(top_srcdir)/configure: $(am__configure_deps) ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLIBRARIES: +@@ -336,8 +335,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 + +@@ -349,8 +348,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) \ +@@ -360,13 +359,12 @@ + CTAGS: $(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 --- subcommander-2.0.0~b4.orig/debian/patches/90-FTBFS-gcc4.4.patch +++ subcommander-2.0.0~b4/debian/patches/90-FTBFS-gcc4.4.patch @@ -0,0 +1,13 @@ +Fix FTBFS with g++4.4 (closes: #506781) +Index: subcommander/util/iconvstream.h +=================================================================== +--- subcommander.orig/util/iconvstream.h 2009-01-31 00:04:27.000000000 +0100 ++++ subcommander/util/iconvstream.h 2009-01-31 00:04:50.000000000 +0100 +@@ -15,6 +15,7 @@ + #include "apr.h" + #include "Error.h" + #include "AprError.h" ++#include + #include "ErrorCodes.h" + + // sys