r10508 - in /packages/unstable/meld: ./ debian/ debian/patches/
ross at users.alioth.debian.org
ross at users.alioth.debian.org
Fri Apr 27 09:22:48 UTC 2007
Author: ross
Date: Fri Apr 27 09:22:48 2007
New Revision: 10508
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10508
Log:
Add Meld
Added:
packages/unstable/meld/
packages/unstable/meld/debian/ (with props)
packages/unstable/meld/debian/changelog
packages/unstable/meld/debian/compat
packages/unstable/meld/debian/control
packages/unstable/meld/debian/copyright
packages/unstable/meld/debian/meld.1
packages/unstable/meld/debian/menu
packages/unstable/meld/debian/patches/
packages/unstable/meld/debian/patches/makefile.diff
packages/unstable/meld/debian/patches/plurals.patch
packages/unstable/meld/debian/patches/scrollkeeper.diff
packages/unstable/meld/debian/postinst
packages/unstable/meld/debian/rules (with props)
packages/unstable/meld/debian/watch
Propchange: packages/unstable/meld/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/changelog (added)
+++ packages/unstable/meld/debian/changelog Fri Apr 27 09:22:48 2007
@@ -1,0 +1,225 @@
+meld (1.1.4-1) unstable; urgency=low
+
+ * Acknowledge NMU
+ * New upstream release (Closes: #382055)
+ - Tab width fixes (Closes: #372587)
+
+ -- Ross Burton <ross at debian.org> Fri, 27 Apr 2007 10:02:37 +0100
+
+meld (1.1.3-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload to fix build failure.
+ * Remove duplicate plurals for languages with only one nplurals;
+ fixes build failure with newer gettext (Closes: #385177).
+
+ -- Thijs Kinkhorst <thijs at debian.org> Fri, 15 Sep 2006 14:09:05 +0200
+
+meld (1.1.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the new python policy (Closes: #380868):
+ + use dh_pysupport instead of dh_python.
+ + remove custom postinst.
+ * Bump Standards-Version to 3.7.2.
+ * Fix B-D versus B-D-I for cdbs, and debhelper.
+
+ -- Pierre Habouzit <madcoder at debian.org> Thu, 10 Aug 2006 19:02:41 +0200
+
+meld (1.1.3-1) unstable; urgency=low
+
+ * New upstream release (closes: #355022)
+ - remove fr.diff, fixed upstream
+ - add scrollkeeper.diff, to fix up Scrollkeeper
+
+ -- Ross Burton <ross at debian.org> Fri, 3 Mar 2006 10:26:17 +0000
+
+meld (1.1.2-1) unstable; urgency=low
+
+ * New upstream release (closes: #341184)
+
+ -- Ross Burton <ross at debian.org> Thu, 8 Dec 2005 11:25:19 +0000
+
+meld (1.1.1-2) unstable; urgency=low
+
+ * debian/copyright: Fix FSF address.
+ * debian/rules: Package upstream changelog (closes: #337665)
+
+ -- Ross Burton <ross at debian.org> Sun, 6 Nov 2005 13:13:40 +0000
+
+meld (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Increase Standards Version.
+
+ -- Ross Burton <ross at debian.org> Sat, 29 Oct 2005 14:33:08 +0100
+
+meld (1.0.0-1) unstable; urgency=low
+
+ * New upstream release (closes: #329628)
+ * Recommend python-gnome2-extras for pygtksourceview (closes: #310808)
+ * debian/patches/fr.diff: from upstream to fix French translation
+
+ -- Ross Burton <ross at debian.org> Fri, 23 Sep 2005 14:13:58 +0100
+
+meld (0.9.4.1+20050125-4) unstable; urgency=low
+
+ * Add debian/watch
+ * Fix typo in man page (closes: #298732)
+
+ -- Ross Burton <ross at debian.org> Thu, 31 Mar 2005 11:18:16 +0100
+
+meld (0.9.4.1+20050125-3) unstable; urgency=low
+
+ * Build-dep on scrollkeeper (closes: #292950)
+
+ -- Ross Burton <ross at debian.org> Mon, 31 Jan 2005 15:39:44 +0000
+
+meld (0.9.4.1+20050125-2) unstable; urgency=low
+
+ * Don't install meld.applications, GNOME currently doesn't support
+ registering against directory MIME types (closes: #292805)
+
+ -- Ross Burton <ross at debian.org> Sun, 30 Jan 2005 14:44:27 +0000
+
+meld (0.9.4.1+20050125-1) unstable; urgency=low
+
+ * Snapshot from CVS (closes: #291914)
+ - Depends on new libglade (closes: #287167)
+ * Move to CDBS
+ * Lower-case the synopsis
+
+ -- Ross Burton <ross at debian.org> Fri, 13 Aug 2004 18:31:01 +0100
+
+meld (0.9.4.1-1) unstable; urgency=low
+
+ * New upstream release (closes: #262632)
+
+ -- Ross Burton <ross at debian.org> Wed, 11 Aug 2004 08:10:28 +0100
+
+meld (0.9.3-1) unstable; urgency=low
+
+ * New upstream release (closes: #253113)
+ * Handles both_horiz and -horiz (closes: #218045)
+
+ -- Ross Burton <ross at debian.org> Mon, 7 Jun 2004 10:57:36 +0100
+
+meld (0.9.2.1-2) unstable; urgency=low
+
+ * Add Build-Depend on intltool (closes: #235090)
+
+ -- Ross Burton <ross at debian.org> Mon, 1 Mar 2004 12:15:44 +0000
+
+meld (0.9.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules: rewrite now upstream makefile uses $DISTDIR
+ * debian/menu: add quotes
+
+ -- Ross Burton <ross at debian.org> Wed, 18 Feb 2004 08:57:29 +0000
+
+meld (0.9.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Install upstream changelog
+ * Install documentation stylesheet
+
+ -- Ross Burton <ross at debian.org> Mon, 13 Oct 2003 17:37:08 +0100
+
+meld (0.8.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ross Burton <ross at debian.org> Tue, 2 Sep 2003 19:01:26 +0100
+
+meld (0.8.4-2) unstable; urgency=low
+
+ * Rebuild for python 2.3 (closes: #204812)
+ * Move to Standard 3.6.0.
+
+ -- Ross Burton <ross at debian.org> Mon, 11 Aug 2003 11:18:17 +0100
+
+meld (0.8.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Cut/Copy/Paste shortcuts now work (closes: #184290)
+
+ -- Ross Burton <ross at debian.org> Thu, 31 Jul 2003 12:42:08 +0100
+
+meld (0.8.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ross Burton <ross at debian.org> Tue, 24 Jun 2003 08:58:17 +0100
+
+meld (0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ross Burton <ross at debian.org> Tue, 20 May 2003 15:38:33 +0100
+
+meld (0.7.1-2) unstable; urgency=low
+
+ * debian/control: Move to section 'gnome'.
+
+ -- Ross Burton <ross at debian.org> Tue, 29 Apr 2003 12:38:42 +0100
+
+meld (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated debian/* for new debian.org email address.
+
+ -- Ross Burton <ross at debian.org> Tue, 29 Apr 2003 11:24:28 +0100
+
+meld (0.7.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ross Burton <ross at burtonini.com> Thu, 27 Mar 2003 17:38:03 +0000
+
+meld (0.6.6-2) unstable; urgency=low
+
+ * Move Python code to /usr/lib/meld.
+ * Remove /usr/share/meld/*.py[co] in postinst.
+
+ -- Ross Burton <ross at burtonini.com> Fri, 28 Feb 2003 09:22:19 +0000
+
+meld (0.6.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump to debhelper version 4, Standards 3.5.8.
+ * Use dh_python.
+
+ -- Ross Burton <ross at burtonini.com> Fri, 14 Feb 2003 08:55:01 +0000
+
+meld (0.6.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ross Burton <ross at burtonini.com> Thu, 30 Jan 2003 11:25:00 +0000
+
+meld (0.6.3-2) unstable; urgency=low
+
+ * Fix directory diff with a patch from upstream. (closes: #169875)
+
+ -- Ross Burton <ross at burtonini.com> Sat, 21 Dec 2002 15:18:12 +0000
+
+meld (0.6.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Require a specific version of python-gtk2, as we expect the new
+ layout. (closes: #172048)
+
+ -- Ross Burton <ross at burtonini.com> Sun, 15 Dec 2002 16:55:56 +0000
+
+meld (0.6.2-1) unstable; urgency=low
+
+ * New upstream release (closes: #171018)
+ * This release has included some missing images (closes: #169875)
+
+ -- Ross Burton <ross at burtonini.com> Wed, 27 Nov 2002 12:37:17 +0000
+
+meld (0.6.1-1) unstable; urgency=low
+
+ * Initial Release. (closes: #163421)
+
+ -- Ross Burton <ross at burtonini.com> Wed, 13 Nov 2002 08:31:18 +0000
Added: packages/unstable/meld/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/compat?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/compat (added)
+++ packages/unstable/meld/debian/compat Fri Apr 27 09:22:48 2007
@@ -1,0 +1,1 @@
+4
Added: packages/unstable/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/control (added)
+++ packages/unstable/meld/debian/control Fri Apr 27 09:22:48 2007
@@ -1,0 +1,15 @@
+Source: meld
+Section: gnome
+Priority: optional
+Maintainer: Ross Burton <ross at debian.org>
+Build-Depends: debhelper (>= 4.1.25), cdbs
+Build-Depends-Indep: python-dev, python-support (>= 0.4.0), intltool, scrollkeeper
+Standards-Version: 3.7.2
+
+Package: meld
+Architecture: all
+Depends: ${python:Depends}, python-gtk2 (>=2.4), python-glade2 (>= 2.4), python-gnome2
+Recommends: python-gnome2-extras
+Description: graphical tool to diff and merge files
+ Meld is a tool which allows the user to see the changes in, and merge between,
+ either two files, two directories, or two files with a common ancestor.
Added: packages/unstable/meld/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/copyright?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/copyright (added)
+++ packages/unstable/meld/debian/copyright Fri Apr 27 09:22:48 2007
@@ -1,0 +1,25 @@
+This package was debianized by Ross Burton <ross at debian.org> on
+Fri, 20 Sep 2002 18:46:55 +0100.
+
+It was downloaded from http://meld.sf.net/
+
+Upstream Author: Stephen Kennedy <steve9000 at users.sourceforge.net>
+
+Copyright:
+
+ 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; version 2 dated June, 1991.
+
+ 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 GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Added: packages/unstable/meld/debian/meld.1
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/meld.1?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/meld.1 (added)
+++ packages/unstable/meld/debian/meld.1 Fri Apr 27 09:22:48 2007
@@ -1,0 +1,31 @@
+.\" Hey, EMACS: -*- nroff -*-
+.TH MELD 1 "September 20, 2002"
+.SH NAME
+meld \- compare and merge files
+.SH SYNOPSIS
+.B meld
+.RI "directory"
+.br
+.B meld
+.RI "file1 file2 [file3]"
+.SH DESCRIPTION
+This manual page documents briefly the
+.B meld
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+\fBmeld\fP is a program that graphically displays the difference
+between two files, and allows the user to merge the changes
+individually. It also does three-way merge, that is it shows the
+differences between two files which have a common ancestor, and allows
+the user to merge both sets of changes into a new file.
+.PP
+Meld can also be used with CVS, allowing you to view the changes
+you have made locally and merge with the latest revision available.
+.SH SEE ALSO
+.BR diff (1),
+.BR cvs (1).
+.SH AUTHOR
+This manual page was written by Ross Burton <ross at debian.org>, for the
+Debian GNU/Linux system (but may be used by others).
Added: packages/unstable/meld/debian/menu
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/menu?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/menu (added)
+++ packages/unstable/meld/debian/menu Fri Apr 27 09:22:48 2007
@@ -1,0 +1,2 @@
+?package(meld):needs="X11" section="Apps/Programming" \
+ title="Meld" command="/usr/bin/meld"
Added: packages/unstable/meld/debian/patches/makefile.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/makefile.diff?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/makefile.diff (added)
+++ packages/unstable/meld/debian/patches/makefile.diff Fri Apr 27 09:22:48 2007
@@ -1,0 +1,13 @@
+--- GNUmakefile 2005-01-25 14:29:10.000000000 +0000
++++ GNUmakefile.new 2005-01-25 14:30:05.000000000 +0000
+@@ -51,8 +51,8 @@
+ $(DESTDIR)$(sharedir)/application-registry/meld.applications
+ install -m 644 meld.desktop \
+ $(DESTDIR)$(sharedir)/applications
+- $(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
+- $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
++ #$(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
++ #$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")'
+ install -m 644 \
+ glade2/*.glade \
+ $(DESTDIR)$(sharedir_)/glade2
Added: packages/unstable/meld/debian/patches/plurals.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/plurals.patch?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/plurals.patch (added)
+++ packages/unstable/meld/debian/patches/plurals.patch Fri Apr 27 09:22:48 2007
@@ -1,0 +1,172 @@
+diff -ru meld-1.1.4.orig/po/hu.po meld-1.1.4/po/hu.po
+--- meld-1.1.4.orig/po/hu.po 2006-02-25 00:19:25.000000000 +0000
++++ meld-1.1.4/po/hu.po 2007-04-27 10:10:04.000000000 +0100
+@@ -99,49 +99,42 @@
+ msgid "%i second"
+ msgid_plural "%i seconds"
+ msgstr[0] "%i másodperc"
+-msgstr[1] "%i másodperc"
+
+ #: ../dirdiff.py:570
+ #, python-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i perc"
+-msgstr[1] "%i perc"
+
+ #: ../dirdiff.py:571
+ #, python-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+ msgstr[0] "%i óra"
+-msgstr[1] "%i óra"
+
+ #: ../dirdiff.py:572
+ #, python-format
+ msgid "%i day"
+ msgid_plural "%i days"
+ msgstr[0] "%i nap"
+-msgstr[1] "%i nap"
+
+ #: ../dirdiff.py:573
+ #, python-format
+ msgid "%i week"
+ msgid_plural "%i weeks"
+ msgstr[0] "%i hét"
+-msgstr[1] "%i hét"
+
+ #: ../dirdiff.py:574
+ #, python-format
+ msgid "%i month"
+ msgid_plural "%i months"
+ msgstr[0] "%i hónap"
+-msgstr[1] "%i hónap"
+
+ #: ../dirdiff.py:575
+ #, python-format
+ msgid "%i year"
+ msgid_plural "%i years"
+ msgstr[0] "%i év"
+-msgstr[1] "%i év"
+
+ #. Abbreviation for insert,overwrite so that it will fit in the status bar
+ #: ../filediff.py:214
+diff -ru meld-1.1.4.orig/po/ja.po meld-1.1.4/po/ja.po
+--- meld-1.1.4.orig/po/ja.po 2006-03-05 11:03:44.000000000 +0000
++++ meld-1.1.4/po/ja.po 2007-04-27 10:09:52.000000000 +0100
+@@ -97,49 +97,42 @@
+ msgid "%i second"
+ msgid_plural "%i seconds"
+ msgstr[0] "%i 秒"
+-msgstr[1] "%i 秒"
+
+ #: ../dirdiff.py:570
+ #, python-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "%i 分"
+-msgstr[1] "%i 分"
+
+ #: ../dirdiff.py:571
+ #, python-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+ msgstr[0] "%i 時間"
+-msgstr[1] "%i 時間"
+
+ #: ../dirdiff.py:572
+ #, python-format
+ msgid "%i day"
+ msgid_plural "%i days"
+ msgstr[0] "%i æ—¥"
+-msgstr[1] "%i æ—¥"
+
+ #: ../dirdiff.py:573
+ #, python-format
+ msgid "%i week"
+ msgid_plural "%i weeks"
+ msgstr[0] "%i 週間"
+-msgstr[1] "%i 週間"
+
+ #: ../dirdiff.py:574
+ #, python-format
+ msgid "%i month"
+ msgid_plural "%i months"
+ msgstr[0] "%i ヶ月"
+-msgstr[1] "%i ヶ月"
+
+ #: ../dirdiff.py:575
+ #, python-format
+ msgid "%i year"
+ msgid_plural "%i years"
+ msgstr[0] "%i å¹´"
+-msgstr[1] "%i å¹´"
+
+ #. Abbreviation for insert,overwrite so that it will fit in the status bar
+ #: ../filediff.py:215
+diff -ru meld-1.1.4.orig/po/ru.po meld-1.1.4/po/ru.po
+--- meld-1.1.4.orig/po/ru.po 2005-10-25 23:58:09.000000000 +0100
++++ meld-1.1.4/po/ru.po 2007-04-27 10:09:34.000000000 +0100
+@@ -187,7 +187,7 @@
+ "%s."
+
+ #: ../dirdiff.py:570
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i second"
+ msgid_plural "%i seconds"
+ msgstr[0] "Ñекунда"
+@@ -195,7 +195,7 @@
+ msgstr[2] "Ñекунд"
+
+ #: ../dirdiff.py:571
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i minute"
+ msgid_plural "%i minutes"
+ msgstr[0] "минута"
+@@ -203,7 +203,7 @@
+ msgstr[2] "минут"
+
+ #: ../dirdiff.py:572
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i hour"
+ msgid_plural "%i hours"
+ msgstr[0] "чаÑ"
+@@ -211,7 +211,7 @@
+ msgstr[2] "чаÑов"
+
+ #: ../dirdiff.py:573
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i day"
+ msgid_plural "%i days"
+ msgstr[0] "день"
+@@ -219,7 +219,7 @@
+ msgstr[2] "дней"
+
+ #: ../dirdiff.py:574
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i week"
+ msgid_plural "%i weeks"
+ msgstr[0] "неделÑ"
+@@ -227,7 +227,7 @@
+ msgstr[2] "недель"
+
+ #: ../dirdiff.py:575
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i month"
+ msgid_plural "%i months"
+ msgstr[0] "меÑÑц"
+@@ -235,7 +235,7 @@
+ msgstr[2] "меÑÑцев"
+
+ #: ../dirdiff.py:576
+-#, python-format
++#, fuzzy, python-format
+ msgid "%i year"
+ msgid_plural "%i years"
+ msgstr[0] "год"
Added: packages/unstable/meld/debian/patches/scrollkeeper.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/scrollkeeper.diff?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/scrollkeeper.diff (added)
+++ packages/unstable/meld/debian/patches/scrollkeeper.diff Fri Apr 27 09:22:48 2007
@@ -1,0 +1,99 @@
+Index: help/GNUmakefile
+===================================================================
+RCS file: /cvs/gnome/meld/help/GNUmakefile,v
+retrieving revision 1.4
+diff -u -r1.4 GNUmakefile
+--- help/GNUmakefile 19 Oct 2005 21:16:50 -0000 1.4
++++ help/GNUmakefile 3 Mar 2006 11:00:37 -0000
+@@ -1,7 +1,7 @@
+
+ .SUFFIXES :
+
+-LANGUAGES := C
++LANGUAGES := C es
+
+ .PHONY : all install uninstall clean
+
+Index: help/C/GNUmakefile
+===================================================================
+RCS file: /cvs/gnome/meld/help/C/GNUmakefile,v
+retrieving revision 1.3
+diff -u -r1.3 GNUmakefile
+--- help/C/GNUmakefile 28 Jan 2006 21:43:57 -0000 1.3
++++ help/C/GNUmakefile 3 Mar 2006 11:00:37 -0000
+@@ -10,7 +10,7 @@
+
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
++ scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME) $(OMF_NAME).install
+
+ .PHONY : install
+ install : $(OMF_NAME).install
+@@ -18,7 +18,7 @@
+ install -m 644 meld.xml $(XML_DIR_)/meld.xml
+ install -m 644 figures/*.png $(XML_DIR_)/figures
+ -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
+- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
++# -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
+
+ .PHONY : uninstall
+ uninstall :
+Index: help/C/meld-C.omf
+===================================================================
+RCS file: /cvs/gnome/meld/help/C/meld-C.omf,v
+retrieving revision 1.1
+diff -u -r1.1 meld-C.omf
+--- help/C/meld-C.omf 28 Oct 2004 18:24:03 -0000 1.1
++++ help/C/meld-C.omf 3 Mar 2006 11:00:37 -0000
+@@ -20,7 +20,7 @@
+ identifier="0.9.4"
+ date="2004"/>
+ <subject
+- category="GNOME|Application|Development"/>
++ category="Application|Development"/>
+ <description>
+ This document describes the use of meld, a graphical diff, merge,
+ cvs and subversion tool.
+Index: help/es/GNUmakefile
+===================================================================
+RCS file: /cvs/gnome/meld/help/es/GNUmakefile,v
+retrieving revision 1.2
+diff -u -r1.2 GNUmakefile
+--- help/es/GNUmakefile 28 Jan 2006 21:44:02 -0000 1.2
++++ help/es/GNUmakefile 3 Mar 2006 11:00:37 -0000
+@@ -10,15 +10,15 @@
+
+ .PHONY : all
+ all $(OMF_NAME).install : $(OMF_NAME)
+- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
++ scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME) $(OMF_NAME).install
+
+ .PHONY : install
+ install : $(OMF_NAME).install
+ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
+- install -m 644 meld.xml $(XML_DIR_)/meld.xml
++ install -m 644 meld.es.xml $(XML_DIR_)/meld.xml
+ install -m 644 figures/*.png $(XML_DIR_)/figures
+ -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
+- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
++# -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
+
+ .PHONY : uninstall
+ uninstall :
+Index: help/es/meld-es.omf
+===================================================================
+RCS file: /cvs/gnome/meld/help/es/meld-es.omf,v
+retrieving revision 1.1
+diff -u -r1.1 meld-es.omf
+--- help/es/meld-es.omf 14 Jul 2005 19:32:11 -0000 1.1
++++ help/es/meld-es.omf 3 Mar 2006 11:00:37 -0000
+@@ -20,7 +20,7 @@
+ identifier="0.9.4"
+ date="2004"/>
+ <subject
+- category="GNOME|Application|Development"/>
++ category="Application|Development"/>
+ <description>
+ Este documento describe el uso de meld, una herramienta gráfica para diff, merge cvs y subversion.
+ </description>
Added: packages/unstable/meld/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/postinst?rev=10508&op=file
==============================================================================
(empty)
Added: packages/unstable/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/rules?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/rules (added)
+++ packages/unstable/meld/debian/rules Fri Apr 27 09:22:48 2007
@@ -1,0 +1,18 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+DEB_INSTALL_CHANGELOGS_ALL := changelog
+
+DEB_MAKE_BUILD_TARGET := prefix=/usr all
+DEB_MAKE_INSTALL_TARGET := prefix=/usr DESTDIR=$(CURDIR)/debian/meld install
+DEB_INSTALL_MANPAGES_meld := debian/meld.1
+
+binary-install/meld::
+ dh_pysupport -p$(cdbs_curpkg)
+ dh_scrollkeeper -p$(cdbs_curpkg)
+
+binary-post-install/meld::
+ rm -rf debian/meld/usr/share/application-registry
Propchange: packages/unstable/meld/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/unstable/meld/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/watch?rev=10508&op=file
==============================================================================
--- packages/unstable/meld/debian/watch (added)
+++ packages/unstable/meld/debian/watch Fri Apr 27 09:22:48 2007
@@ -1,0 +1,2 @@
+version=2
+http://ftp.gnome.org/pub/gnome/sources/meld/([\d\.]+)/meld-([\d\.]+)\.tar\.gz
More information about the pkg-gnome-commits
mailing list