diff options
Diffstat (limited to 'ubuntu/precise/applications/kdiff3')
21 files changed, 0 insertions, 1089 deletions
diff --git a/ubuntu/precise/applications/kdiff3/debian/cdbs/buildvars.mk b/ubuntu/precise/applications/kdiff3/debian/cdbs/buildvars.mk deleted file mode 100644 index 23d4709dc..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/cdbs/buildvars.mk +++ /dev/null @@ -1,86 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters <walters@debian.org> -# Description: Defines some useful variables, but no rules -# -# This program 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, or (at -# your option) any later version. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_rules_buildvars -_cdbs_rules_buildvars = 1 - -CDBS_VERSION = something - -# Common useful variables -DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) -DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) -DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') -DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') - -# Split into arch/indep packages -ifneq ($(DEB_INDEP_PACKAGES),cdbs) -DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) -DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) -endif -# Split into normal and udeb packages -ifeq ($(DEB_UDEB_PACKAGES),) -DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -else -DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) -endif -# Too much bother for now. If someone complains we'll fix it. -#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) -#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) -# A handy list of every package, udeb or not -DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) -DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) -DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) - -DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) - -# Some support for srcdir != builddir builds. -# These are relative to the root of the package -DEB_SRCDIR ?= . -DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) - -# Miscellaneous bits -DEB_ARCH = $(shell dpkg --print-architecture) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) -DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) -DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) -DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) - -ifeq ($(words $(DEB_ALL_PACKAGES)),1) - DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ -else - DEB_DESTDIR = $(CURDIR)/debian/tmp/ -endif - -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) - -endif diff --git a/ubuntu/precise/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/kdiff3/debian/cdbs/debian-qt-kde.mk deleted file mode 100644 index f72df2152..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/cdbs/debian-qt-kde.mk +++ /dev/null @@ -1,111 +0,0 @@ -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_debian-qt-kde -_cdbs_class_debian-qt-kde := 1 - -# Note: This _must_ be included before autotools.mk, or it won't work. -common-configure-arch common-configure-indep:: debian/stamp-cvs-make -debian/stamp-cvs-make: - cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; - touch debian/stamp-cvs-make - -include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -#include debian/cdbs/uploaders.mk - -ifndef _cdbs_rules_patchsys_quilt -DEB_PATCHDIRS := debian/patches/common debian/patches -endif - -DEB_KDE_ENABLE_FINAL := yes -DEB_INSTALL_DOCS_ALL := - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) - else - cdbs_kde_enable_final = - endif -endif - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -common-binary-indep:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_INDEP_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -common-binary-arch:: - ( set -e; \ - tmpf=`mktemp debian/versions.XXXXXX`; \ - perl debian/cdbs/versions.pl >$$tmpf; \ - for p in $(DEB_ARCH_PACKAGES); do \ - cat $$tmpf >>debian/$$p.substvars; \ - done; \ - rm -f $$tmpf ) - -clean:: - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -rf debian/shlibs-check - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ - done - -clean:: - if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ - cd $(DEB_SRCDIR); \ - find . -name Makefile.in -print | \ - xargs --no-run-if-empty rm -f; \ - rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ - configure configure.files configure.in stamp-h.in \ - subdirs; \ - fi - rm -f debian/stamp-cvs-make - -endif diff --git a/ubuntu/precise/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/precise/applications/kdiff3/debian/cdbs/kde.mk deleted file mode 100644 index 765560c89..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/cdbs/kde.mk +++ /dev/null @@ -1,97 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> -# Description: A class for KDE packages; sets KDE environment variables, etc -# -# This program 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, or (at -# your option) any later version. -# -# This program 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 this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_kde -_cdbs_class_kde := 1 - -# for dh_icons -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -else -DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) -endif - -include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) - -export kde_cgidir = \$${libdir}/cgi-bin -export kde_confdir = \$${sysconfdir}/trinity -export kde_htmldir = \$${datadir}/doc/tde/HTML - -ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) -endif - -ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_final = - cdbs_kde_enable_debug = --enable-debug=yes -else - cdbs_kde_enable_debug = --disable-debug -endif - -ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) - cdbs_kde_enable_debug = --enable-debug=full -endif - -cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi - -cleanbuilddir:: - -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) - -common-build-arch common-build-indep:: debian/stamp-kde-apidox -debian/stamp-kde-apidox: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) - touch $@ - -common-install-prehook-impl:: - mkdir -p po - -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages - -for file in po/*pot; do \ - sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ - done - -common-install-arch common-install-indep:: common-install-kde-apidox -common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) - -clean:: - rm -f debian/stamp-kde-apidox - rm -rf po/*.pot - -# This is a convenience target for calling manually. It's not part of -# the build process. -buildprep: clean apply-patches - $(MAKE) -f admin/Makefile.common dist - debian/rules clean - -endif diff --git a/ubuntu/precise/applications/kdiff3/debian/cdbs/team-members b/ubuntu/precise/applications/kdiff3/debian/cdbs/team-members deleted file mode 100644 index 05761af6e..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/cdbs/team-members +++ /dev/null @@ -1,16 +0,0 @@ -Sune Vuorela <debian@pusling.com> -Ana Beatriz Guerrero Lopez <ana@debian.org> -Fathi Boudra <fboudra@free.fr> -Modestas Vainius <geromanas@mailas.com> -Josh Metzler <joshdeb@metzlers.org> -Isaac Clerencia <isaac@debian.org> -Adeodato Simó <dato@net.com.org.es> -Adeodato Simo <dato@net.com.org.es> -Christopher Martin <chrsmrtn@debian.org> -Daniel Schepler <schepler@debian.org> -Sarah Hobbs <hobbsee@ubuntu.com> -Nacho Barrientos Arias <nacho@debian.org> -Ricardo Javier Cardenes Medina <rcardenes@debian.org> -Ricardo Cardenes <rcardenes@debian.org> -Armin Berres <trigger+debian@space-based.de> -Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/ubuntu/precise/applications/kdiff3/debian/cdbs/uploaders.mk b/ubuntu/precise/applications/kdiff3/debian/cdbs/uploaders.mk deleted file mode 100644 index 31adfe31e..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/cdbs/uploaders.mk +++ /dev/null @@ -1,29 +0,0 @@ - -MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> -UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') - - -debian/control.tmp: - @if [ ! -e debian/control.in ] ; then \ - echo "this package is not yet prepared for using automatic update of uploaders"; \ - echo "Please do so."; \ - exit 1; \ - fi - @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp - -check-uploaders: debian/control.tmp - @if ! diff -q debian/control debian/control.tmp ; then \ - echo "WARNING:: Control file differs from manually generated one" ; \ - echo "WARNING:: Please update it manually and check it afterwards" ; \ - echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ - echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ - fi - - -clean:: - rm -f debian/control.tmp - -update-uploaders: debian/control.tmp - @mv -f debian/control.tmp debian/control - -makebuilddir:: check-uploaders diff --git a/ubuntu/precise/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/precise/applications/kdiff3/debian/cdbs/versions.pl deleted file mode 100644 index 75c9add4b..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/cdbs/versions.pl +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; - -my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; -my ($version3, $version3_next); -my ($version2, $version2_next); - -($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; -($version2 = $version3) =~ s/\.[^.]+$//; - -($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; -($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; - -print "KDE-Version3=$version3\n"; -print "KDE-Version2=$version2\n"; -print "KDE-Next-Version3=$version3_next\n"; -print "KDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/precise/applications/kdiff3/debian/changelog b/ubuntu/precise/applications/kdiff3/debian/changelog deleted file mode 100644 index 0fa5bd08b..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/changelog +++ /dev/null @@ -1,224 +0,0 @@ -kdiff3-trinity (0.9.92-3ubuntu0) karmic; urgency=low - - * Karmic rebuild - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 July 2009 16:08:00 -0600 - -kdiff3-trinity (0.9.92-2ubuntu3) intrepid; urgency=low - - * Moved Trinity to /opt/trinity - * Integrated properly with KDE4.2+ - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 05 March 2009 29:52:00 -0600 - -kdiff3-trinity (0.9.92-2ubuntu1) intrepid; urgency=low - - * Added -trinity prefix - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 01 Dec 2008 10:44:00 -0600 - -kdiff3 (0.9.92-2ubuntu1) hardy; urgency=low - - * Merge from Debian unstable, remaining Ubuntu changes: - - debian/rules: added dh_iconcache - - debian/control: added libacl1-dev and libattr1-dev to build-dep - - Ubuntu MOTU Maintainer - * debian/rules: changed dh_iconcache to dh_icons - - -- Richard A. Johnson <nixternal@kubuntu.org> Fri, 30 Nov 2007 19:30:52 -0600 - -kdiff3 (0.9.92-2) unstable; urgency=low - - * Include konqueror plugin in package (closes Ubuntu bug no. 145026) - * Split package into kdiff3 and kdiff3-doc - - -- Eike Sauer <eike@debian.org> Tue, 11 Nov 2007 20:00:00 +0100 - -kdiff3 (0.9.92-1ubuntu1) gutsy; urgency=low - - * Merged new debian version, remaining Ubuntu changes: - - debian/rules: added dh_iconcache - - debian/control: added libacl1-dev and libattr1-dev to build-deb - * Added Ubuntu MOTU Maintaner, moved old one to XSBC-Original-Maintainer - - -- Stephan Hermann <sh@sourcecode.de> Sat, 5 May 2007 20:34:11 +0200 - -kdiff3 (0.9.92-1) unstable; urgency=low - - * New upstream release - - now distinguishes between empty and non-existent files in "full analysis" - mode (closes: #417086) - - fixed includes for gcc 4.3, thanks to Martin Michlmayr (closes: #417312) - Thanks to upstream for the Debian bug handling! :o) - - -- Eike Sauer <eike@debian.org> Tue, 17 Apr 2007 16:18:32 +0200 - -kdiff3 (0.9.91-1) unstable; urgency=low - - * New upstream release - * The I'm-a-DD-release...! - - -- Eike Sauer <eike@debian.org> Sun, 18 Mar 2007 23:33:56 +0100 - -kdiff3 (0.9.90-5ubuntu1) feisty; urgency=low - - * Merge from debian unstable, remaining changes: - - debian/rules: dh_iconcache - - -- Stephan Hermann <sh@sourcecode.de> Thu, 21 Dec 2006 11:29:18 +0100 - -kdiff3 (0.9.90-5) unstable; urgency=low - - * Changed, moved and registered .desktop file (closes: #396790) - - -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 30 Nov 2006 20:15:00 +0200 - -kdiff3 (0.9.90-4) unstable; urgency=low - - * Added AM_MAINTAINER_MODE - - -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 12 Oct 2006 14:00:00 +0200 - -kdiff3 (0.9.90-3) unstable; urgency=low - - * More autotooling stuff... - - -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 02 Oct 2006 16:30:00 +0200 - -kdiff3 (0.9.90-2) unstable; urgency=low - - * Really reduced dependencies (as promised in 0.9.89-1) this time... - * manpage updated - - -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 27 Sep 2006 17:40:00 +0200 - -kdiff3 (0.9.90-1ubuntu1) edgy; urgency=low - - * Merge from debian unstable. - * debian/control: removed libacl1-dev and libattr1-dev from build-deps - * debian/rules: put dh_iconcache in the correct section - - -- Stephan Hermann <sh@sourcecode.de> Sun, 2 Jul 2006 16:52:17 +0200 - -kdiff3 (0.9.90-1) unstable; urgency=low - - * New upstream release - * Standards version now 3.7.2 - - -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 30 May 2006 10:16:35 +0200 - -kdiff3 (0.9.89-1) unstable; urgency=low - - * New upstream release - * Reduced dependencies from 27 to 5 packages... - (see http://lists.debian.org/debian-devel-announce/2005/11/msg00016.html) - - -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 12 Apr 2006 00:28:33 +0200 - -kdiff3 (0.9.88-5ubuntu2) dapper; urgency=low - - * Add dh_iconcache - - -- Sarah Hobbs <hobbsee@ubuntu.com> Fri, 28 Apr 2006 22:24:09 +1000 - -kdiff3 (0.9.88-5ubuntu1) dapper; urgency=low - - * debian/control: added libacl1-dev and libattr1-dev to build-deps - - -- Stephan Hermann <sh@sourcecode.de> Sat, 26 Nov 2005 01:00:50 +0100 - -kdiff3 (0.9.88-5) unstable; urgency=low - - * corrections to German po file, thanks to Jens Seidel (closes: #314016) - * mention GNU diff in copyright file (hint by Florian Ernst) - * making manual known to doc-base, so obeying to Debian Policy 3.6.2 - * ABI transition to GCC 4.0 (closes #327048) - - -- Eike Sauer <eikes@cs.tu-berlin.de> Fri, 7 Sep 2005 15:15:00 +0100 - -kdiff3 (0.9.88-4) unstable; urgency=low - - * HTML help goes to /usr/share/doc/kdiff3/html - - -- Eike Sauer <eikes@cs.tu-berlin.de> Fri, 15 Apr 2005 00:15:00 +0100 - -kdiff3 (0.9.88-3) unstable; urgency=low - - * symlinked all those documentation images between the different - languages (they where the same anyway) - which halves the size - of the package... - - -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 10 Apr 2005 22:14:00 +0100 - -kdiff3 (0.9.88-2) unstable; urgency=low - - * Don't use makefile in clean rule when it doesn't yet exist - - -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 10 Apr 2005 22:14:00 +0100 - -kdiff3 (0.9.88-1) unstable; urgency=low - - * New upstream release - - -- Eike Sauer <eikes@cs.tu-berlin.de> Sat, 26 Feb 2005 18:07:03 +0100 - -kdiff3 (0.9.87-1) unstable; urgency=low - - * New upstream release - - -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 30 Jan 2005 19:08:52 +0100 - -kdiff3 (0.9.86-1) unstable; urgency=low - - * New upstream release - - -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 15 Jun 2004 11:28:59 +0200 - -kdiff3 (0.9.84-1) unstable; urgency=low - - * New upstream release - - -- Eike Sauer <eikes@cs.tu-berlin.de> Mon, 31 May 2004 22:43:32 +0200 - -kdiff3 (0.9.83-2) unstable; urgency=medium - - * First upload of 0.9.83 (closes: #250486) - * Casual crashes due to race condition (hopefully) fixed - - -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 4 Feb 2004 15:09:12 +0100 - -kdiff3 (0.9.83-1) unstable; urgency=low - - * New upstream release - - now builds on 64 bit architectures (closes: #238221) - * We don't need docbook-to-man in Build-Depends anymore - * Cleaned up debian/rules. - - -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 7 Mar 2004 00:00:32 +0100 - -kdiff3 (0.9.81-2) unstable; urgency=medium - - * Possible data loss situation fixed by upstream - - -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 4 Feb 2004 15:09:12 +0100 - -kdiff3 (0.9.81-1) unstable; urgency=low - - * New upstream release - * Debian manpage accepted by upstream - - -- Eike Sauer <eikes@cs.tu-berlin.de> Mon, 12 Jan 2004 02:11:51 +0100 - -kdiff3 (0.9.80-1) unstable; urgency=low - - * New upstream release - - -- Eike Sauer <eikes@cs.tu-berlin.de> Mon, 8 Dec 2003 22:45:16 +0100 - -kdiff3 (0.9.71-1) unstable; urgency=low - - * Initial Release. - * Wrote a short man page to satisfy Debian Policy. - - -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 5 Nov 2003 00:25:06 +0100 - diff --git a/ubuntu/precise/applications/kdiff3/debian/compat b/ubuntu/precise/applications/kdiff3/debian/compat deleted file mode 100644 index 7ed6ff82d..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/ubuntu/precise/applications/kdiff3/debian/control b/ubuntu/precise/applications/kdiff3/debian/control deleted file mode 100644 index 2b7b74a6d..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/control +++ /dev/null @@ -1,30 +0,0 @@ -Source: kdiff3-trinity -Section: tde -Priority: optional -Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -XSBC-Original-Maintainer: Eike Sauer <eike@debian.org> -Build-Depends: debhelper (>= 4.0.0), cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, docbook-to-man, libacl1-dev, libattr1-dev, automake, autoconf, libtool, libltdl-dev -Standards-Version: 3.8.4 - -Package: kdiff3-trinity -Architecture: any -Depends: ${shlibs:Depends} -Replaces: kdiff3-kde3 (<< 4:14.0.0~), kdiff3-trinity (<< 4:14.0.0~) -Breaks: kdiff3-kde3 (<< 4:14.0.0~), kdiff3-trinity (<< 4:14.0.0~) -Recommends: kdiff3-trinity-doc -Description: compares and merges 2 or 3 files or directories [Trinity] - KDiff3 compares two or three input files and shows the differences - line by line and character by character. It provides an automatic - merge facility and an integrated editor for comfortable solving of - merge conflicts. KDiff3 allows recursive directory comparison and - merging as well. - -Package: kdiff3-trinity-doc -Architecture: all -Recommends: kdiff3-trinity -Replaces: kdiff3-kde3-doc (<< 4:14.0.0~), kdiff3-trinity-doc (<< 4:14.0.0~) -Breaks: kdiff3-kde3-doc (<< 4:14.0.0~), kdiff3-trinity-doc (<< 4:14.0.0~) -Description: documentation for kdiff3 [Trinity] - KDiff3 compares two or three input files and shows the differences - line by line and character by character. This package contains the - HTML documentation. diff --git a/ubuntu/precise/applications/kdiff3/debian/copyright b/ubuntu/precise/applications/kdiff3/debian/copyright deleted file mode 100644 index 05b7204fd..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/copyright +++ /dev/null @@ -1,26 +0,0 @@ -This package was debianized by Eike Sauer <eikes@cs.tu-berlin.de> on -Tue, 21 Oct 2003 14:42:39 +0200. - -It was downloaded from http://kdiff3.sourceforge.net - -Upstream Author: Joachim Eibl <joachim.eibl@gmx.de> - -Copyright: (C) 2002-2007 by Joachim Eibl - -Parts of this software are derived from GNU diffutils -by Haertel, Hayes, Stallman, Tower, Eggert et al. - -This program 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. - -This program 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 with -the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; -if not, write to the Free Software Foundation, Inc., 51 Franklin St, -Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/ubuntu/precise/applications/kdiff3/debian/docs b/ubuntu/precise/applications/kdiff3/debian/docs deleted file mode 100644 index e845566c0..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base deleted file mode 100644 index 12c5677e6..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base +++ /dev/null @@ -1,13 +0,0 @@ -Document: kdiff3-trinity -Title: KDiff3 Handbook -Author: Joachim Eibl <joachim.eibl@gmx.de>, The TDE Team -Abstract: The manual for KDiff3. KDiff3 compares two or three input files - and shows the differences line by line and character by character. - It provides an automatic merge facility and an integrated editor for - comfortable solving of merge conflicts. KDiff3 allows recursive directory - comparison and merging as well. -Section: Apps/Programming - -Format: HTML -Index: /opt/trinity/share/doc/kdiff3/html/index.html -Files: /opt/trinity/share/doc/kdiff3/html/*.html diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install deleted file mode 100644 index 515c1099a..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/opt/trinity/share/doc/tde -debian/tmp/opt/trinity/share/doc/kdiff3/html diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links deleted file mode 100644 index 8d3a5bde5..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links +++ /dev/null @@ -1,97 +0,0 @@ -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/da/kdiff3/white_space.png - -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/de/kdiff3/white_space.png - -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/et/kdiff3/white_space.png - -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/fr/kdiff3/white_space.png - -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/it/kdiff3/white_space.png - -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/pt/kdiff3/white_space.png - -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png - - -/opt/trinity/share/doc/tde/HTML/en/common /opt/trinity/share/doc/kdiff3/html/common -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png /opt/trinity/share/doc/kdiff3/html/dirbrowser.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png /opt/trinity/share/doc/kdiff3/html/dirmergebig.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png /opt/trinity/share/doc/kdiff3/html/iteminfo.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png /opt/trinity/share/doc/kdiff3/html/letter_by_letter.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png /opt/trinity/share/doc/kdiff3/html/merge_current.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png /opt/trinity/share/doc/kdiff3/html/new.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png /opt/trinity/share/doc/kdiff3/html/open_dialog.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png /opt/trinity/share/doc/kdiff3/html/screenshot_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png /opt/trinity/share/doc/kdiff3/html/screenshot_merge.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png /opt/trinity/share/doc/kdiff3/html/triple_diff.png -/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png /opt/trinity/share/doc/kdiff3/html/white_space.png diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.install b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.install deleted file mode 100644 index 0a666b7b0..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.install +++ /dev/null @@ -1,9 +0,0 @@ -debian/tmp/opt/trinity/bin -debian/tmp/opt/trinity/lib -debian/tmp/opt/trinity/share/icons -debian/tmp/opt/trinity/share/locale -debian/tmp/opt/trinity/share/applications -debian/tmp/opt/trinity/share/applnk -debian/tmp/opt/trinity/share/apps -debian/tmp/opt/trinity/share/man -debian/tmp/opt/trinity/share/services diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml deleted file mode 100644 index 6eaa4064f..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity.sgml +++ /dev/null @@ -1,258 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - -<!-- Process this file with docbook-to-man to generate an nroff manual - page: `docbook-to-man manpage.sgml > manpage.1'. You may view - the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'. - A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - <!-- Fill in your name for FIRSTNAME and SURNAME. --> - <!ENTITY dhfirstname "<firstname>EIKE</firstname>"> - <!ENTITY dhsurname "<surname>SAUER</surname>"> - <!-- Please adjust the date whenever revising the manpage. --> - <!ENTITY dhdate "<date>Oktober 2, 2006</date>"> - <!-- SECTION should be 1-8, maybe w/ subsection other parameters are - allowed: see man(7), man(1). --> - <!ENTITY dhsection "<manvolnum>1</manvolnum>"> - <!ENTITY dhemail "<<email>eikes@cs.tu-berlin.de</email>>"> - <!ENTITY dhusername "Eike Sauer"> - <!ENTITY dhucpackage "<refentrytitle>KDIFF3</refentrytitle>"> - <!ENTITY dhpackage "KDiff3"> - - <!ENTITY debian "<productname>Debian</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> - <!ENTITY gpl "&gnu; <acronym>GPL</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2003, 2006</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>compares two or three input files or directories</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option>QT options</option></arg> - <arg><option>KDE options</option></arg> - <arg><option>KDiff3 options</option></arg> - <arg><option><replaceable>File1/base</replaceable></option></arg> - <arg><option><replaceable>File2</replaceable></option></arg> - <arg><option><replaceable>File3</replaceable></option></arg> - - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> tool.</para> - - <para>This manual page was written for the &debian; distribution - because the original program does not have a manual page. - For comprehensive help, please see <command>khelpcenter help:/kdiff3</command>. - </para> - - <para><command>&dhpackage;</command> is a program that - <ItemizedList SPACING="compact"> - <ListItem><para>compares or merges two or three text input files or directories</para></ListItem> - <ListItem><para>shows the differences line by line and character by character</para></ListItem> - <ListItem><para>provides an automatic merge-facility and</para></ListItem> - <ListItem><para>an integrated editor for comfortable solving of merge-conflicts</para></ListItem> - <ListItem><para>supports Unicode, UTF-8 and other codecs</para></ListItem> - <ListItem><para>supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.)</para></ListItem> - <ListItem><para>Printing of differences</para></ListItem> - <ListItem><para>Manual alignment of lines</para></ListItem> - <ListItem><para>Automatic merging of version control history ($Log$)</para></ListItem> - </ItemizedList> - </para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>This program follows the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a full summary of options, run - <command>&dhpackage; --help</command>. - </para> - - <variablelist> - <varlistentry> - <term><option>-m, --merge</option> - </term> - <listitem> - <para>Merge the input.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-b, --base file</option> - </term> - <listitem> - <para>Explicit base file. For compatibility with certain tools.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-o, --output file</option> - </term> - <listitem> - <para>Output file. Implies -m. E.g.: -o newfile.txt</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--out file</option> - </term> - <listitem> - <para>Output file, again. (For compatibility with certain tools.)</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--auto</option> - </term> - <listitem> - <para>No GUI if all conflicts are auto-solvable. (Needs -o file)</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--qall</option> - </term> - <listitem> - <para>Don't solve conflicts automatically. (For compatibility...)</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-L1 alias</option> - </term> - <listitem> - <para>Visible name replacement for first file/base file.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-L2 alias</option> - </term> - <listitem> - <para>Visible name replacement for second file.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-L3 alias</option> - </term> - <listitem> - <para>Visible name replacement for third file.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-L, --fname alias</option> - </term> - <listitem> - <para>Visible name replacement. May by supplied for each input.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--cs string</option> - </term> - <listitem> - <para>Change a setting, e. g. --cs "AutoAdvance=1".</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--confighelp</option> - </term> - <listitem> - <para>Show a list of all settings and their values.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--config file </option> - </term> - <listitem> - <para>Use a different settings file.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--author</option> - </term> - <listitem> - <para>Show author of program.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>-v, --version</option> - </term> - <listitem> - <para>Show version of program.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--license</option> - </term> - <listitem> - <para>Show license of program.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 - (or, at your option, any later version published by the Free - Software Foundation). - </para> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - </para> - - </refsect1> -</refentry> - -<!-- Keep this comment at the end of the file -Local variables: -mode: sgml -sgml-omittag:t -sgml-shorttag:t -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:2 -sgml-indent-data:t -sgml-parent-document:nil -sgml-default-dtd-file:nil -sgml-exposed-tags:nil -sgml-local-catalogs:nil -sgml-local-ecat-files:nil -End: ---> diff --git a/ubuntu/precise/applications/kdiff3/debian/patches/.gitignore b/ubuntu/precise/applications/kdiff3/debian/patches/.gitignore deleted file mode 100644 index e69de29bb..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/patches/.gitignore +++ /dev/null diff --git a/ubuntu/precise/applications/kdiff3/debian/rules b/ubuntu/precise/applications/kdiff3/debian/rules deleted file mode 100755 index 0252d28f2..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/rules +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/kde.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - -build/kdiff3-trinity:: - dh_testdir - /usr/bin/docbook-to-man debian/kdiff3.sgml > doc/en/kdiff3.1 - -install/kdiff3-trinity:: - dh_testdir - # move kdiff3.desktop to freedesktop.org conforming place - mkdir --parents debian/tmp/opt/trinity/share/applications/tde/ - mv debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop debian/tmp/opt/trinity/share/applications/tde/ - rmdir debian/tmp/opt/trinity/share/applnk/Development - -install/kdiff3-trinity-doc:: - dh_testdir - # that's not where we want to have a man page - rm -rf debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1 - # move HTML help /opt/trinity/share/doc/kdiff3/html/ - rm -rf debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3 - mkdir --parents debian/tmp/opt/trinity/share/doc/kdiff3/html/ - mv debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html debian/tmp/opt/trinity/share/doc/kdiff3/html/ - rmdir debian/tmp/opt/trinity/share/apps/kdiff3/doc - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap diff --git a/ubuntu/precise/applications/kdiff3/debian/source/format b/ubuntu/precise/applications/kdiff3/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/ubuntu/precise/applications/kdiff3/debian/source/options b/ubuntu/precise/applications/kdiff3/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/source/options +++ /dev/null @@ -1,6 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 - -# Don't run differences -diff-ignore = .* diff --git a/ubuntu/precise/applications/kdiff3/debian/watch b/ubuntu/precise/applications/kdiff3/debian/watch deleted file mode 100644 index 1f8b23456..000000000 --- a/ubuntu/precise/applications/kdiff3/debian/watch +++ /dev/null @@ -1,6 +0,0 @@ -# As version numbering of KDiff3 has changed from 0.93, 0.931, ... to 0.9.50, 0.9.60, -# we have to dump the former ones. They would be considered to have a higher version -# number by uscan. Addition: Ignore a x.y.zz-QT version as well. - -version=3 -http://sf.net/kdiff3/kdiff3-(.\..\...)\.tar.gz debian uupdate |