r42081 - in /packages/unstable/meld/debian: changelog control control.in patches/empty-directory.patch patches/python-path.patch patches/series patches/sourceview-package.patch rules

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sun Jul 20 08:56:26 UTC 2014 

Author: rbalint
Date: Sun Jul 20 08:56:26 2014
New Revision: 42081

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42081
Log:
Revert to packaging 1.8.x for unstable

Added:
    packages/unstable/meld/debian/patches/empty-directory.patch
      - copied unchanged from r40719, packages/unstable/meld/debian/patches/empty-directory.patch
    packages/unstable/meld/debian/patches/sourceview-package.patch
      - copied unchanged from r40719, packages/unstable/meld/debian/patches/sourceview-package.patch
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/control
    packages/unstable/meld/debian/control.in
    packages/unstable/meld/debian/patches/python-path.patch
    packages/unstable/meld/debian/patches/series
    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=42081&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog	[utf-8] (original)
+++ packages/unstable/meld/debian/changelog	[utf-8] Sun Jul 20 08:56:26 2014
@@ -1,37 +1,3 @@
-meld (3.11.0-1) UNRELEASED; urgency=low
-
-  * New upstream release:
-    - Features:
-      * Supporting hiding empty filtered folders in folder comparison
-        (Gianni Trovisi, Kai Willadsen)
-      * Notify user when files change externally in file comparison
-        (Kai Willadsen)
-      * Use standard GIO file trash handling when deleting files (Kai Willadsen)
-      * Newly written Mallard-based help (Kai Willadsen)
-    - User interface updates:
-      * Support GNOME 3-style application menu (Kai Willadsen)
-      * Visual improvements to several icons (Kai Willadsen)
-      * Update Meld's colour scheme (Kai Willadsen)
-      * Many visual styling updates, layout tweaks and UI polish (Kai Willadsen)
-    - Internal changes:
-      * Port to GObject introspection, GTK+ 3, GApplication, GSettings and other
-        new things starting with 'G' (Kai Willadsen)
-      * Port to distutils, based on python-distutils-extra (Kai Willadsen)
-      * Move to using CSS for styling and colour definitions (Kai Willadsen)
-      * Update to use more modern GTK widgets (Peter Tyser, Kai Willadsen)
-      * Move a lot of extra UI construction into glade/UI files (Kai Willadsen)
-      * Make several custom icons themeable (Kai Willadsen)
-      * Make Meld a single-instance application, and add support for multiple
-        windows (Kai Willadsen)
-  * Update dependencies to use GTK 3 libraries and GObject introspection,
-    namely libgtk-3-0, python-gi, libgtksourceview-3.0-1,
-    gir1.2-gtksource-3.0, python-gi-cairo and libcanberra-gtk3-module
-  * Depend on GtkSourceView instead of just recommending it
-  * Build depend on dh-python, itstool and libxml2-utils
-  * Drop obsolete empty-directory.patch and sourceview-package.patch patches
-
- -- Balint Reczey <balint at balintreczey.hu>  Thu, 23 Jan 2014 21:03:05 +0100
-
 meld (1.8.4-1) unstable; urgency=low
 
   * New upstream release:

Modified: packages/unstable/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control?rev=42081&op=diff
==============================================================================
--- packages/unstable/meld/debian/control	[utf-8] (original)
+++ packages/unstable/meld/debian/control	[utf-8] Sun Jul 20 08:56:26 2014
@@ -9,12 +9,9 @@
 Maintainer: Balint Reczey <balint at balintreczey.hu>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.90~),
-               python (>=2.6.6-3~),
-               dh-python,
-               itstool,
-               libxml2-utils,
                gnome-pkg-tools
-Build-Depends-Indep: intltool,
+Build-Depends-Indep: python (>=2.6.6-3~),
+                     intltool,
                      scrollkeeper
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Standards-Version: 3.9.5
@@ -27,15 +24,14 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         libgtk-3-0 (>= 3.6),
-         python-gi (>= 3.8),
-         libgtksourceview-3.0-1 (>= 3.6),
-         gir1.2-gtksource-3.0 (>= 3.6),
-         python-gi-cairo,
-         libcanberra-gtk3-module,
+         python-gtk2 (>= 2.14),
+         python-glade2 (>= 2.14),
+         python-gobject-2 (>= 2.16),
          patch
 Recommends: yelp,
-            gir1.2-gconf-2.0,
+            python-gnome2,
+            python-gconf,
+            python-gtksourceview2 (>= 2.4)
 Description: graphical tool to diff and merge files
  Meld  is  a  graphical  diff viewer and merge application for the Gnome
  desktop.  It supports 2 and 3-file diffs,  recursive  directory  diffs,

Modified: packages/unstable/meld/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control.in?rev=42081&op=diff
==============================================================================
--- packages/unstable/meld/debian/control.in	[utf-8] (original)
+++ packages/unstable/meld/debian/control.in	[utf-8] Sun Jul 20 08:56:26 2014
@@ -4,12 +4,9 @@
 Maintainer: Balint Reczey <balint at balintreczey.hu>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.90~),
-               python (>=2.6.6-3~),
-               dh-python,
-               itstool,
-               libxml2-utils,
                gnome-pkg-tools
-Build-Depends-Indep: intltool,
+Build-Depends-Indep: python (>=2.6.6-3~),
+                     intltool,
                      scrollkeeper
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.5
@@ -22,15 +19,14 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         libgtk-3-0 (>= 3.6),
-         python-gi (>= 3.8),
-         libgtksourceview-3.0-1 (>= 3.6),
-         gir1.2-gtksource-3.0 (>= 3.6),
-         python-gi-cairo,
-         libcanberra-gtk3-module,
+         python-gtk2 (>= 2.14),
+         python-glade2 (>= 2.14),
+         python-gobject-2 (>= 2.16),
          patch
 Recommends: yelp,
-            gir1.2-gconf-2.0,
+            python-gnome2,
+            python-gconf,
+            python-gtksourceview2 (>= 2.4)
 Description: graphical tool to diff and merge files
  Meld  is  a  graphical  diff viewer and merge application for the Gnome
  desktop.  It supports 2 and 3-file diffs,  recursive  directory  diffs,

Modified: packages/unstable/meld/debian/patches/python-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/python-path.patch?rev=42081&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/python-path.patch	[utf-8] (original)
+++ packages/unstable/meld/debian/patches/python-path.patch	[utf-8] Sun Jul 20 08:56:26 2014
@@ -6,5 +6,5 @@
 -#! /usr/bin/env python
 +#!/usr/bin/python
  
- # Copyright (C) 2002-2006 Stephen Kennedy <stevek at gnome.org>
- # Copyright (C) 2009-2014 Kai Willadsen <kai.willadsen at gmail.com>
+ ### Copyright (C) 2002-2006 Stephen Kennedy <stevek at gnome.org>
+ 

Modified: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=42081&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/series	[utf-8] (original)
+++ packages/unstable/meld/debian/patches/series	[utf-8] Sun Jul 20 08:56:26 2014
@@ -1 +1,3 @@
+empty-directory.patch
+sourceview-package.patch
 python-path.patch

Modified: packages/unstable/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/rules?rev=42081&op=diff
==============================================================================
--- packages/unstable/meld/debian/rules	[utf-8] (original)
+++ packages/unstable/meld/debian/rules	[utf-8] Sun Jul 20 08:56:26 2014
@@ -1,14 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_PYTHON2_MODULE_PACKAGES=meld
-include /usr/share/cdbs/1/class/python-distutils.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
 
+DEB_MAKE_INVOKE += prefix=/usr
+DEB_MAKE_BUILD_TARGET := all
+DEB_MAKE_INSTALL_TARGET := DESTDIR=$(CURDIR)/debian/meld install
+
+binary-install/meld::
+	dh_python2 -p$(cdbs_curpkg)
 
 binary-post-install/meld::
-	rm -rf debian/$(cdbs_curpkg)/usr/share/doc/meld-* \
-		debian/$(cdbs_curpkg)/usr/share/meld/icons/COPYING \
-		debian/$(cdbs_curpkg)/usr/share/pyshared/meld/vc/COPYING
-
+	rm -rf debian/$(cdbs_curpkg)/usr/share/application-registry

More information about the pkg-gnome-commits mailing list