debian/0000755000000000000000000000000011771630055007173 5ustar debian/man/0000755000000000000000000000000011771627521007752 5ustar debian/man/subcommander.10000644000000000000000000000151311547432167012514 0ustar .TH SUBCOMMANDER "1" "April 7th, 2011" "subcommander 2.0.0b5" "User Commands" .\" $Id: subcommander.1 77 2011-04-07 22:02:31Z robert $ .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 one 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 (available in the subcommander-doc package), 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. debian/man/submerge.10000644000000000000000000000275011525457014011644 0ustar .TH SUBMERGE "1" "February 12th, 2011" "submerge 2.0.0b5" "User commands" .\" $Id: submerge.1 74 2011-02-12 10:16:44Z robert $ .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 (available in the subcommander-doc package), 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. debian/source/0000755000000000000000000000000011771627521010477 5ustar debian/source/format0000644000000000000000000000001411443205050011666 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000011771627521010626 5ustar debian/patches/97-FTBFS-gcc4.7.patch0000644000000000000000000000203011771611215013717 0ustar From: Robert Luberda Date: Sun, 24 Jun 2012 15:13:00 +0200 Subject: Fix compilation error with gcc-4.7 (closes: #678773). Index: subcommander/svn/WcEntry.cpp =================================================================== --- subcommander.orig/svn/WcEntry.cpp 2010-01-03 21:02:31.000000000 +0100 +++ subcommander/svn/WcEntry.cpp 2012-06-24 15:09:25.000000000 +0200 @@ -20,7 +20,7 @@ WcEntry::WcEntry() { } -WcEntry::WcEntry( svn_wc_entry_t* entry ) +WcEntry::WcEntry( const svn_wc_entry_t* entry ) { _name = sc::String(entry->name); _revision = entry->revision; Index: subcommander/svn/WcEntry.h =================================================================== --- subcommander.orig/svn/WcEntry.h 2012-06-24 15:09:01.000000000 +0200 +++ subcommander/svn/WcEntry.h 2012-06-24 15:09:11.000000000 +0200 @@ -38,7 +38,7 @@ protected: WcEntry(); public: - WcEntry( svn_wc_entry_t* ); + WcEntry( const svn_wc_entry_t* ); WcEntry( const WcEntry& src ); Revnumber getRevnumber() const; debian/patches/95-warnings.patch0000644000000000000000000001355611550316526013737 0ustar Fix g++ warnings. Index: subcommander/sublib/ErrorDialog.cpp =================================================================== --- subcommander.orig/sublib/ErrorDialog.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/sublib/ErrorDialog.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -218,7 +218,7 @@ ErrorDialog::~ErrorDialog() { } - +#if _WIN32 static const char* copyString( const QString& s ) { QByteArray qs = s.toLocal8Bit(); @@ -226,6 +226,7 @@ strncpy( result, (const char*)qs, qs.length() ); return result; } +#endif void ErrorDialog::send() { Index: subcommander/subcommander/DiffViewModel.cpp =================================================================== --- subcommander.orig/subcommander/DiffViewModel.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/subcommander/DiffViewModel.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -78,7 +78,7 @@ { public: DiffThread( ScModel* model, DiffViewModel::DiffCmds& cmds ) - : _model(model), _cmds(cmds), _run(true) + : _run(true), _model(model), _cmds(cmds) { } Index: subcommander/subcommander/MainWindow.cpp =================================================================== --- subcommander.orig/subcommander/MainWindow.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/subcommander/MainWindow.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -260,7 +260,7 @@ void MainWindow::settings( const QString& selected ) { SettingsDialog* sd = new SettingsDialog( _q("subcommander:settings"), this ); - SettingsInfo* si; + //SettingsInfo* si; #if 0 // projects root item Index: subcommander/subcommander/RpViewTreeProxyModel.cpp =================================================================== --- subcommander.orig/subcommander/RpViewTreeProxyModel.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/subcommander/RpViewTreeProxyModel.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -28,7 +28,7 @@ { QVariant value = sourceModel()->data( mapToSource(index), role ); - if( index.column() == 0 && role == Qt::DisplayRole || role == Qt::EditRole ) + if( (index.column() == 0 && role == Qt::DisplayRole) || role == Qt::EditRole ) { QString temp = value.toString(); Index: subcommander/subcommander/commands/IgnoreCmd.cpp =================================================================== --- subcommander.orig/subcommander/commands/IgnoreCmd.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/subcommander/commands/IgnoreCmd.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -30,7 +30,7 @@ void IgnoreCmd::run() { - sc::Error* err; + sc::Error* err (0); _prgscb->started( _param, getCancel() ); Index: subcommander/subcommander/commands/ScCmd.cpp =================================================================== --- subcommander.orig/subcommander/commands/ScCmd.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/subcommander/commands/ScCmd.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -28,13 +28,13 @@ _client = client; _prgscb = progress; - apr_time_t t1 = apr_time_now(); + //apr_time_t t1 = apr_time_now(); //_prgscb->started( getId(), /*_param*/, getCancel() ); run(); //_prgscb->finished( getId(), /*_param*/, time ); - apr_time_t t2 = apr_time_now(); + //apr_time_t t2 = apr_time_now(); //_prgscb->time( _id, ((double)(t2-t1)/1000.0) ); } Index: subcommander/sublib/CrashHandler.cpp =================================================================== --- subcommander.orig/sublib/CrashHandler.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/sublib/CrashHandler.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -21,7 +21,7 @@ #include #endif // _WIN32 - +#if _WIN32 // helper static const char* copyString( const sc::String& src ) { @@ -52,7 +52,7 @@ return sc::String(msg.toUtf8()); } - +#endif CrashHandler::CrashHandler() { Index: subcommander/sublib/MsgHandler.cpp =================================================================== --- subcommander.orig/sublib/MsgHandler.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/sublib/MsgHandler.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -30,6 +30,7 @@ msgWarning( getLongAppName(), msg, _q("&Ok") ); break; case QtFatalMsg: + case QtCriticalMsg: msgCritical( getLongAppName(), msg, _q("&Abort") ); abort(); } Index: subcommander/submerge/TextLineNrWidget.cpp =================================================================== --- subcommander.orig/submerge/TextLineNrWidget.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/submerge/TextLineNrWidget.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -71,7 +71,7 @@ sc::Size lines = _model->getLineCnt(); char buf[16] = ""; - _lnColumns = sprintf( buf, "%lu", lines ); + _lnColumns = sprintf( buf, "%lu", static_cast(lines) ); updateGeometry(); } Index: subcommander/svn/VisualMerge.cpp =================================================================== --- subcommander.orig/svn/VisualMerge.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/svn/VisualMerge.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -19,7 +19,7 @@ VisualMerge::VisualMerge( svn_client_ctx_t* context, const sc::String& mergeCmd, apr_pool_t* pool ) -: _context(context), _mergeCmd(mergeCmd), _pool(pool) +: _context(context), _pool(pool), _mergeCmd(mergeCmd) { } Index: subcommander/subcommander/RpViewTree.cpp =================================================================== --- subcommander.orig/subcommander/RpViewTree.cpp 2011-01-23 00:43:59.000000000 +0100 +++ subcommander/subcommander/RpViewTree.cpp 2011-01-23 00:44:34.000000000 +0100 @@ -113,7 +113,7 @@ RpViewTree::RpViewTree( const sc::String& root, RpViewState* state, ActionStorage* as, QWidget* parent ) -: super(parent), _state(state), _actions(as), _itemData(new RpViewEntryData()) +: super(parent), _itemData(new RpViewEntryData()), _state(state), _actions(as) { setTextElideMode(Qt::ElideMiddle); setAllColumnsShowFocus(true); debian/patches/92-gcc-warnings.patch0000644000000000000000000000631311443205665014461 0ustar Fix some g++ warnings Index: subcommander/subcommander/CommitItemLvi.cpp =================================================================== --- subcommander.orig/subcommander/CommitItemLvi.cpp 2010-09-12 19:02:17.000000000 +0200 +++ subcommander/subcommander/CommitItemLvi.cpp 2010-09-12 19:19:08.000000000 +0200 @@ -32,7 +32,7 @@ CommitItemLvi::CommitItemLvi( const svn::CommitItemPtr item, const QString& itemStr ) : super(), _item(item), _itemStr(itemStr) { - char* kinds[] = + const char* const kinds[] = { _n("none"), _n("file"), Index: subcommander/subcommander/DiffSummarizeLvi.cpp =================================================================== --- subcommander.orig/subcommander/DiffSummarizeLvi.cpp 2010-09-12 19:02:17.000000000 +0200 +++ subcommander/subcommander/DiffSummarizeLvi.cpp 2010-09-12 19:19:08.000000000 +0200 @@ -13,7 +13,7 @@ #include "svn/DiffSummarize.h" -static char* getSummarizeCode( svn::DiffSummarizeKind kind ) +static char* const getSummarizeCode( svn::DiffSummarizeKind kind ) { switch( kind ) { @@ -25,7 +25,7 @@ } } -static char* getNodCode( svn::NodeKind kind ) +static char* const getNodCode( svn::NodeKind kind ) { switch( kind ) { Index: subcommander/subcommander/RpViewWhatsThis.cpp =================================================================== --- subcommander.orig/subcommander/RpViewWhatsThis.cpp 2010-09-12 19:02:17.000000000 +0200 +++ subcommander/subcommander/RpViewWhatsThis.cpp 2010-09-12 19:19:08.000000000 +0200 @@ -51,7 +51,7 @@ ws += "" + _q("last committed date") + ""; ws += "" + _q("an items last committed date") + "
" + "" - ""; + "" "" ""; Index: subcommander/subcommander/WcSelection.cpp =================================================================== --- subcommander.orig/subcommander/WcSelection.cpp 2010-09-12 19:02:17.000000000 +0200 +++ subcommander/subcommander/WcSelection.cpp 2010-09-12 19:19:08.000000000 +0200 @@ -89,8 +89,8 @@ svn::WcStatusPtr status = *(_statuss.begin()); - return !status->isAddable() - && status->isChanged() + return (!status->isAddable() + && status->isChanged()) || status->isDir(); } Index: subcommander/subcommander/WcViewTreeProxyModel.cpp =================================================================== --- subcommander.orig/subcommander/WcViewTreeProxyModel.cpp 2010-09-12 19:02:17.000000000 +0200 +++ subcommander/subcommander/WcViewTreeProxyModel.cpp 2010-09-12 19:19:08.000000000 +0200 @@ -33,7 +33,7 @@ { QVariant value = sourceModel()->data( mapToSource(index), role ); - if( index.column() == 0 && role == Qt::DisplayRole || role == Qt::EditRole ) + if( (index.column() == 0 && role == Qt::DisplayRole) || role == Qt::EditRole ) { QString temp = value.toString(); Index: subcommander/util/ErrorCodes.cpp =================================================================== --- subcommander.orig/util/ErrorCodes.cpp 2010-09-12 19:02:17.000000000 +0200 +++ subcommander/util/ErrorCodes.cpp 2010-09-12 19:19:08.000000000 +0200 @@ -28,7 +28,7 @@ } } - return errors[ErrUnknown]._msg; + return errors[ErrUnknown - SC_ERR_START]._msg; } } // namespace debian/patches/70-disable-neon.patch0000644000000000000000000000315611443205035014424 0ustar Don't try to link with neon. Closes: #490351, #482512 Index: subcommander/subcommander/subcommander.cpp =================================================================== --- subcommander.orig/subcommander/subcommander.cpp 2010-01-03 19:15:45.000000000 +0100 +++ subcommander/subcommander/subcommander.cpp 2010-01-03 19:15:48.000000000 +0100 @@ -64,12 +64,6 @@ #endif // _WIN32 } -void exit_neon() -{ -#ifdef _WIN32 - ne_sock_exit(); -#endif // _WIN32 -} /** main for running the tests. */ @@ -167,7 +161,6 @@ //config.save(); exit_ssl(); - exit_neon(); TargetRepository::teardown(); stopStackProcess(); Index: subcommander/configure.ac =================================================================== --- subcommander.orig/configure.ac 2010-01-03 19:15:59.000000000 +0100 +++ subcommander/configure.ac 2010-01-03 19:16:41.000000000 +0100 @@ -192,7 +192,7 @@ AC_LANG(C++) AC_COMPILE_IFELSE( AC_LANG_PROGRAM( - [[#include ]], + [[#error include ]], [[ne_sock_exit()]] ), [ @@ -243,7 +243,7 @@ AC_LANG(C++) AC_COMPILE_IFELSE( AC_LANG_PROGRAM( - [[#include ]], + [[#error include ]], [[ #if ! SERF_VERSION_AT_LEAST(0,3,0) # error no serf! @@ -274,9 +274,9 @@ AC_SUBST(NET_LIBS) -if test x$found_neon = xno -a x$found_serf = xno; then - AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf]) -fi +#if test x$found_neon = xno -a x$found_serf = xno; then +# AC_MSG_ERROR([found neither neon nor serf, try setting --with-neon or --with-serf]) +#fi ## debian/patches/94-whatsthis.patch0000644000000000000000000000245311443205050014104 0ustar Minor fix for help texts shown after pressing Shift+F1 on working/repository view tree. Index: subcommander/subcommander/RpViewWhatsThis.cpp =================================================================== --- subcommander.orig/subcommander/RpViewWhatsThis.cpp 2010-09-12 11:23:37.000000000 +0200 +++ subcommander/subcommander/RpViewWhatsThis.cpp 2010-09-12 11:23:42.000000000 +0200 @@ -19,7 +19,7 @@ ws += "" + _q("repository copy view columns") + ""; ws += "
" - "" + "
" ""; ws += ""; ws += "" Index: subcommander/subcommander/WcViewWhatsThis.cpp =================================================================== --- subcommander.orig/subcommander/WcViewWhatsThis.cpp 2010-09-12 11:23:20.000000000 +0200 +++ subcommander/subcommander/WcViewWhatsThis.cpp 2010-09-12 11:23:30.000000000 +0200 @@ -162,7 +162,7 @@ "" ""; ws += "" - "" ""; + "" "" "" "
" + _q("name") + "" + _q("the name of an item - the header shows its name and the repository url") + "
not modified*modifiednot modified*modified
" ""; debian/patches/50-ftbfs-gcc-4.3.patch0000644000000000000000000000175711443205373014234 0ustar #! /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 2010-01-03 18:54:54.000000000 +0100 +++ subcommander/sublib/MsgHandler.cpp 2010-01-03 19:00:13.000000000 +0100 @@ -7,6 +7,8 @@ * ==================================================================== */ +#include + // sc #include "config.h" #include "MsgHandler.h" Index: subcommander/sublib/Utility.cpp =================================================================== --- subcommander.orig/sublib/Utility.cpp 2010-01-03 18:57:09.000000000 +0100 +++ subcommander/sublib/Utility.cpp 2010-01-03 19:00:13.000000000 +0100 @@ -27,6 +27,7 @@ #endif // _WIN32 // sys +#include #include debian/patches/10-maintainer-mode.patch0000644000000000000000000000117711443205035015130 0ustar 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 debian/patches/40-sample-project.patch0000644000000000000000000000227311443205035015005 0ustar #! /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 2010-01-03 18:57:08.000000000 +0100 +++ subcommander/subcommander/ListWidget.cpp 2010-01-03 19:00:01.000000000 +0100 @@ -134,7 +134,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)" "

" @@ -151,6 +151,8 @@ "set any 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." "

" "" ); debian/patches/20-create-doc.patch0000644000000000000000000000422611443205035014064 0ustar #! /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 @@ + + + + + + + debian/patches/91-gcc-warnings.patch0000644000000000000000000000123411742563317014460 0ustar From: Robert Luberda Date: Sun, 15 Apr 2012 14:07:08 +0200 Subject: Fix gcc warning Fix gcc 'undefined behaviour' warning. Index: subcommander/subcommander/BookmarkViewItemModel.cpp =================================================================== --- subcommander.orig/subcommander/BookmarkViewItemModel.cpp 2010-09-11 23:56:57.000000000 +0200 +++ subcommander/subcommander/BookmarkViewItemModel.cpp 2012-04-15 16:25:09.000000000 +0200 @@ -231,7 +231,8 @@ public: if( !advance ) return false; - _frame = ++_frame % ActiveDecorationFrames; + ++_frame; + _frame = _frame % ActiveDecorationFrames; return true; } debian/patches/30-app-icon.patch0000644000000000000000000000430511443205035013563 0ustar #! /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 ", +" ", +" ", +" ", +" "}; debian/patches/60-url-from-trunk-crash.patch0000644000000000000000000000120111443205035016052 0ustar Fix segmentation fault on getting url from trunk Index: subcommander/subcommander/ProjectWizard.cpp =================================================================== --- subcommander.orig/subcommander/ProjectWizard.cpp 2010-01-03 18:57:09.000000000 +0100 +++ subcommander/subcommander/ProjectWizard.cpp 2010-01-03 19:00:29.000000000 +0100 @@ -363,6 +363,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) ); debian/patches/72-dont-link-svn-private-libs.patch0000644000000000000000000000212111742547337017177 0ustar From: Peter Samuelson Date: Sat, 14 Apr 2012 17:23:34 -0500 Subject: Don't link svn-private libs. Don't link svn-private libs to make the package installable again (closes: #668825). --- a/configure.ac +++ b/configure.ac @@ -373,23 +373,11 @@ fi if test $SVN_MAJOR -ge 1; then SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1" - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1" - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1" + SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1" + SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1" SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1" SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1" - if test $SVN_MINOR -eq 4; then - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_dav-1" - elif test $SVN_MINOR -ge 5; then - if test x$found_neon = xyes; then - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_neon-1" - fi - if test x$found_serf = xyes; then - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra_serf-1" - fi - SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs_util-1" - fi - fi if test x$goodsvn == xok; then debian/patches/11-srcdir.patch0000644000000000000000000000120511550145607013345 0ustar From: Robert Luberda Date: Sat, 09 Apr 2011 20:28:05 +0200 Subject: Make it possible to call configure from outside of the source dir. Index: subcommander/sublib/Makefile.am =================================================================== --- subcommander.orig/sublib/Makefile.am 2011-04-09 13:24:35.000000000 +0200 +++ subcommander/sublib/Makefile.am 2011-04-09 13:25:20.000000000 +0200 @@ -121,7 +121,7 @@ moc/%_moc.cpp : %.h $(QT_MOC) $< -o $@ resources.cpp : resources.h - $(QT_RCC) -name sublib -o $@ ../pics/sublib.qrc + $(QT_RCC) -name sublib -o $@ $(top_srcdir)/pics/sublib.qrc clean-local: -rm -rf moc debian/patches/72-disable-sasl.patch0000644000000000000000000000124011443205035014421 0ustar Don't link with sasl library. Index: subcommander/subcommander/Makefile.am =================================================================== --- subcommander.orig/subcommander/Makefile.am 2010-01-03 23:57:08.000000000 +0100 +++ subcommander/subcommander/Makefile.am 2010-01-03 23:57:16.000000000 +0100 @@ -127,7 +127,7 @@ subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \ @QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \ - @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz + @APU_LIBS@ @APR_LIBS@ -lz subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a debian/patches/73-autoconf-warnings.patch0000644000000000000000000000600511742553051015535 0ustar From: Robert Luberda Date: Sun, 15 Apr 2012 16:07:08 +0200 Subject: Fix autoconf warnings. Fix `no AC_LANG_SOURCE call detected in body' given by autoconf. Index: subcommander/configure.ac =================================================================== --- subcommander.orig/configure.ac 2012-04-15 15:37:25.000000000 +0200 +++ subcommander/configure.ac 2012-04-15 16:06:25.000000000 +0200 @@ -142,14 +142,14 @@ CPPFLAGS="$BOOST_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[ #include ]], [[ boost::shared_ptr ptr; ]] - ), + )], [ AC_MSG_RESULT([yes]) ],[ @@ -191,10 +191,10 @@ CPPFLAGS="$NEON_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[#error include ]], [[ne_sock_exit()]] - ), + )], [ AC_MSG_RESULT([yes]) AC_MSG_RESULT([ headers $NEON_INCLUDES]) @@ -242,14 +242,14 @@ CPPFLAGS="$SERF_INCLUDES $APR_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[#error include ]], [[ #if ! SERF_VERSION_AT_LEAST(0,3,0) # error no serf! #endif // serf ]] - ), + )], [ AC_MSG_RESULT([yes]) AC_MSG_RESULT([ headers $SERF_INCLUDES]) @@ -436,7 +436,7 @@ CPPFLAGS="$SSL_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[ #include #include @@ -447,7 +447,7 @@ AC_COMPILE_IFELSE( ERR_free_strings(); unsigned long openssl = OPENSSL_VERSION_NUMBER; ]] - ), + )], [ AC_MSG_RESULT([yes]) ],[ @@ -493,14 +493,14 @@ CPPFLAGS="$BDB_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[ #include ]], [[ unsigned long num = DB_VERSION_MAJOR; ]] - ), + )], [ AC_MSG_RESULT([yes]) AC_DEFINE([SC_HAVE_BDB],[1],[berkeley db]) @@ -712,10 +712,10 @@ CPPFLAGS="$QT_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[#include ]], [[QWidget* w = new QWidget();]] - ), + )], [ AC_MSG_RESULT([yes]) AC_MSG_RESULT([ version $QT_VERSION]) @@ -809,7 +809,7 @@ CPPFLAGS="$STLPORT_INCLUDES" AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[ #include ]], @@ -818,7 +818,7 @@ AC_COMPILE_IFELSE( #error no stlport! #endif // _STLPORT_VERSION ]] - ), + )], [ AC_MSG_RESULT([yes]) has_stlport="yes" @@ -846,7 +846,7 @@ if test x$has_stlport = xno; then AC_MSG_CHECKING([wether we have a working stl]) AC_LANG(C++) AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [[ ]], [[ @@ -854,7 +854,7 @@ AC_COMPILE_IFELSE( # error needs stlport! #endif // __GNUC__ ]] - ), + )], [ AC_MSG_RESULT([yes]) ],[ debian/patches/series0000644000000000000000000000073311771611252012040 0ustar 10-maintainer-mode.patch 11-srcdir.patch 20-create-doc.patch 30-app-icon.patch 40-sample-project.patch 41-spelling.patch 50-ftbfs-gcc-4.3.patch 60-url-from-trunk-crash.patch 70-disable-neon.patch 71-dont-require-svn.patch 72-disable-sasl.patch 72-dont-link-svn-private-libs.patch 73-autoconf-warnings.patch 80-po-Makefile.patch 90-FTBFS-gcc4.4.patch 91-gcc-warnings.patch 92-gcc-warnings.patch 94-whatsthis.patch 95-warnings.patch 96-format-error.patch 97-FTBFS-gcc4.7.patch debian/patches/80-po-Makefile.patch0000644000000000000000000000120311443205035014205 0ustar 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 debian/patches/90-FTBFS-gcc4.4.patch0000644000000000000000000000065511443205035013713 0ustar 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 debian/patches/71-dont-require-svn.patch0000644000000000000000000000203111443205035015276 0ustar Don't require svn command at build time. Index: subcommander/configure.ac =================================================================== --- subcommander.orig/configure.ac 2010-01-04 00:27:21.000000000 +0100 +++ subcommander/configure.ac 2010-01-04 00:29:34.000000000 +0100 @@ -339,12 +339,12 @@ esac -SVN_BIN="$SVN_PATH/bin/svn" +# SVN_BIN="$SVN_PATH/bin/svn" # extract version numbers of svn -SVN_VERSION=`$SVN_BIN --version 2>&1 | head -1 | \ - sed "s/^svn, version \(.*[[.]].*[[.]].*\) .*/\1/"` +SVN_VERSION=`dpkg-query -W -f='${Version}\n' libsvn-dev | sed -e 's/dfsg.*$//' -e 's/-.*$//'` + SVN_MAJOR=`echo $SVN_VERSION | sed "s/\(.*\)[[.]].*[[.]].*/\1/"` SVN_MINOR=`echo $SVN_VERSION | sed "s/.*[[.]]\(.*\)[[.]].*/\1/"` SVN_PATCH=`echo $SVN_VERSION | sed "s/.*[[.]].*[[.]]\(.*\)/\1/"` @@ -352,7 +352,11 @@ # avoid incompatible version of subversion +if test "$SVN_MAJOR" && test "$SVN_MINOR" && test "$SVN_PATCH" ; then goodsvn="ok" +else +goodsvn="bad" +fi if test $SVN_MAJOR -eq 0; then goodsvn="bad"; debian/patches/96-format-error.patch0000644000000000000000000000135011771611227014515 0ustar From: Robert Luberda Date: Wed, 06 Apr 2011 22:23:59 +0200 Subject: Fix compilation error given when hardening options are on Index: subcommander/subcommander/subcommander.cpp =================================================================== --- subcommander.orig/subcommander/subcommander.cpp 2011-04-09 13:21:42.000000000 +0200 +++ subcommander/subcommander/subcommander.cpp 2011-04-09 13:21:43.000000000 +0200 @@ -117,7 +117,7 @@ int mainsc( int argc, char* argv[] ) // no way to bring up a dialog if something went wrong in the basic // initialization. - fprintf( stderr, e.getError()->getMessage() ); + fprintf( stderr, "%s", e.getError()->getMessage().getStr() ); return EXIT_FAILURE; } debian/patches/41-spelling.patch0000644000000000000000000000223611443205035013675 0ustar Fix spelling errors found by lintian. Index: subcommander/subcommander/settings/ToolsSettingsWidget.cpp =================================================================== --- subcommander.orig/subcommander/settings/ToolsSettingsWidget.cpp 2010-01-03 21:49:01.000000000 +0100 +++ subcommander/subcommander/settings/ToolsSettingsWidget.cpp 2010-01-03 21:49:13.000000000 +0100 @@ -39,7 +39,7 @@ vl->addStretch(1); { // diff command - QLabel* diffLabel = new QLabel(_q("(visual) diff comand:"), this); + QLabel* diffLabel = new QLabel(_q("(visual) diff command:"), this); QPushButton* diffBi = new QPushButton( _q("reset/builtin"), this ); _diffEdit = new QLineEdit( this ); QPushButton* diffEx = new ExternButton( this ); @@ -59,7 +59,7 @@ row++; // merge command - QLabel* mergeLabel = new QLabel(_q("(visual) merge comand:"), this); + QLabel* mergeLabel = new QLabel(_q("(visual) merge command:"), this); QPushButton* mergeBi = new QPushButton( _q("reset/builtin"), this ); _mergeEdit = new QLineEdit( this ); QPushButton* mergeEx = new ExternButton( this ); debian/subcommander.menu0000644000000000000000000000042711443205036012534 0ustar ?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" debian/subcommander-doc.install0000644000000000000000000000004011742564502014000 0ustar usr/share/doc/subcommander/html debian/subcommander-doc.doc-base0000644000000000000000000000051711443205036014010 0ustar 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 debian/subcommander-doc.links0000644000000000000000000000010411525442106013445 0ustar usr/share/doc/subcommander/html usr/share/doc/subcommander-doc/html debian/copyright0000644000000000000000000002104611742564502011132 0ustar 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 debian/subcommander.docs0000644000000000000000000000000711443205036012512 0ustar README debian/compat0000644000000000000000000000000211742555145010375 0ustar 9 debian/control0000644000000000000000000000314011771623451010576 0ustar Source: subcommander Section: vcs Priority: optional Maintainer: Debian QA Group Build-Depends: automake, autotools-dev, debhelper (>> 9), dh-autoreconf, libapr1-dev, libboost-dev | libboost1.49-dev, libqt4-dev (>= 4.4), libssl-dev, libsvn-dev, libx11-dev Build-Depends-Indep: docbook-xsl, xsltproc Build-Conflicts: libneon27-gnutls (<< 0.29.6-3~) Standards-Version: 3.9.3 Homepage: http://subcommander.tigris.org/ Package: subcommander Architecture: any Depends: ${misc:Depends}, ${shlibs: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 one 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. Package: subcommander-doc Section: doc Architecture: all Depends: ${misc:Depends} 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 one 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. debian/subcommander.install0000644000000000000000000000020511742564502013240 0ustar ../subcommander.desktop usr/share/applications usr/bin usr/share/locale usr/share/pixmaps usr/share/subcommander/icons/default/*.png debian/subcommander.manpages0000644000000000000000000000006011525441572013364 0ustar debian/man/subcommander.1 debian/man/submerge.1 debian/subcommander.desktop0000644000000000000000000000032411443205036013235 0ustar [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; debian/watch0000644000000000000000000000023311443205036010213 0ustar # control file for the uscan(1) tool version=3 opts=dversionmangle=s/~// \ http://subcommander.tigris.org/ \ files/.*/Subcommander-(\d[\d.abp]+)\.tar\.gz debian/rules0000755000000000000000000000453411742555247010270 0ustar #!/usr/bin/make -f export BDIR := BUILD export LDFLAGS := -Wl,-z,defs -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS) export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -Wall -Wno-deprecated -I$(CURDIR) export QTDIR := /usr DH_AUTO_OPTIONS := -v -Sautoconf --parallel -B$(BDIR) DESTDIR := $(CURDIR)/debian/tmp build: export MISSING_BUILD_DEPS := $(shell dpkg-checkbuilddeps 2>&1) %: force dh "$@" ifneq ($(shell dh_listpackages),$(shell dh_listpackages -i)) # arch:any packages are built override_dh_auto_build: $(BDIR)/build-arch-stamp override_dh_auto_install: install-arch-into-pkgdir endif ifneq ($(shell dh_listpackages),$(shell dh_listpackages -a)) # arch:all packages are built ifneq (,$(MISSING_BUILD_DEPS)) $(warning $(MISSING_BUILD_DEPS)) $(warning Postponing build of architecture independent files until binary or binary-indep target is called) else override_dh_auto_build: $(BDIR)/build-indep-stamp endif override_dh_auto_install: install-indep-into-pkgdir endif override_dh_auto_configure: $(BDIR)/configure-stamp override_dh_auto_clean: rm -f $(BDIR)/build-arch-stamp $(BDIR)/build-indep-stamp $(BDIR)/configure-stamp $(MAKE) -C doc/docbook/guide clean dh_autoreconf_clean dh_auto_clean $(DH_AUTO_OPTIONS) $(BDIR)/configure-stamp: dh_autoreconf dh_auto_configure $(DH_AUTO_OPTIONS) -- \ --enable-nls touch "$@" $(BDIR)/build-arch-stamp: $(BDIR)/configure-stamp dh_auto_build $(DH_AUTO_OPTIONS) dh_auto_build $(DH_AUTO_OPTIONS) -- -C po touch "$@" $(BDIR)/build-indep-stamp: $(BDIR)/configure-stamp $(MAKE) -C doc/docbook/guide touch "$@" install-arch-into-pkgdir: $(BDIR)/build-arch-stamp dh_auto_install $(DH_AUTO_OPTIONS) dh_auto_install $(DH_AUTO_OPTIONS) -- -C po mkdir -p $(DESTDIR)/usr/share/pixmaps install --mode=644 pics/subcommander.xpm $(DESTDIR)/usr/share/pixmaps install-indep-into-pkgdir: $(BDIR)/build-indep-stamp $(MAKE) -C doc/docbook/guide install DESTDIR=$(DESTDIR)/usr/share/doc/subcommander/html force debian/rules: .PHONY: force debian/rules \ override_dh_auto_build override_dh_auto_clean \ override_dh_auto_configure override_dh_auto_install \ install-arch-into-pkgdir install-indep-into-pkgdir .DEFAULT_GOAL := binary debian/changelog0000644000000000000000000002620411771623527011057 0ustar subcommander (2.0.0~b5p2-5) unstable; urgency=low * Orphaning package, maintainer set to Debian QA Group. * Add 97-FTBFS-gcc4.7.patch to fix build failure with g++ 4.7 (closes: #678773). -- Robert Luberda Sun, 24 Jun 2012 16:42:29 +0200 subcommander (2.0.0~b5p2-4) unstable; urgency=low * New patches: + 72-dont-link-svn-private-libs.patch from Peter Samuelson to make subcommander installable again after recent binNMU (closes: #668825). + 73-autoconf-warnings.patch: fix autoconf warnings; + 91-gcc-warnings.patch: fix g++ undefined behaviour warning. * Switch to debhelper v9. * debian/control: + Standards-Version: 3.9.3 (no changes); + drop unneeded build dependency on libdb-dev; + update build dep. on debhelper; + use libboost1.49-dev as an alternative to libboost-dev; + add build-conflicts with libneon27-gnutls (<< 0.29.6-3~), see #667884. -- Robert Luberda Sun, 15 Apr 2012 17:31:48 +0200 subcommander (2.0.0~b5p2-3) unstable; urgency=low * 96-format-error.patch: new patch to fix compilation error when hardening options are turned on. * 11-srcdir.patch: new patch to make it possible to call configure from outside of the source dir. * debian/rules: simplify the file and use dh-autoreconf instead of cow-based build tree. * debian/control: + Standards-Version: 3.9.2 (no changes); + remove build-dependency on fl-cow, add dh-autoreconf instead; + replace libbost1.42-dev with libboost1.46-dev in build-dependencies; + move docbook-xsl and xsltproc to Build-Depends-Indep; + fix spelling typo in descriptions (lintian); + reformat the dependency fields with wrap-and-sort command; * debian/man/subcommander.1: fix spelling typo (lintian). -- Robert Luberda Sun, 10 Apr 2011 14:02:51 +0200 subcommander (2.0.0~b5p2-2) unstable; urgency=low * Upload to unstable. * debian/rules: + add support for build-arch, build-indep targets; + build documentation in build-indep only; + make use of dpkg-buildflags, dh_auto_configure, dh_auto_build commands. * Move man pages from debian to debian/man. * The menu entry has been available for at least 2 years (LP: #217652). * The `symbol lookup error' wasn't subcommander bug (LP: #389915). * Mention in the man pages that `The Subcommander Guide' is available in subcommander-doc (LP: #398509). Also add a link from subcommander-doc to the html docs in subcommander. -- Robert Luberda Sat, 12 Feb 2011 15:52:41 +0100 subcommander (2.0.0~b5p2-1) experimental; urgency=low * New upstream release: * Remove no longer needed patches 91-FTBFS-svn-props and 93-edit-crash. * Add 95_warnings.patch to fix some warnings. * Remove unused $(QUILT_STAMPFN) from debian/rules. * Bump debhelper compat level to 8. -- Robert Luberda Sun, 23 Jan 2011 00:44:47 +0100 subcommander (2.0.0~b5p1-3) unstable; urgency=low * New patches: + 93-edit-crash.patch from upstream to fix segmentation fault on the edit bookmark action (LP: #513660). + 94-whatsthis.patch: a minor fix for "what's this" help text. * Switch to the 3.0 (quilt) source format. Drop build dependency on quilt and the debian/README.source file. * Update libboost-dev version in build dependencies. * Standards-Version: 3.9.1 (no changes). -- Robert Luberda Sun, 12 Sep 2010 11:51:20 +0200 subcommander (2.0.0~b5p1-2) unstable; urgency=low * Build depend on fl-cow >= 0.6-4~ (closes: #570190). * Standards-Version: 3.8.4 (no changes) -- Robert Luberda Thu, 11 Mar 2010 17:33:03 +0100 subcommander (2.0.0~b5p1-1) unstable; urgency=low * New upstream release. * New patches: + 41-spelling.patch: fix spelling issues found by lintian; + 71-dont-require-svn.patch: don't require svn command for package builds; + 72-disable-sasl.patch: don't link with sasl library; + 92-gcc-warnings.patch: fix some g++ warnings. * Remove 999-autostuff.patch, call autootools during build process instead, rework build process, use fl-cow for copy-on-write semantics. * debian/control: + remove XB-Tag fields; + add $misc:Depends for subcommander-doc; + adjust build dependencies. * Fix debian/watch file. -- Robert Luberda Sat, 09 Jan 2010 13:25:54 +0100 subcommander (2.0.0~b4-5) unstable; urgency=low * 91-FTBFS-svn-props.patch: Fix FTBFS due to missing includes (closes: #542997). * Standards-Version: 3.8.3 (no changes) * Add a debian/README.source file. * Change package section to vcs to fix override disparity. -- Robert Luberda Sun, 30 Aug 2009 10:43:24 +0200 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