r12110 - in /packages/unstable/gnome-app-install/debian/patches: 01_debian_distro.patch 04_debian.patch

[jak-guest at users.alioth.debian.org]

Author: jak-guest
Date: Fri Jul 27 16:58:07 2007
New Revision: 12110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12110
Log:
* debian/patches/: Merge 01_debian_distro and 04_debian

Removed:
    packages/unstable/gnome-app-install/debian/patches/04_debian.patch
Modified:
    packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch

Modified: packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch?rev=12110&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch (original)
+++ packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch Fri Jul 27 16:58:07 2007
@@ -1,6 +1,20 @@
+* Fix the distro name: we are Debian not Ubuntu
+=== modified file 'AppInstall/distros/Debian.py'
+--- old/AppInstall/distros/Debian.py	2007-07-17 10:36:13 +0000
++++ new/AppInstall/distros/Debian.py	2007-07-27 16:42:38 +0000
+@@ -120,7 +120,7 @@
+         elif app.component == "non-free":
+             tooltip = _("The use, modification and distribution "
+                         "of %s is restricted by copyright or by "
+-                        "legal terms in some countries."
++                        "legal terms in some countries. "
+                         "Debian provides support and "
+                         "security updates.") % app.name
+             icon_name = "application-debian-non-free"
+
 === modified file 'AppInstall/distros/__init__.py'
---- AppInstall/distros/__init__.py	2007-05-18 09:21:28 +0000
-+++ AppInstall/distros/__init__.py	2007-06-24 18:42:11 +0000
+--- old/AppInstall/distros/__init__.py	2007-05-18 09:21:28 +0000
++++ new/AppInstall/distros/__init__.py	2007-07-27 16:40:51 +0000
 @@ -1,5 +1,5 @@
  # DERIVATES: Please provide your own distro class and patch this statement
 -from Ubuntu import Distribution
@@ -9,3 +23,29 @@
  def get_distro():
      """
 
+=== modified file 'data/gnome-app-install.glade'
+--- old/data/gnome-app-install.glade	2007-05-17 10:20:18 +0000
++++ new/data/gnome-app-install.glade	2007-07-27 16:41:05 +0000
+@@ -1313,7 +1313,7 @@
+ 	  <property name="visible">True</property>
+ 	  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Checking installed and available applications&lt;/b&gt;&lt;/big&gt;
+ 
+-Ubuntu and third party vendors offer you a large variety of applications that you can install on your system.</property>
++Debian and third party vendors offer you a large variety of applications that you can install on your system.</property>
+ 	  <property name="use_underline">False</property>
+ 	  <property name="use_markup">True</property>
+ 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+
+=== modified file 'gnome-app-install'
+--- old/gnome-app-install	2007-06-04 10:15:20 +0000
++++ new/gnome-app-install	2007-07-27 16:37:28 +0000
+@@ -246,7 +246,7 @@
+                           "media files. Do you want to search for a codec "
+                           "that supports the selected file?\n\n"
+                           "The search will also include software which is not "
+-                          "officially supported by Ubuntu."),
++                          "officially supported by Debian."),
+                           transient_for):
+             sys.exit(4)
+         # ok, lets do it!
+