--- diff-ext-0.3.2.orig/debian/docs +++ diff-ext-0.3.2/debian/docs @@ -0,0 +1 @@ +AUTHORS --- diff-ext-0.3.2.orig/debian/prerm +++ diff-ext-0.3.2/debian/prerm @@ -0,0 +1,12 @@ +#! /bin/sh +#DEBHELPER# + +set -e + +if [ "$1" = remove ] || [ "$1" = upgrade ]; then + echo "Unregistering gconf schemas..." + gconf-schemas --unregister diff-ext.schemas + echo "...done" +fi + +exit 0 --- diff-ext-0.3.2.orig/debian/diff-ext-setup.sgml +++ diff-ext-0.3.2/debian/diff-ext-setup.sgml @@ -0,0 +1,106 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.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. + + --> + + + FIRSTNAME"> + SURNAME"> + + maggio 27, 2007"> + + 1"> + bluekuja@ubuntu.com"> + + DIFF-EXT"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + is a program that makes possible to launch file comparison tool for 2 or 3 files (depending on the tool)in the same directory or "save" a file(s) for later comparison + + + File manager context menu extension to launch comparison tools + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + Instead, it has documentation in the &gnu + + &dhpackage; is a program that makes possible to launch file comparison tool for 2 or 3 files (depending on the tool)in the same directory + + + + AUTHOR + + 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 any + later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + + + --- diff-ext-0.3.2.orig/debian/copyright +++ diff-ext-0.3.2/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Andrea Veri on +Sun, 27 May 2007 18:52:43 +0200. + +It was downloaded from http://sourceforge.net/projects/diff-ext/files/ + +Upstream Author: Sergey Zorin + +Copyright Holder: (c) 2007, Sergey Zorin + +License: + + Redistribution and use in source and binary forms, with or without + modification, are permitted under the terms of the BSD License. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS 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 REGENTS OR 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. + +On Debian systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + + +The Debian packaging is (C) 2009, Andrea Veri and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + --- diff-ext-0.3.2.orig/debian/postinst +++ diff-ext-0.3.2/debian/postinst @@ -0,0 +1,12 @@ +#! /bin/sh +#DEBHELPER# + +set -e + +if [ "$1" = "configure" ]; then + echo "Registering gconf schemas..." + gconf-schemas --register diff-ext.schemas + echo "...done" +fi + +exit 0 --- diff-ext-0.3.2.orig/debian/changelog +++ diff-ext-0.3.2/debian/changelog @@ -0,0 +1,141 @@ +diff-ext (0.3.2-1) unstable; urgency=low + + * New upstream release. + - diff-ext do *not* silently fail when a diff tool is + missing anymore. (Closes: #475586) + * debian/control: + - diff-ext now recommends meld instead of kdiff + - libgconf2-dev updated to >= 2.14 as per configure.ac + requirements. + - libgnomevfs2-dev updated to >= 2.14 as per configure.ac + requirements. + - added a B-D on libgtk2.0-dev as per configure.ac requirements. + - added a B-D on libglib2.0-dev >= 2.14.0 as per configure.ac + requirements. + - added a B-D on intltool preventing a FTBFS cause missing intltool + scripts. + * debian/compat: + - bumped to reflect dh level. + * debian/rules: + - dh_clean -k moved to dh_prep preventing a lintian warning. + + -- Andrea Veri Wed, 23 Sep 2009 10:35:41 +0200 + +diff-ext (0.2.3-4) unstable; urgency=low + + * Acknowledge NMU, thanks Andreas Henriksson and Chris Lamb! + * debian/control: + - Changed my mail address. + - Added Sergey Zorin as co-maintainer, he will help me + out with upstream issues. (Closes: #536170) + - Bzr-Vcs field removed, it's no more needed as far as + I won't maintain this package on bzr now. (probably in + the future) + - added DM-Upload-Allowed field: I'll be a DM really soon. + - Bumped Standards-Version to latest 3.8.3. + - Bumped dh to level 7. + * debian/rules: + - added some hacks which will fix diff-ext's crossbuild detection. (for + reference: http://lists.debian.org/debian-devel/2007/11/msg00118.html) + Thanks to Kumar Appaiah for the patch. (Closes: #542530) + * debian/copyright: + - adjusted 'downloaded from' field to match new sf's projects layout. + + -- Andrea Veri Fri, 28 Aug 2009 11:52:39 +0200 + +diff-ext (0.2.3-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add missing Build-Depends on libgconf2-dev and libgnomevfs2-dev to fix + FTBFS. Thanks to Chris Taylor for testing. + (Closes: #523505) + + [Andreas Henriksson] + * configure.ac, configure: + - Check and use gconf-2.0 and gnome-vfs-2.0 modules when building, since + it's not possible to rely on nautilus dragging these in since 2.22.0. + (Closes: #475236) + * debian/control: + - Add version >= 2.22.0 to libnautilus-extension-dev build-dependency to + make sure this experimental upload gets built against the experimental + version of the library. + - Recommend kdiff3, as this is the default diff tool and diff-ext silently + fails if it can't launch the diff tool. + + -- Chris Lamb Thu, 30 Jul 2009 18:51:21 +0200 + +diff-ext (0.2.3-3) unstable; urgency=medium + + * debian/rules: + - removed --with-gconf-source configure variable (seems to be not + compatible on some build machines having a not-writable home dir) + adding a --disable-schemas-install instead. Now schemas won't be + installed during the build run but *after* using the shipped postinst + file added in the previous revision. Fixes the FTBFS on amd64, powerpc, + s390, ia64, m68k, sparc archs. (Closes: #451897) + * debian/copyright: + - updated upstream's download URL to point to diff-ext's sf project + downloads page. + * other changes I forgot to add in the 0.2.3-2 changelog's entry are: + - debian/control: + - diff-ext now directly depends on gconf2. Lintian warning fixed. + - debian/rules: + - make distclean rule updated using the one suggested by lintian. + Lintian warning fixed. + - config.sub, config.guess: + - both updated using the examples provided by the autotools-dev package. + Lintian won't complain about old config.* files in the upstream tree + more. + + -- Andrea Veri Mon, 26 Nov 2007 20:35:42 +0100 + +diff-ext (0.2.3-2) unstable; urgency=medium + + * The "*finally* we have a working diff-ext package again" release + * debian/rules: + - added --with-gconf-source configure option to prevent a + failing gconf schemas installation causing odd crashes + on nautilus when diff-ext is installed. (*Really* Closes: #431692) + - cleaned up a bit deleting useless debhelper autogenerated + comments. + - adding a rule to delete de.png file installed by makefiles + in the wrong policy directory. Using this way preventing + an autotools run (too big diff file) after an eventual + Makefile.am change. + - added an install rule for the new de.xpm file to point + correctly to /usr/share/pixmaps. + * debian/postinst: + - added for registering diff-ext's gconf schemas correctly. + * debian/prerm: + - added for un-registering diff-ext's gconf schemas correctly. + * diff-ext.desktop.in: + - removed every deprecated field and cleaned it up a bit. + Desktop-file-validate seems to be happy again now. + * /diff-ext/src/main.c: + - finally removed the second erroneus g_object_unref line. It was + helping diff-ext to crash nautilus when installed. + * debian/control: + - Homepage field has been moved from Description space to his own + field (new debian policy). Updated Bzr field to point to Xs-Bzr + instead of old Xs-Vcs-Bzr. + * debian/de.xpm: + - added and pointed to /usr/share/pixmaps dir. Finally .desktop file + will be redirected to a working icon path. + + -- Andrea Veri Thu, 08 Nov 2007 21:26:57 +0100 + +diff-ext (0.2.3-1) unstable; urgency=medium + + * New upstream release, which fixes "nautilus crashes + when diff-ext is installed" odd bug that made diff-ext unable to + be used ending up with a crash. Bug was forwarded upstream and can + be found on sf.net diff-ext's bug tracker. (1799127 bug number). (Closes: #431692) + + -- Andrea Veri Thu, 27 Sep 2007 21:01:09 +0200 + +diff-ext (0.2.1-1) unstable; urgency=low + + * Initial release (Closes: #426578) + + -- Andrea Veri Sun, 27 May 2007 18:52:43 +0200 + --- diff-ext-0.3.2.orig/debian/compat +++ diff-ext-0.3.2/debian/compat @@ -0,0 +1 @@ +7 --- diff-ext-0.3.2.orig/debian/de.xpm +++ diff-ext-0.3.2/debian/de.xpm @@ -0,0 +1,37 @@ +/* XPM */ +static char * de_xpm[] = { +"32 32 2 1", +" c None", +". c #000000", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" .......... ............. ", +" ............ ............. ", +" ............. ............. ", +" ..... ..... ..... ", +" ..... ..... ..... ", +" ..... ..... ..... ", +" ..... ..... ............ ", +" ..... ..... ............ ", +" ..... ..... ............ ", +" ..... ..... ..... ", +" ..... ..... ..... ", +" ..... ..... ..... ", +" ............. ............. ", +" ............ ............. ", +" .......... ............. ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; --- diff-ext-0.3.2.orig/debian/rules +++ diff-ext-0.3.2/debian/rules @@ -0,0 +1,69 @@ +#!/usr/bin/make -f +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + + +config.status: configure + dh_testdir + ./configure $(CROSS) --prefix=/usr --with-gconf-schema-file-dir=\$${datadir}/gconf/schemas --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --disable-schemas-install + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + docbook-to-man debian/diff-ext-setup.sgml > diff-ext-setup.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) distclean + -rm -f $(CURDIR)/diff-ext-setup.1 + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) DESTDIR=$(CURDIR)/debian/diff-ext install + rm -f $(CURDIR)/debian/diff-ext/usr/share/diff-ext/de.png + dh_install debian/de.xpm usr/share/pixmaps + +binary-indep: + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman diff-ext-setup.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- diff-ext-0.3.2.orig/debian/control +++ diff-ext-0.3.2/debian/control @@ -0,0 +1,19 @@ +Source: diff-ext +Section: utils +Priority: optional +Maintainer: Andrea Veri +Uploaders: Sergey Zorin +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), libxml-parser-perl, pkg-config, libnautilus-extension-dev (>= 2.22.0), docbook-to-man, libtool, libgconf2-dev (>= 2.14), libgnomevfs2-dev (>= 2.14), libgtk2.0-dev, libglib2.0-dev (>= 2.14.0), intltool +Homepage: http://diff-ext.sourceforge.net/ +Standards-Version: 3.8.3 + +Package: diff-ext +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gconf2 +Recommends: meld +Description: File manager context menu extension to launch comparison tools + This shell extension (compatible with nautilus only) makes it possible + to launch file comparison tool for 2 or 3 files (depending on the tool) + in the same directory or save a file(s) for later comparison. It acts as + external most recent used (MRU) file list for the comparison tool.