diff -Nru system-config-printer-kde-0.09/debian/changelog system-config-printer-kde-0.09ubuntu1/debian/changelog --- system-config-printer-kde-0.09/debian/changelog 2008-04-15 14:30:30.000000000 +0200 +++ system-config-printer-kde-0.09ubuntu1/debian/changelog 2008-05-10 22:49:12.000000000 +0200 @@ -1,3 +1,10 @@ +system-config-printer-kde (0.09ubuntu1) intrepid; urgency=low + + * Remove smburi.py, since it's shipped with system-config-printer-commen + nowadays (LP: #229016). + + -- Stefan Potyra Sat, 10 May 2008 22:40:32 +0200 + system-config-printer-kde (0.09) hardy; urgency=low * Make it call fillServerTab(), closes LP: #217669 diff -Nru system-config-printer-kde-0.09/debian/system-config-printer-kde.install system-config-printer-kde-0.09ubuntu1/debian/system-config-printer-kde.install --- system-config-printer-kde-0.09/debian/system-config-printer-kde.install 2008-04-15 14:19:03.000000000 +0200 +++ system-config-printer-kde-0.09ubuntu1/debian/system-config-printer-kde.install 2008-05-10 22:43:04.000000000 +0200 @@ -5,4 +5,3 @@ system-config-printer-kde usr/bin/ system-config-printer-kde.desktop /usr/share/applications/ system-config-printer-applet-kde.desktop /etc/xdg/autostart/ -smburi.py usr/share/system-config-printer/ diff -Nru system-config-printer-kde-0.09/smburi.py system-config-printer-kde-0.09ubuntu1/smburi.py --- system-config-printer-kde-0.09/smburi.py 2008-04-15 14:19:03.000000000 +0200 +++ system-config-printer-kde-0.09ubuntu1/smburi.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -#!/usr/bin/env python - -## system-config-printer - -## Copyright (C) 2006, 2007, 2008 Red Hat, Inc. -## Copyright (C) 2006, 2007 Florian Festi -## Copyright (C) 2006, 2007, 2008 Tim Waugh - -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. - -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. - -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -import urllib - -class SMBURI: - def __init__ (self, - uri=None, - group='', host='', share='', user='', password=''): - if uri: - if group or host or share or user or password: - raise RuntimeError - - self.uri = uri - else: - self.uri = self._construct (group, host, share, - user=user, password=password) - - def _construct (self, group, host, share, user='', password=''): - uri_password = '' - if password: - uri_password = ':' + urllib.quote (password) - if user: - uri_password += '@' - return "%s%s%s/%s/%s" % (urllib.quote (user), uri_password, - urllib.quote (group), - urllib.quote (host), - urllib.quote (share)) - - def get_uri (self): - return self.uri - - def sanitize_uri (self): - group, host, share, user, password = self.separate () - return self._construct (group, host, share) - - def separate (self): - uri = self.get_uri () - user = '' - password = '' - auth = uri.find ('@') - if auth != -1: - u = uri[:auth].find(':') - if u != -1: - user = uri[:u] - password = uri[u + 1:auth] - else: - user = uri[:auth] - uri = uri[auth + 1:] - sep = uri.count ('/') - group = '' - if sep == 2: - g = uri.find('/') - group = uri[:g] - uri = uri[g + 1:] - if sep < 1: - host = 'localhost' - else: - h = uri.find('/') - host = uri[:h] - uri = uri[h + 1:] - p = host.find(':') - if p != -1: - host = host[:p] - share = uri - return (urllib.unquote (group), urllib.unquote (host), - urllib.unquote (share), - urllib.unquote (user), urllib.unquote (password))