r37571 - in /attic/system-config-printer/debian: changelog patches/0002-Disable-firewall-checks.patch patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch patches/0005-Fix-French-translation.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Apr 16 16:23:33 2013
New Revision: 37571

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37571
Log:
  + debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch:
    - Removed, included upstream.
  + debian/patches/*:
    - Refreshed.

Removed:
    attic/system-config-printer/debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch
Modified:
    attic/system-config-printer/debian/changelog
    attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
    attic/system-config-printer/debian/patches/0005-Fix-French-translation.patch
    attic/system-config-printer/debian/patches/series

Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=37571&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog [utf-8] (original)
+++ attic/system-config-printer/debian/changelog [utf-8] Tue Apr 16 16:23:33 2013
@@ -31,6 +31,10 @@
       - Remove debug.py instead of options.py as that's what we're copying.
     + debian/system-config-printer.install:
       - Install the dbus service files.
+    + debian/patches/0004-Fix-MITM-via-unencrypted-metadata-download.patch:
+      - Removed, included upstream.
+    + debian/patches/*:
+      - Refreshed.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 16 Apr 2013 17:36:18 +0200
 

Modified: attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch?rev=37571&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch [utf-8] (original)
+++ attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch [utf-8] Tue Apr 16 16:23:33 2013
@@ -6,11 +6,9 @@
  firewall.py |   14 ++------------
  1 files changed, 2 insertions(+), 12 deletions(-)
 
-diff --git a/firewall.py b/firewall.py
-index 94c1fa6..942e225 100644
---- a/firewall.py
-+++ b/firewall.py
-@@ -94,20 +94,10 @@ class Firewall:
+--- a/firewallsettings.py
++++ b/firewallsettings.py
+@@ -222,21 +222,10 @@
              pass
  
      def _check_any_allowed (self, search):
@@ -18,18 +16,19 @@
 -        if filename == None: return True
 -        isect = set (search).intersection (set (args))
 -        return len (isect) != 0
+-
 +        return True
  
-     def add_rule (self, rule):
+     def add_service (self, service):
 -        try:
 -            (args, filename) = self._fw_data
 -        except AttributeError:
 -            (args, filename) = self._get_fw_data ()
 -        if filename == None: return
 -
--        args.append (rule)
+-        args.append ("--service=" + service)
 -        self._fw_data = (args, filename)
 +        pass
  
      def check_ipp_client_allowed (self):
-         return self._check_any_allowed (set(["--port=631:udp",
+         return self._check_any_allowed (set(["--port=%s:%s" %

Modified: attic/system-config-printer/debian/patches/0005-Fix-French-translation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0005-Fix-French-translation.patch?rev=37571&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0005-Fix-French-translation.patch [utf-8] (original)
+++ attic/system-config-printer/debian/patches/0005-Fix-French-translation.patch [utf-8] Tue Apr 16 16:23:33 2013
@@ -4,12 +4,12 @@
 
 --- a/po/fr.po
 +++ b/po/fr.po
-@@ -2585,7 +2585,7 @@ msgstr "Impression intelligente"
+@@ -2375,7 +2375,7 @@
  #. Not more than 25 characters
- #: ../ui/PrinterPropertiesDialog.ui.h:59
+ #: ../ui/PrinterPropertiesDialog.ui.h:14
  msgid "Print Self-Test Page"
 -msgstr "Imprimer la page de test"
 +msgstr "Imprimer la page de diagnostic"
  
- #: ../ui/PrinterPropertiesDialog.ui.h:62
- #, fuzzy
+ #. Not more than 25 characters
+ #: ../ui/PrinterPropertiesDialog.ui.h:16

Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=37571&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series [utf-8] (original)
+++ attic/system-config-printer/debian/patches/series [utf-8] Tue Apr 16 16:23:33 2013
@@ -1,5 +1,4 @@
 0001-Adjust-python-paths.patch
 0002-Disable-firewall-checks.patch
 0003-Use-our-custom-cpk-install-package-name.patch
-0004-Fix-MITM-via-unencrypted-metadata-download.patch
 0005-Fix-French-translation.patch