[Pkg-fglrx-devel] r1171 - in fglrx-legacy-driver/trunk/debian: . po

[Andreas Beckmann]

Author: anbe
Date: 2013-02-03 15:29:58 +0000 (Sun, 03 Feb 2013)
New Revision: 1171

Modified:
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/control
   fglrx-legacy-driver/trunk/debian/fglrx-driver.templates
   fglrx-legacy-driver/trunk/debian/po/templates.pot
Log:
merge fglrx-driver/trunk up to r1107 (excluding translations)

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2013-02-03 14:56:47 UTC (rev 1170)
+++ fglrx-legacy-driver/trunk/debian/changelog	2013-02-03 15:29:58 UTC (rev 1171)
@@ -49,8 +49,29 @@
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 02 Aug 2012 15:01:37 +0200
 
-fglrx-driver (1:12-6+point-2) UNRELEASED; urgency=low
+fglrx-driver (1:12-6+point-3) unstable; urgency=low
 
+  [ Debconf translations ]
+  * Czech (cs): Michal Šimůnek                    (Closes: #688135)
+  * Danish (da): Joe Hansen                       (Closes: #689259)
+  * French (fr): Christian Perrier                (Closes: #688489)
+  * German (de): Holger Wansing                   (Closes: #688496)
+  * Italian (it): Beatrice Torracca               (Closes: #689348)
+  * Japanese (ja): Kenshi Muto                    (Closes: #688103)
+  * Polish (pl): Michał Kułach                    (Closes: #688788)
+  * Portuguese (pt): Américo Monteiro             (Closes: #688178)
+  * Russion (ru): Yuri Kozlov                     (Closes: #688324)
+  * Spanish (es): Javier Fernández-Sanguino Peña  (Closes: #689459)
+  * Swedish (sv): Martin Bagge                    (Closes: #688425)
+
+  [ Andreas Beckmann ]
+  * libgl1-fglrx-glx:i386: Breaks: ia32-libs (<< 1:0). ia32-libs has added an
+    epoch to not clash with updated monolithic packages in proposed-updates.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Wed, 03 Oct 2012 15:20:13 +0200
+
+fglrx-driver (1:12-6+point-2) unstable; urgency=low
+
   * fglrx-driver.postrm: Do not fail if the debconf templates are not
     available (i.e. if the package is unconfigured).
   * fglrx-source: Add Built-Using attribute to the generated module packages
@@ -65,18 +86,20 @@
   * Check for "UNSIGNED" in /etc/ati/signature during package build to
     prevent reappearence of bugs like #684702.
   * Update Homepage to point to AMD.
+  * Update watch file.
   * README.Debian: Add link to unofficial bugzilla for upstream bug reports.
-  * fglrx-driver.NEWS: Mention the availability of fglrx-legacy-driver which
-    supports the legacy Radeon HD 2000/3000/4000 (currently only in
-    experimental but will be provided in wheezy-backports, too).
+  * fglrx-driver.NEWS, libfglrx.templates: Mention the availability of
+    fglrx-legacy-driver which supports the legacy Radeon HD 2000/3000/4000.
+    This package is currently only in experimental but it will be provided in
+    wheezy-backports, too.
 
- -- Andreas Beckmann <debian at abeckmann.de>  Wed, 01 Aug 2012 20:44:03 +0200
+ -- Andreas Beckmann <debian at abeckmann.de>  Wed, 19 Sep 2012 12:02:40 +0200
 
 fglrx-driver (1:12-6+point-1) unstable; urgency=low
 
   [ Debconf translations ]
   * Italian (it): Beatrice Torracca         (Closes: #682263)
-  * Japanese (ja): Kenshi Muto				(Closes: #683134)
+  * Japanese (ja): Kenshi Muto              (Closes: #683134)
 
   [ Patrick Matthäi ]
   * New upstream point release. AMD gave us the permission, to release this

Modified: fglrx-legacy-driver/trunk/debian/control
===================================================================
--- fglrx-legacy-driver/trunk/debian/control	2013-02-03 14:56:47 UTC (rev 1170)
+++ fglrx-legacy-driver/trunk/debian/control	2013-02-03 15:29:58 UTC (rev 1171)
@@ -187,7 +187,7 @@
  fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
  libgl1-nvidia-glx (<< 275.09.07-3),
- ia32-libs (<< 20120701) [i386],
+ ia32-libs (<< 1:0) [i386],
 Replaces:
  libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),

Modified: fglrx-legacy-driver/trunk/debian/fglrx-driver.templates
===================================================================
--- fglrx-legacy-driver/trunk/debian/fglrx-driver.templates	2013-02-03 14:56:47 UTC (rev 1170)
+++ fglrx-legacy-driver/trunk/debian/fglrx-driver.templates	2013-02-03 15:29:58 UTC (rev 1171)
@@ -2,7 +2,7 @@
 Type: note
 _Description: Manual configuration required to enable fglrx driver
  The fglrx driver is not yet configured.
- Please consider /usr/bin/aticonfig to create a
+ Please consider using /usr/bin/aticonfig to create a
  working xorg.conf configuration.
  .
  For example, "sudo aticonfig --initial" should
@@ -12,7 +12,7 @@
 Type: boolean
 Default: true
 Description: for internal use
- Can be preseeded.  If set to false, does not warn about fglrx still being
+ Can be preseeded. If set to false, does not warn about fglrx still being
  enabled in xorg.conf(.d/) when removing the package.
 
 Template: fglrx-driver/removed-but-enabled-in-xorg-conf

Modified: fglrx-legacy-driver/trunk/debian/po/templates.pot
===================================================================
--- fglrx-legacy-driver/trunk/debian/po/templates.pot	2013-02-03 14:56:47 UTC (rev 1170)
+++ fglrx-legacy-driver/trunk/debian/po/templates.pot	2013-02-03 15:29:58 UTC (rev 1171)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: fglrx-legacy-driver\n"
 "Report-Msgid-Bugs-To: fglrx-legacy-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-08-01 14:49+0200\n"
+"POT-Creation-Date: 2012-09-19 11:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -27,8 +27,8 @@
 #. Description
 #: ../fglrx-driver.templates:1001
 msgid ""
-"The fglrx driver is not yet configured. Please consider /usr/bin/aticonfig "
-"to create a working xorg.conf configuration."
+"The fglrx driver is not yet configured. Please consider using /usr/bin/"
+"aticonfig to create a working xorg.conf configuration."
 msgstr ""
 
 #. Type: note