--- svn-workbench-1.6.0.orig/debian/changelog +++ svn-workbench-1.6.0/debian/changelog @@ -0,0 +1,95 @@ +svn-workbench (1.6.0-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sat, 29 Aug 2009 12:06:50 +0200 + +svn-workbench (1.5.7-0ubuntu1) jaunty; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 23 Feb 2009 20:45:11 +0100 + +svn-workbench (1.5.5-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Tue, 07 Oct 2008 05:58:30 +0200 + +svn-workbench (1.5.4-2) unstable; urgency=low + + * Fix wx import. Closes: #492605. + + -- Matthias Klose Wed, 30 Jul 2008 23:33:06 +0200 + +svn-workbench (1.5.4-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sun, 20 Jul 2008 18:47:31 +0200 + +svn-workbench (1.5.3-3) unstable; urgency=low + + * Remove code left from Debian diff for 1.5.2. Closes: #489275. + + -- Matthias Klose Sat, 12 Jul 2008 09:37:24 +0200 + +svn-workbench (1.5.3-2) unstable; urgency=low + + * Fix lintian warnings. + + -- Matthias Klose Wed, 25 Jun 2008 01:07:53 +0200 + +svn-workbench (1.5.3-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Mon, 18 Feb 2008 06:13:57 +0100 + +svn-workbench (1.5.2-1) unstable; urgency=low + + * New upstream version. + * Add .desktop file (LP: 115129). Closes: #420575. + + -- Matthias Klose Mon, 28 Jan 2008 22:21:48 +0100 + +svn-workbench (1.5.0-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sat, 28 Oct 2006 23:55:30 +0200 + +svn-workbench (1.4.0-1) unstable; urgency=low + + * New upstream version. + + -- Matthias Klose Sat, 1 Jul 2006 09:15:47 +0000 + +svn-workbench (1.2.0-1) unstable; urgency=low + + * New upstream version. + * Fix download location (closes: #327369). + + -- Matthias Klose Sat, 15 Oct 2005 13:07:48 +0000 + +svn-workbench (1.1.6-1) unstable; urgency=low + + * New upstream version (1.6, taken from svn). + * Depend on python-wxgtk2.6 (closes: #307040). + + -- Matthias Klose Wed, 7 Sep 2005 21:59:26 +0200 + +svn-workbench (1.1.5-1) unstable; urgency=low + + * New upstream version. + * Add build dependency on python (closes: #299455). + * Explain "workbench" in the package description (closes: #299175). + + -- Matthias Klose Sat, 26 Mar 2005 17:37:21 +0100 + +svn-workbench (1.0.0-1) unstable; urgency=low + + * Initial Release. + + -- Matthias Klose Fri, 3 Dec 2004 22:47:12 +0100 + --- svn-workbench-1.6.0.orig/debian/rules +++ svn-workbench-1.6.0/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + touch pychecker.mak meinc_installer.mak + $(MAKE) -C Source -f linux.mak wb_version.py \ + PYTHON=python \ + PYCHECKER_DIR=$(CURDIR) \ + MEINC_INSTALLER_DIR=$(CURDIR) + rm -f pychecker.mak meinc_installer.mak + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + rm -f Source/wb_version.py + rm -f pychecker.mak meinc_installer.mak + find -name '*.py[co]' | xargs -r rm -f + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs \ + usr/bin \ + usr/share/svn-workbench \ + usr/share/applications + cp -a Source/*.py Source/*.tiff Source/*.ico Source/toolbar_images \ + debian/svn-workbench/usr/share/svn-workbench/ + rm -f debian/svn-workbench/usr/share/svn-workbench/*.cmd + cp -p debian/svn-workbench.sh debian/svn-workbench/usr/bin/svn-workbench + cp -p debian/desktop debian/svn-workbench/usr/share/applications/svn-workbench.desktop + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs Docs/* + dh_installmenu + dh_compress -X.png + dh_fixperms + dh_pycentral + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- svn-workbench-1.6.0.orig/debian/menu +++ svn-workbench-1.6.0/debian/menu @@ -0,0 +1,5 @@ +?package(svn-workbench):needs="X11"\ + section="Applications/Programming"\ + title="SVN Workbench"\ + icon="/usr/share/svn-workbench/wb.tiff"\ + command="/usr/bin/svn-workbench" --- svn-workbench-1.6.0.orig/debian/svn-workbench.sh +++ svn-workbench-1.6.0/debian/svn-workbench.sh @@ -0,0 +1,2 @@ +#! /bin/sh +exec /usr/bin/python /usr/share/svn-workbench/wb_main.py "$@" --- svn-workbench-1.6.0.orig/debian/copyright +++ svn-workbench-1.6.0/debian/copyright @@ -0,0 +1,58 @@ +This package was debianized by Matthias Klose on +Fri, 3 Dec 2004 22:47:12 +0100. + +It was downloaded from http://pysvn.tigris.org/ + +Copyright: + +Upstream Author: Barry A. Scott + +License: + +================================================================= +Copyright (C) 2003-2004 Barry A. Scott. All rights reserved. + +================================================================= +The Apache Software License, Version 1.1 + +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 + Barry A. Scott http://www.barrys-emacs.org." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + +4. The names "PySVN" must not be used to endorse or promote + products derived from this software without prior written + permission. For written permission, please contact + barry@barrys-emacs.org. + +5. Products derived from this software may not be called "PySVN", + nor may "PySVN" appear in their name, without prior written + permission of Barry Scott. + +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 THE APACHE SOFTWARE FOUNDATION 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. +================================================================= --- svn-workbench-1.6.0.orig/debian/compat +++ svn-workbench-1.6.0/debian/compat @@ -0,0 +1 @@ +5 --- svn-workbench-1.6.0.orig/debian/watch +++ svn-workbench-1.6.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://pysvn.tigris.org/project_downloads.html .*/WorkBench-(.*)\.tar\.gz --- svn-workbench-1.6.0.orig/debian/desktop +++ svn-workbench-1.6.0/debian/desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=SVN Workbench +Comment=A Workbench for Subversion +Exec=/usr/bin/svn-workbench +Icon=/usr/share/svn-workbench/wb.tiff +Type=Application +Terminal=false +Categories=Development; --- svn-workbench-1.6.0.orig/debian/control +++ svn-workbench-1.6.0/debian/control @@ -0,0 +1,15 @@ +Source: svn-workbench +Section: devel +Priority: optional +Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.3.5-11), python-central (>= 0.5) +XS-Python-Version: current +Standards-Version: 3.8.3 + +Package: svn-workbench +Architecture: all +Depends: ${python:Depends}, python-svn (>= 1.6.3), python-wxgtk2.8 | python-wxgtk2.6 +XB-Python-Version: ${python:Versions} +Description: A Workbench for Subversion + pysvn-workbench is a workbench (graphical client) for the Subversion + revision control system, written in the Python language. --- svn-workbench-1.6.0.orig/Source/wb_main.py +++ svn-workbench-1.6.0/Source/wb_main.py @@ -30,7 +30,7 @@ # make sure that we get 2.8 and not an earlier version try: import wxversion - wxversion.select( ['2.8'] ) + wxversion.select( ['2.8', '2.6'] ) except: pass --- svn-workbench-1.6.0.orig/Builder/brand_version.py +++ svn-workbench-1.6.0/Builder/brand_version.py @@ -20,20 +20,20 @@ key, value = [s.strip() for s in line.split('=',1)] branding_info[ key ] = value - wc_svnversion = os.environ.get( 'WC_SVNVERSION', 'svnversion' ) - exported_from = os.environ.get( 'PYSVN_EXPORTED_FROM', '..' ) - build_revision = os.popen( '%s -c "%s" 2>&1' % (wc_svnversion, exported_from), 'r' ).read().strip() + #wc_svnversion = os.environ.get( 'WC_SVNVERSION', 'svnversion' ) + #exported_from = os.environ.get( 'PYSVN_EXPORTED_FROM', '..' ) + #build_revision = os.popen( '%s -c "%s" 2>&1' % (wc_svnversion, exported_from), 'r' ).read().strip() # build_revision is either a range nnn:mmm or mmm # we only want the mmm - build_revision = build_revision.split(':')[-1] - print 'Info: revision %s' % build_revision + #build_revision = build_revision.split(':')[-1] + #print 'Info: revision %s' % build_revision - revision, modifiers = re.compile( '(\d+)(.*)' ).search( build_revision ).groups() + #revision, modifiers = re.compile( '(\d+)(.*)' ).search( build_revision ).groups() - if modifiers: - branding_info['BUILD'] = '0' - else: - branding_info['BUILD'] = revision + #if modifiers: + # branding_info['BUILD'] = '0' + #else: + # branding_info['BUILD'] = revision # read all the input text