r15747 - in /packages/unstable/gnome-app-install/debian: changelog patches/04_fix_wording.patch
jak-guest at users.alioth.debian.org
jak-guest at users.alioth.debian.org
Tue Apr 22 15:41:04 UTC 2008
Author: jak-guest
Date: Tue Apr 22 15:41:04 2008
New Revision: 15747
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15747
Log:
* New upstream bugfix release
* debian/patches/04_fix_wording.patch:
- Debian is main only (Closes: #476287)
- Remove 3rd party choice (Closes: #476289)
- Packages are restricted by their license (Closes: #476291)
Added:
packages/unstable/gnome-app-install/debian/patches/04_fix_wording.patch
Modified:
packages/unstable/gnome-app-install/debian/changelog
Modified: packages/unstable/gnome-app-install/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/changelog?rev=15747&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Tue Apr 22 15:41:04 2008
@@ -1,3 +1,13 @@
+gnome-app-install (0.5.2.7-1) unstable; urgency=medium
+
+ * New upstream bugfix release
+ * debian/patches/04_fix_wording.patch:
+ - Debian is main only (Closes: #476287)
+ - Remove 3rd party choice (Closes: #476289)
+ - Packages are restricted by their license (Closes: #476291)
+
+ -- Julian Andres Klode <jak at jak-linux.org> Tue, 22 Apr 2008 16:52:02 +0200
+
gnome-app-install (0.5.2.5-1) unstable; urgency=low
* New upstream release
Added: packages/unstable/gnome-app-install/debian/patches/04_fix_wording.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/patches/04_fix_wording.patch?rev=15747&op=file
==============================================================================
--- packages/unstable/gnome-app-install/debian/patches/04_fix_wording.patch (added)
+++ packages/unstable/gnome-app-install/debian/patches/04_fix_wording.patch Tue Apr 22 15:41:04 2008
@@ -1,0 +1,80 @@
+=== modified file 'AppInstall/distros/Debian.py'
+--- AppInstall/distros/Debian.py 2007-08-03 21:07:30 +0000
++++ AppInstall/distros/Debian.py 2008-04-22 15:33:16 +0000
+@@ -14,19 +14,13 @@
+ self.filters_primary = {
+ SHOW_ALL : (_("All available applications"),
+ _("Show all applications including ones which are "
+- "possibly restricted by law or copyright")),
++ "possibly restricted by their license")),
+ SHOW_ONLY_FREE :(_("All Open Source applications"),
+- _("Show all Debian applications which can be "
++ _("Show all applications which can be "
+ "freely used, modified and distributed. This "
+- "includes a large variety of community "
+- "maintained applications")),
++ "includes all packages in main")),
+ }
+- self.filters_secondary = {
+- SHOW_ONLY_THIRD_PARTY : (_("Third party applications"),
+- _("Show only applications that are "
+- "provided by independent software "
+- "vendors and are not part of Debian"))
+- }
++ self.filters_secondary = {}
+ # List of components whose applications should not be installed
+ # before asking for a confirmation
+ self.components_ask = ["contrib", "non-free"]
+@@ -35,27 +29,29 @@
+ self.components_activation = {
+ # Fallback
+ None : [_("Enable the installation of software from the %s "
+- "component of Debian?"),
++ "distribution?"),
+ # %s is the name of the component
+- _("%s is not officially supported with security "
+- "updates.")],
++ _("%s is not part of Debian and not supported")],
+ "main" : [_("Enable the installaion of officially "
+ "supported Debian software?"),
+ # %s is the name of the application
+- _("%s is part of the Debian main distribution. "
++ _("%s is part of the Debian distribution. "
+ "Debian provides support and security "
+ "updates, which will be enabled too.")],
+ "contrib" : [_("Enable the installation of partial free software?"),
+ # %s is the name of the application
+- _("%s is not part of the Debian main distribution "
+- "and requires non-free software to work. "
++ _("%s is not part of the Debian distribution "
++ "and may require non-free software to work. "
+ "Debian provides support and security "
+ "updates, which will be enabled too.")],
+ "non-free" : [_("Enable the installation of non-free software?"),
+ # %s is the name of the application
+- _("The use, modification and distribution of %s "
+- "is restricted by copyright or by legal terms in "
+- "some countries.")]
++ _("%s is not part of the Debian distribution "
++ "The use, modification and distribution "
++ "of %s is restricted by its license, in a way that "
++ "does not meet the Debian Free Software Guidelines. "
++ "Debian tries to provide support and security "
++ "updates, which will be enabled too.")]
+ }
+
+ self.dependencies_map = [
+@@ -112,9 +108,9 @@
+ emblems.append((icon_name, tooltip))
+ elif app.component == "non-free":
+ tooltip = _("The use, modification and distribution "
+- "of %s is restricted by copyright or by "
+- "legal terms in some countries. "
+- "Debian provides support and "
++ "of %s is restricted by its license, in a way that "
++ "does not meet the Debian Free Software Guidelines.\n\n"
++ "Debian tries to provide support and "
+ "security updates.") % app.name
+ icon_name = "application-debian-non-free"
+ emblems.append((icon_name, tooltip))
+
More information about the pkg-gnome-commits
mailing list