r11917 - in /packages/experimental/software-properties/debian: changelog control control.in patches/ patches/00_setup_py_for_new_distutils_extra.diff

kov at users.alioth.debian.org kov at users.alioth.debian.org
Thu Jul 12 00:55:22 UTC 2007 

Author: kov
Date: Thu Jul 12 00:55:22 2007
New Revision: 11917

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11917
Log:
python-distutils-extra 1.90 is now in Debian, and is API incompatible;
make sure we use it to build, and that we use the new API

Added:
    packages/experimental/software-properties/debian/patches/
    packages/experimental/software-properties/debian/patches/00_setup_py_for_new_distutils_extra.diff
Modified:
    packages/experimental/software-properties/debian/changelog
    packages/experimental/software-properties/debian/control
    packages/experimental/software-properties/debian/control.in

Modified: packages/experimental/software-properties/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/software-properties/debian/changelog?rev=11917&op=diff
==============================================================================
--- packages/experimental/software-properties/debian/changelog (original)
+++ packages/experimental/software-properties/debian/changelog Thu Jul 12 00:55:22 2007
@@ -3,8 +3,11 @@
   * debian/copyright:
   - fix documentation licensing information so that it references
     the file in /usr/share/common-licenses
-
- -- Gustavo Noronha Silva <kov at debian.org>  Wed, 11 Jul 2007 21:19:19 -0300
+  * debian/control.in, debian/patches/00_setup_py_for_new_distutils_extra.diff:
+  - python-distutils-extra 1.90 is now in Debian, and is API incompatible;
+    make sure we use it to build, and that we use the new API
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed, 11 Jul 2007 21:54:59 -0300
 
 software-properties (0.59.4-1) experimental; urgency=low
 

Modified: packages/experimental/software-properties/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/software-properties/debian/control?rev=11917&op=diff
==============================================================================
--- packages/experimental/software-properties/debian/control (original)
+++ packages/experimental/software-properties/debian/control Thu Jul 12 00:55:22 2007
@@ -4,7 +4,7 @@
 XS-Python-Version: >= 2.4
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Build-Depends: gnome-pkg-tools, debhelper (>= 5.0.37.2), python-support (>= 0.6.4), libxml-parser-perl, scrollkeeper, intltool, python-all-dev, python-distutils-extra, cdbs (>= 0.4.42)
+Build-Depends: gnome-pkg-tools, debhelper (>= 5.0.37.2), python-support (>= 0.6.4), libxml-parser-perl, scrollkeeper, intltool, python-all-dev, python-distutils-extra (>= 1.90), cdbs (>= 0.4.42)
 Standards-Version: 3.7.2
 
 Package: python-software-properties

Modified: packages/experimental/software-properties/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/software-properties/debian/control.in?rev=11917&op=diff
==============================================================================
--- packages/experimental/software-properties/debian/control.in (original)
+++ packages/experimental/software-properties/debian/control.in Thu Jul 12 00:55:22 2007
@@ -4,7 +4,7 @@
 XS-Python-Version: >= 2.4
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: gnome-pkg-tools, debhelper (>= 5.0.37.2), python-support (>= 0.6.4), libxml-parser-perl, scrollkeeper, intltool, python-all-dev, python-distutils-extra, cdbs (>= 0.4.42)
+Build-Depends: gnome-pkg-tools, debhelper (>= 5.0.37.2), python-support (>= 0.6.4), libxml-parser-perl, scrollkeeper, intltool, python-all-dev, python-distutils-extra (>= 1.90), cdbs (>= 0.4.42)
 Standards-Version: 3.7.2
 
 Package: python-software-properties

Added: packages/experimental/software-properties/debian/patches/00_setup_py_for_new_distutils_extra.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/software-properties/debian/patches/00_setup_py_for_new_distutils_extra.diff?rev=11917&op=file
==============================================================================
--- packages/experimental/software-properties/debian/patches/00_setup_py_for_new_distutils_extra.diff (added)
+++ packages/experimental/software-properties/debian/patches/00_setup_py_for_new_distutils_extra.diff Thu Jul 12 00:55:22 2007
@@ -1,0 +1,53 @@
+--- setup.cfg~	2007-04-10 08:25:05.000000000 -0300
++++ setup.cfg	2007-07-11 21:44:43.000000000 -0300
+@@ -1,13 +1,8 @@
+-[build]
+-l10n=True
+-icons=True
+-help=True
+-
+-[build_l10n]
++[build_i18n]
+ domain=software-properties
+-merge_desktop_files=[("share/applications", ("data/software-properties.desktop.in",))]
+-merge_xml_files=[("share/mime/packages", ("data/mime/apt.xml.in",))]
+-#merge_schemas_files=[(("share/gconf/schemas", (data/software-properties.schemas.in",))]
++desktop_files=[("share/applications", ("data/software-properties.desktop.in",))]
++xml_files=[("share/mime/packages", ("data/mime/apt.xml.in",))]
++#schemas_files=[(("share/gconf/schemas", (data/software-properties.schemas.in",))]
+ 
+ [sdist]
+ formats = bztar
+--- setup.py~	2007-04-10 08:25:05.000000000 -0300
++++ setup.py	2007-07-11 21:38:37.000000000 -0300
+@@ -3,8 +3,7 @@
+ from distutils.core import setup
+ import glob
+ import os
+-from DistUtilsExtra.distutils_extra import build_extra, build_l10n, \
+-                                           build_icons, build_help
++from DistUtilsExtra.command import build_extra, build_i18n, build_icons, build_help
+ 
+ setup(name='software-properties',
+       version='0.50',
+@@ -25,8 +24,8 @@
+                    glob.glob("data/glade/*.glade")
+                   ),
+                   ],
+-      cmdclass = { "build" : build_extra,
+-                   "build_l10n" :  build_l10n,
+-                   "build_help" :  build_help,
+-                   "build_icons" :  build_icons }
++      cmdclass = { "build" : build_extra.build_extra,
++                   "build_i18n" :  build_i18n.build_i18n,
++                   "build_help" :  build_help.build_help,
++                   "build_icons" :  build_icons.build_icons }
+      )
+--- po/POTFILES.in~	2007-04-10 08:25:07.000000000 -0300
++++ po/POTFILES.in	2007-07-11 21:49:31.000000000 -0300
+@@ -30,5 +30,4 @@
+ data/designer/crashdialog.ui
+ data/designer/main.ui
+ data/glade/main.glade
+-data/glade/dialog_add_channels.glade
+ data/glade/dialogs.glade

More information about the pkg-gnome-commits mailing list