r25218 - in /packages/unstable/gazpacho/debian: changelog control control.in patches/01_site-packages_check.patch patches/02_about_dialog_license.diff patches/02_about_dialog_license.patch pycompat

Tue Sep 28 11:34:04 UTC 2010

Author: pochu
Date: Tue Sep 28 11:33:56 2010
New Revision: 25218

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25218
Log:
* debian/pycompat:
  - Removed, it's useless.
* debian/patches/01_site-packages_check.patch:
  - Remove stupid check for site-packages. Makes gazpacho run
    with python 2.6. Closes: #598321.
* debian/patches/02_about_dialog_license.diff:
  - Renamed to debian/patches/02_about_dialog_license.patch.
* debian/control.in:
  - Stop build depending on python-all-dev, it's not needed.

Added:
    packages/unstable/gazpacho/debian/patches/01_site-packages_check.patch
    packages/unstable/gazpacho/debian/patches/02_about_dialog_license.patch
      - copied, changed from r25201, packages/unstable/gazpacho/debian/patches/02_about_dialog_license.diff
Removed:
    packages/unstable/gazpacho/debian/patches/02_about_dialog_license.diff
    packages/unstable/gazpacho/debian/pycompat
Modified:
    packages/unstable/gazpacho/debian/changelog
    packages/unstable/gazpacho/debian/control
    packages/unstable/gazpacho/debian/control.in

Modified: packages/unstable/gazpacho/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/debian/changelog?rev=25218&op=diff
==============================================================================

--- packages/unstable/gazpacho/debian/changelog [utf-8] (original)
+++ packages/unstable/gazpacho/debian/changelog [utf-8] Tue Sep 28 11:33:56 2010
@@ -1,12 +1,24 @@
-gazpacho (0.7.2-3) UNRELEASED; urgency=low
-
+gazpacho (0.7.2-3) unstable; urgency=low
+
+  [ Loic Minier ]
   * Wrap build-deps and deps.
   * Add ${misc:Depends}.
   * Bump up Standards-Version to 3.8.0.
   * Drop preinst with upgrade snippet from pre-etch.
   * Use Applications instead of Apps in menu file.
 
- -- Loic Minier <lool at dooz.org>  Sun, 28 Dec 2008 21:47:25 +0100
+  [ Emilio Pozuelo Monfort ]
+  * debian/pycompat:
+    - Removed, it's useless.
+  * debian/patches/01_site-packages_check.patch:
+    - Remove stupid check for site-packages. Makes gazpacho run
+      with python 2.6. Closes: #598321.
+  * debian/patches/02_about_dialog_license.diff:
+    - Renamed to debian/patches/02_about_dialog_license.patch.
+  * debian/control.in:
+    - Stop build depending on python-all-dev, it's not needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 28 Sep 2010 13:16:42 +0200
 
 gazpacho (0.7.2-2) unstable; urgency=low
 

Modified: packages/unstable/gazpacho/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/debian/control?rev=25218&op=diff
==============================================================================
--- packages/unstable/gazpacho/debian/control [utf-8] (original)
+++ packages/unstable/gazpacho/debian/control [utf-8] Tue Sep 28 11:33:56 2010
@@ -1,8 +1,13 @@
+# 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: gazpacho
 Section: devel
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: gnome-pkg-tools,
                cdbs (>= 0.4.43),
                debhelper (>= 5.0.37.2),
@@ -10,7 +15,6 @@
                python-support (>= 0.3),
                python-kiwi,
                python-setuptools
-Build-Depends-Indep: python-all-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/gazpacho/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/?op=log

Modified: packages/unstable/gazpacho/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/debian/control.in?rev=25218&op=diff
==============================================================================
--- packages/unstable/gazpacho/debian/control.in [utf-8] (original)
+++ packages/unstable/gazpacho/debian/control.in [utf-8] Tue Sep 28 11:33:56 2010
@@ -10,7 +10,6 @@
                python-support (>= 0.3),
                python-kiwi,
                python-setuptools
-Build-Depends-Indep: python-all-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/gazpacho/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/?op=log

Added: packages/unstable/gazpacho/debian/patches/01_site-packages_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/debian/patches/01_site-packages_check.patch?rev=25218&op=file
==============================================================================
--- packages/unstable/gazpacho/debian/patches/01_site-packages_check.patch (added)
+++ packages/unstable/gazpacho/debian/patches/01_site-packages_check.patch [utf-8] Tue Sep 28 11:33:56 2010
@@ -1,0 +1,28 @@
+--- a/bin/gazpacho
++++ b/bin/gazpacho
+@@ -45,25 +45,6 @@
+ currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+ basedir = os.path.abspath(os.path.join(currentdir, '..'))
+ 
+-# Add the base directory where the application is installed in to sys.path
+-if os.path.exists(os.path.join(basedir, 'lib')):
+-    if sys.platform == 'win32':
+-        pythondir = os.path.join(basedir, 'Lib', 'site-packages')
+-    else:
+-        pythondir = os.path.join(basedir, 'lib',
+-                                 'python%d.%d' % sys.version_info[:2],
+-                                 'site-packages')
+-    if not os.path.exists(pythondir):
+-        raise SystemExit("ERROR: Could not find required directory: %s" %
+-                         pythondir)
+-elif not os.path.exists(os.path.join(basedir, dirname)):
+-    raise SystemExit("ERROR: Could not find required directory: %s" %
+-                     os.path.join(basedir, dirname))
+-else:
+-    pythondir = basedir
+-
+-sys.path.insert(0, pythondir)
+-
+ from gazpacho import main
+ 
+ try:

Copied: packages/unstable/gazpacho/debian/patches/02_about_dialog_license.patch (from r25201, packages/unstable/gazpacho/debian/patches/02_about_dialog_license.diff)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gazpacho/debian/patches/02_about_dialog_license.patch?rev=25218&op=diff
==============================================================================
--- packages/unstable/gazpacho/debian/patches/02_about_dialog_license.diff [utf-8] (original)
+++ packages/unstable/gazpacho/debian/patches/02_about_dialog_license.patch [utf-8] Tue Sep 28 11:33:56 2010
@@ -1,6 +1,6 @@
---- gazpacho/app/app.py~	2006-05-03 15:41:05.000000000 -0300
-+++ gazpacho/app/app.py	2006-05-07 15:28:08.000000000 -0300
-@@ -1141,7 +1141,7 @@
+--- a/gazpacho/app/app.py
++++ b/gazpacho/app/app.py
+@@ -1187,7 +1187,7 @@
          contributorsfile = file(environ.find_resource('doc', 'CONTRIBUTORS'))
          authors.extend([c.strip() for c in contributorsfile.readlines()[:-2]])
          about.set_authors(authors)


