[Pkg-xfce-commits] r1285 - in goodies/xfdiff/trunk: . debian debian/patches
hanska-guest at alioth.debian.org
hanska-guest at alioth.debian.org
Sun May 27 11:13:15 UTC 2007
Author: hanska-guest
Date: 2007-05-27 11:13:15 +0000 (Sun, 27 May 2007)
New Revision: 1285
Added:
goodies/xfdiff/trunk/debian/
goodies/xfdiff/trunk/debian/changelog
goodies/xfdiff/trunk/debian/compat
goodies/xfdiff/trunk/debian/control
goodies/xfdiff/trunk/debian/copyright
goodies/xfdiff/trunk/debian/links
goodies/xfdiff/trunk/debian/menu
goodies/xfdiff/trunk/debian/patches/
goodies/xfdiff/trunk/debian/patches/01-fix_rpath_issue.dpatch
goodies/xfdiff/trunk/debian/rules
goodies/xfdiff/trunk/debian/watch
goodies/xfdiff/trunk/debian/xfdiff4.xml
Modified:
goodies/xfdiff/trunk/intltool-update
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: goodies/xfdiff/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: goodies/xfdiff/trunk/debian/changelog
===================================================================
--- goodies/xfdiff/trunk/debian/changelog (rev 0)
+++ goodies/xfdiff/trunk/debian/changelog 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,6 @@
+xfdiff (4.5.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #426208)
+
+ -- David Paleino <d.paleino at gmail.com> Sat, 26 May 2007 20:12:09 +0200
+
Added: goodies/xfdiff/trunk/debian/compat
===================================================================
--- goodies/xfdiff/trunk/debian/compat (rev 0)
+++ goodies/xfdiff/trunk/debian/compat 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1 @@
+5
Added: goodies/xfdiff/trunk/debian/control
===================================================================
--- goodies/xfdiff/trunk/debian/control (rev 0)
+++ goodies/xfdiff/trunk/debian/control 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,23 @@
+Source: xfdiff
+Section: devel
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: David Paleino <d.paleino at gmail.com>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at corsac.net>
+Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.2.0), libglib2.0-dev (>= 2.6.0), libtubo-dev (>= 4.5.0), libxml-parser-perl, chrpath, xsltproc, docbook-xml, docbook-xsl
+Standards-Version: 3.7.2
+XS-VCS-Svn: svn://svn.debian.org/svn/pkg-xfce/xfdiff
+XS-VCS-Browser: http://svn.debian.org/wsvn/pkg-xfce/xfdiff
+
+Package: xfdiff
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GUI frontend to "diff" and "patch" utilities
+ xfdiff is a graphic interface to the GNU diff and patch commands.
+ With this utility, it is possible to view differences side by side
+ for files or directories. You can also view differences that applying
+ a patch-file would imply, without applying the patch.
+ You can also apply patches to the hard disk or create patch files for
+ differences between files or directories.
+ .
+ Homepage: http://xffm.sourceforge.net/xfdiff.html
+Tag:
Added: goodies/xfdiff/trunk/debian/copyright
===================================================================
--- goodies/xfdiff/trunk/debian/copyright (rev 0)
+++ goodies/xfdiff/trunk/debian/copyright 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,35 @@
+This package was debianized by David Paleino <d.paleino at gmail.com> on
+Sat, 26 May 2007 20:12:09 +0200.
+
+It was downloaded from http://xffm.sourceforge.net
+
+Upstream Author:
+
+ Edscott Wilson García <edscott at xfce.org>
+
+Copyright:
+
+ (C) 2000-2006, Edscott Wilson García
+ (C) 1999, Rasca, Berlin <thron at gmx.de>
+
+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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007, David Paleino <d.paleino at gmail.com> and
+is licensed under the GPL, see above.
Added: goodies/xfdiff/trunk/debian/links
===================================================================
--- goodies/xfdiff/trunk/debian/links (rev 0)
+++ goodies/xfdiff/trunk/debian/links 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1 @@
+usr/share/man/man1/xfdiff4.1.gz usr/share/man/man1/xfdiff.1.gz
Added: goodies/xfdiff/trunk/debian/menu
===================================================================
--- goodies/xfdiff/trunk/debian/menu (rev 0)
+++ goodies/xfdiff/trunk/debian/menu 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,5 @@
+?package(xfdiff):\
+ needs="X11" \
+ section="Apps/Programming" \
+ title="xfdiff" \
+ command="/usr/bin/xfdiff"
Added: goodies/xfdiff/trunk/debian/patches/01-fix_rpath_issue.dpatch
===================================================================
--- goodies/xfdiff/trunk/debian/patches/01-fix_rpath_issue.dpatch (rev 0)
+++ goodies/xfdiff/trunk/debian/patches/01-fix_rpath_issue.dpatch 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,7 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix_rpath_issue.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
Added: goodies/xfdiff/trunk/debian/rules
===================================================================
--- goodies/xfdiff/trunk/debian/rules (rev 0)
+++ goodies/xfdiff/trunk/debian/rules 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+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
+
+config.status: configure
+ dh_testdir
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+ touch $@
+
+unpatch:
+ dpatch deapply-all
+ rm -rf debian/patched patch-stamp
+
+build: patch build-stamp
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl debian/xfdiff4.xml
+ touch $@
+
+clean: unpatch distclean
+distclean:
+ dh_testdir
+ dh_testroot
+
+ -$(MAKE) distclean
+
+ dh_clean build-stamp config.log xfdiff4.1
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) DESTDIR=$(CURDIR)/debian/xfdiff install
+
+ # let's remove usr/share/xffm, which is redundant
+ -rm -rf $(CURDIR)/debian/xfdiff/usr/share/xffm
+
+binary-indep: build install
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installmenu
+ dh_installman xfdiff4.1
+ dh_strip
+ dh_compress
+ dh_link
+ 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
Property changes on: goodies/xfdiff/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: goodies/xfdiff/trunk/debian/watch
===================================================================
--- goodies/xfdiff/trunk/debian/watch (rev 0)
+++ goodies/xfdiff/trunk/debian/watch 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,4 @@
+version=3
+http://sf.net/xffm/xfdiff-(.*)\.tar\.gz
+
+
Added: goodies/xfdiff/trunk/debian/xfdiff4.xml
===================================================================
--- goodies/xfdiff/trunk/debian/xfdiff4.xml (rev 0)
+++ goodies/xfdiff/trunk/debian/xfdiff4.xml 2007-05-27 11:13:15 UTC (rev 1285)
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'. A manual page
+<package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+ $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The
+XSL files are in docbook-xsl. 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 xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Edscott Wilson</firstname>">
+ <!ENTITY dhsurname "<surname>Garcia</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>may 26, 2007</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>d.paleino at gmail.com</email>">
+ <!ENTITY dhusername "David Paleino">
+ <!ENTITY dhucpackage "<refentrytitle>XFDIFF</refentrytitle>">
+ <!ENTITY dhpackage "xfdiff4">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <copyright>
+ <year>2007</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>graphical frontend to 'diff' and 'patch'</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><option>-e <replaceable>this</replaceable></option></arg>
+
+ <arg><option>--example <replaceable>that</replaceable></option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> command.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.</para>
+
+ <para><command>&dhpackage;</command> is a graphical frontend to
+ the 'diff' and 'patch' utilities. It is part of the Xffm project.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>diff (1), patch (1).</para>
+
+ </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 any
+ later version published by the Free Software Foundation.
+ </para>
+
+ <para>xfdiff is part of the xffm project <http://xffm.org/>. It is (C)
+ 2000-2006, Edscott Wilson Garcia <edscott at xfce.org>, and it is released
+ under GNU GPL.</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>
+
Modified: goodies/xfdiff/trunk/intltool-update
===================================================================
--- goodies/xfdiff/trunk/intltool-update 2007-05-27 11:12:58 UTC (rev 1284)
+++ goodies/xfdiff/trunk/intltool-update 2007-05-27 11:13:15 UTC (rev 1285)
@@ -556,7 +556,7 @@
sub GenerateHeaders
{
- my $EXTRACT = "/usr/common/SVN/xffm/CURRENT/graphic-utilities/xfdiff/intltool-extract";
+ my $EXTRACT = "/usr/src/build/debs/itp/xffm/xfdiff/xfdiff-4.5.0/intltool-extract";
chomp $EXTRACT;
$EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
More information about the Pkg-xfce-commits
mailing list