r23936 - in /packages/unstable/meld/debian: changelog control patches/series patches/sourceview-package.patch pycompat rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Wed Apr 21 17:17:44 UTC 2010 

Author: pochu
Date: Wed Apr 21 17:17:44 2010
New Revision: 23936

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23936
Log:
* debian/source/format,
  debian/patches/series,
  debian/rules:
  - Convert to source format 3.0 (quilt).
* debian/patches/sourceview-package.patch:
  - Refreshed to apply cleanly.
* debian/pycompat:
  - Removed, not needed.

Added:
    packages/unstable/meld/debian/patches/series
    packages/unstable/meld/debian/source/
    packages/unstable/meld/debian/source/format
Removed:
    packages/unstable/meld/debian/pycompat
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/control
    packages/unstable/meld/debian/patches/sourceview-package.patch
    packages/unstable/meld/debian/rules

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=23936&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Wed Apr 21 17:17:44 2010
@@ -1,5 +1,6 @@
 meld (1.3.1-1) unstable; urgency=low
 
+  [ Balint Reczey ]
   * New upstream release (Closes: #562989)
     - Speed up file comparisons and highlighting, significantly improving
       interactive editing performance (Closes: #309070)
@@ -18,6 +19,16 @@
     - Recommend python-gtksourceview2 (Closes: #544840)
     - Add Vcs-* fields
     - Standards-Version is 3.8.4, no changes needed.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/source/format,
+    debian/patches/series,
+    debian/rules:
+    - Convert to source format 3.0 (quilt).
+  * debian/patches/sourceview-package.patch:
+    - Refreshed to apply cleanly.
+  * debian/pycompat:
+    - Removed, not needed.
 
  -- Balint Reczey <balint at balintreczey.hu>  Tue, 20 Apr 2010 00:27:49 +0200
 

Modified: packages/unstable/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control?rev=23936&op=diff
==============================================================================
--- packages/unstable/meld/debian/control [utf-8] (original)
+++ packages/unstable/meld/debian/control [utf-8] Wed Apr 21 17:17:44 2010
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: meld
 Section: gnome
 Priority: optional
@@ -9,7 +14,7 @@
                      python-support (>= 0.4.0),
                      intltool,
                      scrollkeeper
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Loic Minier <lool at dooz.org>, Balint Reczey <balint at balintreczey.hu>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Loic Minier <lool at dooz.org>
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/meld
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/

Added: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=23936&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/series (added)
+++ packages/unstable/meld/debian/patches/series [utf-8] Wed Apr 21 17:17:44 2010
@@ -1,0 +1,1 @@
+sourceview-package.patch

Modified: packages/unstable/meld/debian/patches/sourceview-package.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/sourceview-package.patch?rev=23936&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/sourceview-package.patch [utf-8] (original)
+++ packages/unstable/meld/debian/patches/sourceview-package.patch [utf-8] Wed Apr 21 17:17:44 2010
@@ -1,7 +1,7 @@
 === modified file 'meldapp.py'
---- meldapp.py	2009-06-02 09:05:19 +0000
-+++ meldapp.py	2009-06-02 09:07:06 +0000
-@@ -218,7 +218,7 @@
+--- a/meldapp.py
++++ b/meldapp.py
+@@ -216,7 +216,7 @@
              self.checkbutton_show_line_numbers.set_sensitive(False)
              self.checkbutton_use_syntax_highlighting.set_sensitive(False)
              if gtk.pygtk_version >= (2, 12, 0):
@@ -10,4 +10,3 @@
                  self.checkbutton_spaces_instead_of_tabs.set_tooltip_text(no_sourceview_text)
                  self.checkbutton_show_line_numbers.set_tooltip_text(no_sourceview_text)
                  self.checkbutton_use_syntax_highlighting.set_tooltip_text(no_sourceview_text)
-

Modified: packages/unstable/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/rules?rev=23936&op=diff
==============================================================================
--- packages/unstable/meld/debian/rules [utf-8] (original)
+++ packages/unstable/meld/debian/rules [utf-8] Wed Apr 21 17:17:44 2010
@@ -1,7 +1,6 @@
 #!/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
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk

Added: packages/unstable/meld/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/source/format?rev=23936&op=file
==============================================================================
--- packages/unstable/meld/debian/source/format (added)
+++ packages/unstable/meld/debian/source/format [utf-8] Wed Apr 21 17:17:44 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list