--- imediff2-1.1.2.orig/debian/changelog +++ imediff2-1.1.2/debian/changelog @@ -0,0 +1,137 @@ +imediff2 (1.1.2-3) unstable; urgency=medium + + * Add dh-python, python-setuptools and python-all-dev to Build-Depends. + * Correct typo in bug number reference in previous version (1.1.2-2) + of changelog. Closes: #831966. + + -- Kevin Coyner Wed, 12 Oct 2016 16:22:53 -0400 + +imediff2 (1.1.2-2) unstable; urgency=medium + + * debian/rules: + + Changed build architecture line to fix RC bug FTBFS binary build with no + binary artifacts found. Closes: #831966. + + Changed call to dh_clean -k to dh_prep. + + Added build commands to build-arch build-indep. + * debian/control: + + Bumped Standards-Version to 3.9.8. No changes. + + Bumped debhelper to >= 9. + + Add ${misc:Depends}. + * Bumped debian/compat to 9. + + -- Kevin Coyner Tue, 11 Oct 2016 06:46:12 -0400 + +imediff2 (1.1.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Convert to dh_python2 (Closes: #616847). + * Define homepage field (Closes: #615420). + + -- Luca Falavigna Thu, 30 May 2013 20:25:45 +0200 + +imediff2 (1.1.2-1) unstable; urgency=low + + * New upstream release. + * New maintainer. Closes: #425240. + * Changed debian/copyright to include standard paragraph about GPL. + * debian/control: + + Bumped Standards-Version to 3.7.2. No changes. + + Bumped debhelper to >= 5.0.38. + + Added homepage. + + Changed Build-Depends-Indep to Build-Depends. + + Added Build-Depends on python-central and python-all-dev. + + Added XB-Python-Version and XS-Python-Version. + * Bumped debian/compat to 5. + * Edited debian/watch to look for current versioning style in upstream. Also + updated to version 3. + * debian/rules: + + Changed to dh_pycentral. + + Removed dh_python. + + Cleaned up cruft. + * Added debian/pycompat. + + -- Kevin Coyner Thu, 16 Aug 2007 21:02:40 -0400 + +imediff2 (1.1.1-2) unstable; urgency=low + + * Orphaning the package. + + -- Jarno Elonen Fri, 18 May 2007 12:18:09 +0300 + +imediff2 (1.1.1-1) unstable; urgency=low + + * New upstream release + - Applied some patches by Wolfram Sang. Thank you! + + Adds '--new-file' option (like 'diff') + + Better error messages + + KEY_BACKSPACE goes to previous chunk + + '-o file' is not required anymore (for preview, no saving) + + help screen shows which color means which file + + -- Jarno Elonen Fri, 10 Feb 2006 19:13:57 +0200 + +imediff2 (1.1.0+20041113-1) unstable; urgency=low + + * New upstream release (from SVN) + - typo correction in help file + + * Changed watch file to point to Alioth + + -- Jarno Elonen Sat, 13 Nov 2004 01:18:42 +0200 + +imediff2 (1.1.0-1) unstable; urgency=low + + * New upstream release + - launch external editor with 'e' + - more effective keyboard commands + - documentation license changed from + GFDL to Public Domain + + -- Jarno Elonen Fri, 22 Oct 2004 22:27:04 +0300 + +imediff2 (1.0.2-1) unstable; urgency=low + + * New upstream release + + * Added a watch file + + -- Jarno Elonen Sun, 10 Oct 2004 02:44:39 +0300 + +imediff2 (1.0.1-2) unstable; urgency=low + + * Added a watch file + + -- Jarno Elonen Sun, 10 Oct 2004 01:57:17 +0300 + +imediff2 (1.0.1-1) unstable; urgency=low + + * New upstream release. + - Fix some screen (re)size problems (closes: #250627) + + * _Really_ changed maintainer email address + + -- Jarno Elonen Mon, 24 May 2004 21:16:53 +0300 + +imediff2 (1.0-3) unstable; urgency=low + + * Copyright update + * Changed maintainer email address + + -- Jarno Elonen Fri, 16 Jan 2004 11:41:41 +0200 + +imediff2 (1.0-2) unstable; urgency=low + + * Support for the alternatives system ('/usr/bin/merge2') + + * Use the packaging automation provided by dh_python + + * First upload to Main (closes: #221135) + + -- Jarno Elonen Sat, 15 Nov 2003 14:46:34 +0200 + +imediff2 (1.0-1) unstable; urgency=low + + * Initial Release. + + -- Jarno Elonen Sun, 27 Apr 2003 02:11:31 +0300 + --- imediff2-1.1.2.orig/debian/compat +++ imediff2-1.1.2/debian/compat @@ -0,0 +1 @@ +9 --- imediff2-1.1.2.orig/debian/control +++ imediff2-1.1.2/debian/control @@ -0,0 +1,26 @@ +Source: imediff2 +Section: text +Priority: optional +Maintainer: Kevin Coyner +Build-Depends: debhelper (>= 9), xsltproc, docbook-xsl, python-all, dh-python, python-setuptools, python-all-dev +Standards-Version: 3.9.8 +Homepage: http://alioth.debian.org/projects/imediff2/ + +Package: imediff2 +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Description: interactive full screen 2-way merge tool + Imediff2 lets you merge two (slightly different) files + interactively with a user friendly full screen interface + on a text terminal. In other words, it is an ncurses based + replacement for sdiff. + . + The program shows the differences of given files (in color + if the terminal supports them), lets you scroll up and down + and toggle changes between the old and new versions of + the differing hunks one by one. + . + Unlike split screen based merge tools, it shows only one, + partially merged, version of the file at a time, making + it more "WYSIWYG", perhaps more intuitive for beginners and + most importantly, suitable for narrow terminals. --- imediff2-1.1.2.orig/debian/copyright +++ imediff2-1.1.2/debian/copyright @@ -0,0 +1,34 @@ +Imediff2 was debianized by Jarno Elonen in 2003 +from source files available at + + http://alioth.debian.org/projects/imediff2/ + +The packager has placed his own packaging works into the Public +Domain and licenses those works that are modifications to +existing copyrighted works (some packaging scripts, modified +upstream sources etc) under the same license as the original ones. + +The current maintainer is Kevin Coyner . + +Upstream Author: Jarno Elonen + +Copyright: (c) 2003, 2004 Jarno Elonen + +License: + + This package 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 package 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 package; if not, write to the Free Software + Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +The Debian packaging is (C) 2007, Kevin Coyner and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- imediff2-1.1.2.orig/debian/imediff2.install +++ imediff2-1.1.2/debian/imediff2.install @@ -0,0 +1 @@ +imediff2 usr/bin/ --- imediff2-1.1.2.orig/debian/postinst +++ imediff2-1.1.2/debian/postinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ]; then + + update-alternatives --install /usr/bin/merge2 merge2 /usr/bin/imediff2 70 \ + --slave /usr/share/man/man1/merge2.1.gz merge2.1.gz /usr/share/man/man1/imediff2.1.gz + +fi + +#DEBHELPER# --- imediff2-1.1.2.orig/debian/prerm +++ imediff2-1.1.2/debian/prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove merge2 /usr/bin/imediff2 +fi + +#DEBHELPER# --- imediff2-1.1.2.orig/debian/rules +++ imediff2-1.1.2/debian/rules @@ -0,0 +1,59 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PYDEF := $(shell pyversions -d) + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: + +build-stamp: configure-stamp + dh_testdir + make imediff2.1 + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + +# Build architecture-dependent files here. +binary-arch: +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install + dh_installman imediff2.1 + dh_link + dh_compress + dh_fixperms + dh_python2 + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- imediff2-1.1.2.orig/debian/watch +++ imediff2-1.1.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://alioth.debian.org/project/showfiles.php?group_id=30544 .*imediff2_([\d\.]*).tar.gz