r12305 - in /packages/unstable/update-manager/debian: ./ patches/ pos/
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Fri Aug 10 01:29:57 UTC 2007
Author: kov
Date: Fri Aug 10 01:29:57 2007
New Revision: 12305
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12305
Log:
merge changes done for experimental branch back now that we're going
to ship its results in unstable
Added:
packages/unstable/update-manager/debian/changelog.ubuntu
- copied unchanged from r12304, packages/experimental/update-manager/debian/changelog.ubuntu
packages/unstable/update-manager/debian/patches/01_fhs_script_location.diff
- copied unchanged from r12304, packages/experimental/update-manager/debian/patches/01_fhs_script_location.diff
packages/unstable/update-manager/debian/patches/02_replace_dist_upgrade.diff
- copied unchanged from r12304, packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff
packages/unstable/update-manager/debian/update-manager-core.dirs
- copied unchanged from r12304, packages/experimental/update-manager/debian/update-manager-core.dirs
packages/unstable/update-manager/debian/update-manager-core.install
- copied unchanged from r12304, packages/experimental/update-manager/debian/update-manager-core.install
packages/unstable/update-manager/debian/update-manager.install
- copied unchanged from r12304, packages/experimental/update-manager/debian/update-manager.install
Removed:
packages/unstable/update-manager/debian/dirs
packages/unstable/update-manager/debian/patches/01_omf_fixage.diff
packages/unstable/update-manager/debian/patches/02_setup_py_fixage.diff
packages/unstable/update-manager/debian/patches/03_lsb-release-path.diff
packages/unstable/update-manager/debian/pos/nb.po
packages/unstable/update-manager/debian/pos/pt_BR.po
packages/unstable/update-manager/debian/pos/ro.po
packages/unstable/update-manager/debian/pos/sk.po
packages/unstable/update-manager/debian/pos/sv.po
packages/unstable/update-manager/debian/software-properties.png.uu
Modified:
packages/unstable/update-manager/debian/changelog
packages/unstable/update-manager/debian/control
packages/unstable/update-manager/debian/control.in
packages/unstable/update-manager/debian/patches/00_changelogs_uri.diff
packages/unstable/update-manager/debian/rules
Modified: packages/unstable/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/changelog?rev=12305&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/changelog (original)
+++ packages/unstable/update-manager/debian/changelog Fri Aug 10 01:29:57 2007
@@ -1,9 +1,50 @@
-update-manager (0.42.2ubuntu22-16) UNRELEASED; urgency=low
-
+update-manager (0.68.debian-1) UNRELEASED; urgency=low
+
+ [ Loic Minier ]
* Use ubuntu-get-source instead of gnome-get-source; build-dep on
gnome-pkg-tools >= 0.12.3.
- -- Loic Minier <lool at dooz.org> Tue, 31 Jul 2007 16:58:46 +0200
+ [ Gustavo Noronha Silva ]
+ * New upstream release (Closes: #422928)
+ - no longer has 'channels' handlng; moved to software-properties
+ which this version depends on; this issue has been fixed there
+ (Closes: #410521)
+ * debian/changelog.ubuntu:
+ - incorporating documentation about the changes made by Ubuntu
+ * 02_disable_dist_upgrade.diff -> 02_replace_dist_upgrade.diff:
+ - instead of disabling, we'll do what is useful for Debian: a normal
+ dist-upgrade
+ * debian/patches/01_fhs_script_location.diff:
+ - updated to reflect new line numbers
+ * debian/patches/03_setup_py_for_new_distutils_extra.diff:
+ - removed; no longer needed, fixed upstream
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 09 Aug 2007 22:07:40 -0300
+
+update-manager (0.64-2) experimental; urgency=low
+
+ [ Alan Baghumian ]
+ * Wrapped deps and build-deps
+
+ [ Gustavo Noronha Silva ]
+ * debian/patches/01_fhs_script_location.diff:
+ - updated to include places where update-manager itself calls
+ itself
+ * debian/dirs -> debian/update-manager-core.dirs:
+ - rename to make it clear what package should contain the
+ directories
+ * debian/patches/02_disable_dist_upgrade.diff:
+ - disable all the 'dist-upgrade' handling for now; we do not
+ support the meta-release magic yet (if ever)
+ * debian/patches/03_setup_py_for_new_distutils_extra.diff,
+ debian/control.in:
+ - make setup.py use the newer version of python-distutils-extra
+ * debian/rules:
+ - new version of python-distutils-extra puts files at their
+ correct location, so we don't need to move them after the
+ build
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 03 Jul 2007 22:06:11 -0300
update-manager (0.42.2ubuntu22-15) unstable; urgency=high
@@ -11,6 +52,29 @@
which makes it not work correctly for apt 0.7.2 (Closes: #431114)
-- Gustavo Noronha Silva <kov at debian.org> Tue, 03 Jul 2007 21:08:29 -0300
+
+update-manager (0.64-1) experimental; urgency=low
+
+ * New upstream release
+ - now reports errors reading the sources.list file (and any other
+ 'system' error) before quiting (Closes: #410522)
+ * debian/control:
+ - build-dep on python-dev > 2.4 instead of python-all >= 2.3,
+ thanks to Loic Minier for fixing this (Closes: #427899)
+ - update-manager-core now depends on python-apt >= 0.7.1
+ because it provides the aptsources module
+ - make update-manager-core conflict with previous versions of
+ update-manager, since they share files
+ - suggest update-notifier (Closes: #403800)
+ * debian/rules, debian/patches/01_fhs_script_location.diff:
+ - make sure the update-manager script is installed in /usr/sbin
+ (Closes: #411890)
+ * debian/control:
+ - improved update-manager-core's long description to try and make clear
+ what an update manager actually is (Closes: #423490)
+ - needs python-apt >= 0.7.2 to build
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 19 Jun 2007 13:04:34 +0100
update-manager (0.42.2ubuntu22-14) unstable; urgency=high
@@ -37,6 +101,34 @@
closes: #427899.
-- Gustavo Noronha Silva <kov at debian.org> Sat, 09 Jun 2007 11:36:59 -0300
+
+update-manager (0.59.20-1) experimental; 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
+ * debian/rules:
+ - ignore errors on the pofile handling, if no pofiles exist
+ - disable instalation of the software-properties icon and of
+ the Debianized manual for the time being;
+ - make sure the locales are installed to the correct place
+ * debian/{update-manager-core.install,update-manager.install}:
+ - added; install the correct files for both packages; imported
+ from the Ubuntu package and customized
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 5 May 2007 16:32:54 -0300
update-manager (0.42.2ubuntu22-11) unstable; urgency=low
Modified: packages/unstable/update-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/control?rev=12305&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/control (original)
+++ packages/unstable/update-manager/debian/control Fri Aug 10 01:29:57 2007
@@ -3,15 +3,34 @@
Priority: optional
Maintainer: Gustavo Noronha Silva <kov 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 (>= 0.12.3), cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python-dev (>= 2.4), python-support (>= 0.3)
-Build-Depends-Indep: libxml-parser-perl, scrollkeeper, intltool, sharutils
+Build-Depends: gnome-pkg-tools (>= 0.12.3),
+ cdbs (>= 0.4.42),
+ debhelper (>= 5.0.37.2),
+ python-all-dev (>= 2.4),
+ python-all,
+ python-distutils-extra (>= 1.90),
+ python-support (>= 0.3),
+ python-apt (>= 0.7.2)
+Build-Depends-Indep: libxml-parser-perl,
+ scrollkeeper,
+ intltool,
+ sharutils
Standards-Version: 3.7.2
XS-Python-Version: all, >= 2.4
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
+Suggests: update-notifier
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 +40,19 @@
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: any
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends},
+ ${misc:Depends},
+ python-apt (>= 0.7.1),
+ python-gnupginterface (>= 0.3.2-8),
+ lsb-release
+Conflicts: update-manager (<< 0.59.20)
+Description: APT update manager core functionality
+ This package holds the core functionality for the APT update managers
+ such as update-manager, the GNOME update manager. Update managers are
+ applications that help you keep your system up-to-date by providing a
+ nice interface in which you can see the list of updates and install
+ them using APT.
Modified: packages/unstable/update-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/control.in?rev=12305&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/control.in (original)
+++ packages/unstable/update-manager/debian/control.in Fri Aug 10 01:29:57 2007
@@ -3,15 +3,34 @@
Priority: optional
Maintainer: Gustavo Noronha Silva <kov at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: gnome-pkg-tools (>= 0.12.3), cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python-dev (>= 2.4), python-support (>= 0.3)
-Build-Depends-Indep: libxml-parser-perl, scrollkeeper, intltool, sharutils
+Build-Depends: gnome-pkg-tools (>= 0.12.3),
+ cdbs (>= 0.4.42),
+ debhelper (>= 5.0.37.2),
+ python-all-dev (>= 2.4),
+ python-all,
+ python-distutils-extra (>= 1.90),
+ python-support (>= 0.3),
+ python-apt (>= 0.7.2)
+Build-Depends-Indep: libxml-parser-perl,
+ scrollkeeper,
+ intltool,
+ sharutils
Standards-Version: 3.7.2
XS-Python-Version: all, >= 2.4
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
+Suggests: update-notifier
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 +40,19 @@
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: any
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends},
+ ${misc:Depends},
+ python-apt (>= 0.7.1),
+ python-gnupginterface (>= 0.3.2-8),
+ lsb-release
+Conflicts: update-manager (<< 0.59.20)
+Description: APT update manager core functionality
+ This package holds the core functionality for the APT update managers
+ such as update-manager, the GNOME update manager. Update managers are
+ applications that help you keep your system up-to-date by providing a
+ nice interface in which you can see the list of updates and install
+ them using APT.
Modified: packages/unstable/update-manager/debian/patches/00_changelogs_uri.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/patches/00_changelogs_uri.diff?rev=12305&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/patches/00_changelogs_uri.diff (original)
+++ packages/unstable/update-manager/debian/patches/00_changelogs_uri.diff Fri Aug 10 01:29:57 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 aptsources.distinfo import DistInfo
++dinfo = DistInfo (base_dir="/usr/share/python-apt/templates/")
++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):
Modified: packages/unstable/update-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/update-manager/debian/rules?rev=12305&op=diff
==============================================================================
--- packages/unstable/update-manager/debian/rules (original)
+++ packages/unstable/update-manager/debian/rules Fri Aug 10 01:29:57 2007
@@ -11,13 +11,13 @@
clean::
-find po/mo -name \*mo -exec rm {} \;
- for pofile in po/*.debackup; do \
+ -for pofile in po/*.debackup; do \
if [ $${pofile} = 'po/*.debackup' ]; then break; fi; \
mv $${pofile} $$(echo $${pofile} | sed 's,.debackup$$,,'); \
done
post-patches::
- for pofile in debian/pos/*.po; do \
+ -for pofile in debian/pos/*.po; do \
poname=$$(basename $${pofile}); \
test -f po/$${poname}.debackup || \
mv po/$${poname} po/$${poname}.debackup || true; \
@@ -25,18 +25,21 @@
done
binary-post-install/update-manager::
- # replace Ubuntu logo with Debian one
- uudecode < debian/software-properties.png.uu && \
- mv software-properties.png \
- debian/update-manager/usr/share/icons/hicolor/48x48/apps/
# install default configuration for the APT::Periodic feature
install -D -m 644 -o root -g root debian/10periodic \
debian/update-manager/etc/apt/apt.conf.d/10periodic
- rm -rf debian/update-manager/usr/share/gnome/help/update-manager/C
- uudecode < debian/manual.tar.uu && \
- tar -C debian/update-manager/usr/share/gnome/help/update-manager/ -xpf manual.tar && \
- rm manual.tar
+ # fix update-manager's location; it's a program that needs
+ # root privileges to run
+ mkdir debian/update-manager/usr/sbin/
+ mv debian/update-manager/usr/bin/update-manager \
+ debian/update-manager/usr/sbin/
+
+ # FIXME - should actually be integrated upstream for lenny
+ #rm -rf debian/update-manager/usr/share/gnome/help/update-manager/C
+ #uudecode < debian/manual.tar.uu && \
+ # tar -C debian/update-manager/usr/share/gnome/help/update-manager/ -xpf manual.tar && \
+ # rm manual.tar
# copied from CDBS; I cannot use gnome.mk, for it includes autotools.mk
# although this package does not use autotools; the build, thus, fails.
More information about the pkg-gnome-commits
mailing list