diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-28 14:13:18 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-28 14:13:18 -0500 |
commit | 4bc22e8b188aa26df8b1a23c39bb0f3c5b05b8b6 (patch) | |
tree | c6f53decaabed9678523a8bbd6a1000a9f3bf78f /ubuntu/raring/applications/kdiff3/debian/control | |
parent | 211d261d7778de1d9a773e7ec43a4e97b4bd7e57 (diff) | |
download | tde-packaging-4bc22e8b188aa26df8b1a23c39bb0f3c5b05b8b6.tar.gz tde-packaging-4bc22e8b188aa26df8b1a23c39bb0f3c5b05b8b6.zip |
Split raring packaging into new directory due to defoma changes
Diffstat (limited to 'ubuntu/raring/applications/kdiff3/debian/control')
-rw-r--r-- | ubuntu/raring/applications/kdiff3/debian/control | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ubuntu/raring/applications/kdiff3/debian/control b/ubuntu/raring/applications/kdiff3/debian/control new file mode 100644 index 000000000..2d370d716 --- /dev/null +++ b/ubuntu/raring/applications/kdiff3/debian/control @@ -0,0 +1,30 @@ +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), tdelibs4-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. |