r10708 - in /packages/experimental/update-manager/debian: ./ patches/ pos/

kov at users.alioth.debian.org kov at users.alioth.debian.org
Wed May 2 18:08:54 UTC 2007


Author: kov
Date: Wed May  2 18:08:52 2007
New Revision: 10708

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10708
Log:
first set of changes to bring update-manager up-to-date with
Ubuntu's

Removed:
    packages/experimental/update-manager/debian/patches/01_omf_fixage.diff
    packages/experimental/update-manager/debian/patches/02_setup_py_fixage.diff
    packages/experimental/update-manager/debian/patches/03_lsb-release-path.diff
    packages/experimental/update-manager/debian/pos/nb.po
    packages/experimental/update-manager/debian/pos/pt_BR.po
    packages/experimental/update-manager/debian/pos/ro.po
    packages/experimental/update-manager/debian/pos/sk.po
    packages/experimental/update-manager/debian/pos/sv.po
Modified:
    packages/experimental/update-manager/debian/changelog
    packages/experimental/update-manager/debian/control
    packages/experimental/update-manager/debian/control.in
    packages/experimental/update-manager/debian/patches/00_changelogs_uri.diff

Modified: packages/experimental/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/changelog?rev=10708&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/changelog (original)
+++ packages/experimental/update-manager/debian/changelog Wed May  2 18:08:52 2007
@@ -1,3 +1,23 @@
+update-manager (0.59.20-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control.in:
+  - added an update-manager-core package to contain the arch
+    specific module and other core modules, following Ubuntu's
+    way of doing it
+  * debian/patches/00_changelogs_uri.diff:
+  - updated for the current version
+  * debian/patches/01_omf_fixage.diff:
+  - removed; fix was applied upstream
+  * debian/patches/02_setup_py_fixage.diff:
+  - removed; upstream no longer has a hack for making sure the
+    mo files are updated
+  * debian/patches/03_lsb-release-path.diff:
+  - removed; upstream now calls lsb_release without a specific
+    path
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed,  2 May 2007 14:03:11 -0300
+
 update-manager (0.42.2ubuntu22-11) unstable; urgency=low
 
   * debian/manual.tar.uu, debian/rules:

Modified: packages/experimental/update-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/control?rev=10708&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/control (original)
+++ packages/experimental/update-manager/debian/control Wed May  2 18:08:52 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: gnome-pkg-tools, cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python-all (>= 2.3.5-10), python-support (>= 0.3)
 Build-Depends-Indep: libxml-parser-perl, scrollkeeper, intltool, sharutils
 Standards-Version: 3.7.2
@@ -11,7 +11,7 @@
 Package: update-manager
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, libgnome2-perl, python-gnome2 (>= 2.12.4-1), python-glade2 (>= 2.8.2-4), python-apt, python-gnupginterface (>= 0.3.2-8), synaptic, lsb-release
+Depends: ${python:Depends}, ${misc:Depends}, libgnome2-perl, python-gnome2 (>= 2.12.4-1), python-glade2 (>= 2.8.2-4), python-vte, python-dbus, synaptic, update-manager-core
 Description: GNOME application that manages software updates
  This is the GNOME software update manager. It checks for updates made
  available by Debian and third parties running Debian package
@@ -21,3 +21,10 @@
  which lets you setup the sources from which your software packages
  will be acquired, and their cryptographic keys - by editing the
  /etc/apt/sources.list file, and managing the APT keyring.
+
+Package: update-manager-core
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}, python-apt, python-gnupginterface (>= 0.3.2-8), lsb-release
+Description: APT update manager core functionality
+ This package holds the core functionality for the APT update managers.

Modified: packages/experimental/update-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/control.in?rev=10708&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/control.in (original)
+++ packages/experimental/update-manager/debian/control.in Wed May  2 18:08:52 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: gnome-pkg-tools, cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python-all (>= 2.3.5-10), python-support (>= 0.3)
+Build-Depends: gnome-pkg-tools, cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python-all (>= 2.3.5-10), python-distutils-extra, python-support (>= 0.3)
 Build-Depends-Indep: libxml-parser-perl, scrollkeeper, intltool, sharutils
 Standards-Version: 3.7.2
 XS-Python-Version: all, >= 2.4
@@ -11,7 +11,7 @@
 Package: update-manager
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, libgnome2-perl, python-gnome2 (>= 2.12.4-1), python-glade2 (>= 2.8.2-4), python-apt, python-gnupginterface (>= 0.3.2-8), synaptic, lsb-release
+Depends: ${python:Depends}, ${misc:Depends}, libgnome2-perl, python-gnome2 (>= 2.12.4-1), python-glade2 (>= 2.8.2-4), python-vte, python-dbus, synaptic, update-manager-core
 Description: GNOME application that manages software updates
  This is the GNOME software update manager. It checks for updates made
  available by Debian and third parties running Debian package
@@ -21,3 +21,10 @@
  which lets you setup the sources from which your software packages
  will be acquired, and their cryptographic keys - by editing the
  /etc/apt/sources.list file, and managing the APT keyring.
+
+Package: update-manager-core
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}, python-apt, python-gnupginterface (>= 0.3.2-8), lsb-release
+Description: APT update manager core functionality
+ This package holds the core functionality for the APT update managers.

Modified: packages/experimental/update-manager/debian/patches/00_changelogs_uri.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/patches/00_changelogs_uri.diff?rev=10708&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/patches/00_changelogs_uri.diff (original)
+++ packages/experimental/update-manager/debian/patches/00_changelogs_uri.diff Wed May  2 18:08:52 2007
@@ -1,28 +1,14 @@
---- UpdateManager/UpdateManager.py~	2006-05-24 12:14:21.000000000 -0300
-+++ UpdateManager/UpdateManager.py	2006-05-31 22:16:12.000000000 -0300
-@@ -57,6 +57,7 @@
+--- UpdateManager/UpdateManager.py~	2007-05-02 14:48:28.000000000 -0300
++++ UpdateManager/UpdateManager.py	2007-05-02 14:58:09.000000000 -0300
+@@ -84,7 +84,10 @@
  
- from Common.utils import *
- from Common.SimpleGladeApp import SimpleGladeApp
-+from Common.DistInfo import DistInfo
- from DistUpgradeFetcher import DistUpgradeFetcher
- import GtkProgress
+ SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
  
-@@ -243,12 +244,17 @@
- class UpdateManager(SimpleGladeApp):
+-CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
++from DistUpgrade.distinfo import DistInfo
++dinfo = DistInfo (base_dir=datadir+"channels/")
++CHANGELOGS_URI = dinfo.changelogs_uri
++del dinfo
  
-   def __init__(self, datadir):
-+    global CHANGELOGS_URI
-     gtk.window_set_default_icon_name("update-manager")
  
-     self.datadir = datadir
-     SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade",
-                             None, domain="update-manager")
- 
-+    dinfo = DistInfo (base_dir=datadir+"channels/")
-+    CHANGELOGS_URI = dinfo.changelogs_uri
-+    del dinfo
-+
-     self.image_logo.set_from_icon_name("update-manager", gtk.ICON_SIZE_DIALOG)
-     self.window_main.set_sensitive(False)
-     self.window_main.grab_focus()
+ class MyCache(apt.Cache):




More information about the pkg-gnome-commits mailing list