[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#682335: pre-approve for freeze exception: glx-alternatives/0.3.0, nvidia-support/20120721+1 [both contrib]



On 2012-07-21 21:41, Andreas Beckmann wrote:
> I'd like to ask whether an exception is possible for the following
> change/move of functionality:
> 
> The non-free video drivers Nvidia and Fglrx need to blacklist their free
> counterparts Nouveau and Radeon. Currently a conffile is shipped in
> /etc/modprobe.d/ and any solution to switch back to the free drivers
> requires *purging* nvidia-kernel-common (or fglrx-driver) and extra
> documentation is needed since plain package removal is insufficient.

I have now implemented the changes and uploaded the packages to
experimental (because I needed them for fglrx-legacy-driver).
I have tested several upgrade paths and I'm running the new setup
locally now.

Attached are 5 diffs:

glx-alternatives.debdiff
- the actual implementation of handling the blacklists as slave
  alternatives
* the debdiff between the versions in wheezy/sid and experimental
* this would be uploaded to sid as version 0.3.0
* this upload could be made (and allowed into wheezy) without being
  followed by the next patches (in the worst case the blacklist would
  be duplicated)
* this would be required to move fglrx-legacy-driver from experimental
  to sid

nvidia-support_filtered-po.debdiff
- transfers handling the blacklist to glx-alternative-nvidia
- drop instructions to purge nvidia-kernel-common for switching back to
  nouveau
* the debdiff between the versions in sid and experimental
* | filterdiff -x '*.po*'
* nvidia-support in sid is a translation-only update, 3/10 old and has
  been unblocked already
* this would be uploaded as version 201208xx+1 FSVO xx
* I would wait with an upload until the sid version has migrated
  (unless I'm told otherwise)
* this will be a trivial translation update: a full paragraph gets
  dropped, no fuzzy strings generated, no translators involved
* this needs the previous patch as it adds versioned dependencies, but
  the following patches won't be needed (only fglrx-driver would have a
  duplicated blacklist)

The next three patches require the previous two ones, but are
independent of each other:

nvidia-graphics-drivers-legacy-96xx_filtered-po.debdiff
- bumping versioned dependency on nvidia-kernel-common to ensure the
  old blacklist file is cleaned up on upgrades
- documentation updates to remove requirement to purge nvidia-kernel-
  common when switching to the free radeon driver
* the debdiff between the versions in sid and experimental
* | filterdiff -x '*.po*'
* n-g-d-l-96xx in sid is a translation update that has not yet been
  approved
* unfortunately this will require translation updates as the
  simplification of the instructions will remove half a sentence (but
  if the translation updates don't come in time, the old ones will just
  contain an unneccessary step)

nvidia-graphics-drivers_proposed.diff
- the changes intended for nvidia-grapohics-drivers and
  nvidia-graphics-drivers-legacy-173xx: documentation update and
  bumping versioned dependencies
* not uploaded to experimental because these are trivial and
  experiemtal is currently staging a new beta release that fixes
  several bugs

fglrx-driver_filtered-po.debdiff
- transfers handling the blacklist to glx-alternative-fglrx
- several other bugfixes and documentation updates
* the debdiff between the versions in sid and experimental
* | filterdiff -x '*.po*'
* this will require a translation update to remove the requirement tu
  purge fglrx-driver before Radeon can be used again, but we'll need
  a translation update anyway because we now have
  fglrx-legacy-driver as an alternative for legacy cards
  (via wheezy-backports)
* Feedback on the other changes included in this diff would be welcome
  - is there anything unacceptable for wheezy (assuming the fglrx-
  driver package from sid gets accepted)?


I'd like to get feedback on this so that I know how to proceed.


Thanks

Andreas
diffstat for glx-alternatives-0.2.2 glx-alternatives-0.2.90

 debian/changelog                       |   18 ++++++++++++++++++
 debian/glx-alternative-fglrx.dirs      |    1 +
 debian/glx-alternative-fglrx.install   |    2 ++
 debian/glx-alternative-fglrx.postinst  |    9 ++++++++-
 debian/glx-alternative-nvidia.dirs     |    1 +
 debian/glx-alternative-nvidia.install  |    2 ++
 debian/glx-alternative-nvidia.postinst |    7 +++++++
 debian/glx-diversions.README.Debian    |   11 +++++++++--
 fglrx-blacklists-radeon.conf           |    4 ++++
 nvidia-blacklists-nouveau.conf         |    4 ++++
 zz_fglrx-blacklists-radeon             |   18 ++++++++++++++++++
 zz_nvidia-blacklists-nouveau           |   18 ++++++++++++++++++
 12 files changed, 92 insertions(+), 3 deletions(-)

diff -Nru glx-alternatives-0.2.2/debian/changelog glx-alternatives-0.2.90/debian/changelog
--- glx-alternatives-0.2.2/debian/changelog	2012-06-30 15:19:25.000000000 +0200
+++ glx-alternatives-0.2.90/debian/changelog	2012-08-02 14:27:52.000000000 +0200
@@ -1,3 +1,21 @@
+glx-alternatives (0.2.90) experimental; urgency=low
+
+  * Upload to experimental.
+  * glx-alternative-nvidia: Handle blacklisting of the nouveau kernel module
+    to avoid leaving the blacklist behind if the Nvidia driver is disabled:
+    - ship blacklist as /etc/nvidia/nvidia-blacklists-nouveau.conf
+    - add a slave alternative that links it into /etc/modprobe.d/
+    - add initramfs hook to properly install the file (and not a dangling
+      symlink) in the initrd
+  * glx-alternative-fglrx: Handle blacklisting of the radeon kernel module
+    to avoid leaving the blacklist behind if the Fglrx driver is disabled:
+    - ship blacklist as /etc/ati/fglrx-blacklists-radeon.conf
+    - add a slave alternative that links it into /etc/modprobe.d/
+    - add initramfs hook to properly install the file (and not a dangling
+      symlink) in the initrd
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Thu, 02 Aug 2012 14:27:52 +0200
+
 glx-alternatives (0.2.2) unstable; urgency=low
 
   * Run ldconfig after updating diversions and alternatives.
diff -Nru glx-alternatives-0.2.2/debian/glx-alternative-fglrx.dirs glx-alternatives-0.2.90/debian/glx-alternative-fglrx.dirs
--- glx-alternatives-0.2.2/debian/glx-alternative-fglrx.dirs	2011-09-05 20:20:09.000000000 +0200
+++ glx-alternatives-0.2.90/debian/glx-alternative-fglrx.dirs	2012-08-01 12:20:41.000000000 +0200
@@ -1,3 +1,4 @@
+etc/modprobe.d
 usr/lib/fglrx
 usr/lib/xorg/modules/drivers
 usr/lib/xorg/modules/linux
diff -Nru glx-alternatives-0.2.2/debian/glx-alternative-fglrx.install glx-alternatives-0.2.90/debian/glx-alternative-fglrx.install
--- glx-alternatives-0.2.2/debian/glx-alternative-fglrx.install	1970-01-01 01:00:00.000000000 +0100
+++ glx-alternatives-0.2.90/debian/glx-alternative-fglrx.install	2012-08-01 12:31:14.000000000 +0200
@@ -0,0 +1,2 @@
+fglrx-blacklists-radeon.conf	etc/ati/
+zz_fglrx-blacklists-radeon	usr/share/initramfs-tools/hooks/
diff -Nru glx-alternatives-0.2.2/debian/glx-alternative-fglrx.postinst glx-alternatives-0.2.90/debian/glx-alternative-fglrx.postinst
--- glx-alternatives-0.2.2/debian/glx-alternative-fglrx.postinst	2012-05-22 11:39:21.000000000 +0200
+++ glx-alternatives-0.2.90/debian/glx-alternative-fglrx.postinst	2012-08-01 12:36:43.000000000 +0200
@@ -42,6 +42,7 @@
 # * /usr/lib[/<triplet>]/libGL.so.1
 # * /usr/lib/xorg/modules/linux/libglx.so
 # * /usr/lib/xorg/modules/drivers/fglrx_drv.so 
+# * /etc/modprobe.d/fglrx-blacklists-radeon.conf
 setup_alternatives()
 {
 	driver_slaves="
@@ -50,6 +51,7 @@
 "
 	libGL_slaves="$(add_multiarch_slave /usr/lib "" libGL.so.1 /usr/lib fglrx/)"
 	mesa_slaves=""
+	minor_slaves="$(add_slave /etc/modprobe.d/fglrx-blacklists-radeon.conf fglrx-blacklists-radeon.conf /etc/ati/fglrx-blacklists-radeon.conf)"
 	if [ -z "$libGL_slaves" ]; then
 		# fallback: MESA, libgl1-fglrx-glx is not required
 		mesa_slaves="$(add_multiarch_slave /usr/lib "" libGL.so.1 /usr/lib mesa/)"
@@ -60,12 +62,17 @@
 	fi
 
 	if echo "$driver_slaves $libGL_slaves" | grep -q "slave" ; then
-		update-alternatives --install /usr/lib/glx glx /usr/lib/fglrx 99 $driver_slaves $libGL_slaves $mesa_slaves
+		update-alternatives --install /usr/lib/glx glx /usr/lib/fglrx 99 $driver_slaves $libGL_slaves $mesa_slaves $minor_slaves
 	else
 		update-alternatives --remove glx /usr/lib/fglrx
 	fi
 
 	ldconfig
+
+	# trigger rebuilding the initrd to (de-)activate the radeon blacklist
+	if [ -x /usr/sbin/update-initramfs ]; then
+		update-initramfs -u
+	fi
 }
 
 if [ "$1" = "triggered" ]; then
diff -Nru glx-alternatives-0.2.2/debian/glx-alternative-nvidia.dirs glx-alternatives-0.2.90/debian/glx-alternative-nvidia.dirs
--- glx-alternatives-0.2.2/debian/glx-alternative-nvidia.dirs	2011-08-23 13:17:02.000000000 +0200
+++ glx-alternatives-0.2.90/debian/glx-alternative-nvidia.dirs	2012-07-21 19:58:39.000000000 +0200
@@ -1,2 +1,3 @@
+etc/modprobe.d
 usr/lib/xorg/modules/drivers
 usr/lib/xorg/modules/linux
diff -Nru glx-alternatives-0.2.2/debian/glx-alternative-nvidia.install glx-alternatives-0.2.90/debian/glx-alternative-nvidia.install
--- glx-alternatives-0.2.2/debian/glx-alternative-nvidia.install	1970-01-01 01:00:00.000000000 +0100
+++ glx-alternatives-0.2.90/debian/glx-alternative-nvidia.install	2012-07-21 20:17:51.000000000 +0200
@@ -0,0 +1,2 @@
+nvidia-blacklists-nouveau.conf	etc/nvidia/
+zz_nvidia-blacklists-nouveau	usr/share/initramfs-tools/hooks/
diff -Nru glx-alternatives-0.2.2/debian/glx-alternative-nvidia.postinst glx-alternatives-0.2.90/debian/glx-alternative-nvidia.postinst
--- glx-alternatives-0.2.2/debian/glx-alternative-nvidia.postinst	2012-05-22 11:41:08.000000000 +0200
+++ glx-alternatives-0.2.90/debian/glx-alternative-nvidia.postinst	2012-07-21 19:27:55.000000000 +0200
@@ -43,6 +43,7 @@
 # * /usr/lib/xorg/modules/linux/libglx.so
 # * /usr/lib/xorg/modules/drivers/nvidia_drv.so 
 # * several more NVIDIA libraries etc.
+# * /etc/modprobe.d/nvidia-blacklists-nouveau.conf
 setup_alternatives()
 {
 	slaves="
@@ -58,6 +59,7 @@
 		$(add_multiarch_slave /usr/lib "" libXvMCNVIDIA_dynamic.so.1 /usr/lib nvidia/)
 		$(add_slave /usr/lib/xorg/modules/linux/libglx.so linux-libglx.so /usr/lib/nvidia/libglx.so)
 		$(add_slave /usr/bin/nvidia-bug-report.sh nvidia-bug-report.sh /usr/lib/nvidia/nvidia-bug-report.sh)
+		$(add_slave /etc/modprobe.d/nvidia-blacklists-nouveau.conf nvidia-blacklists-nouveau.conf /etc/nvidia/nvidia-blacklists-nouveau.conf)
 "
 
 	if echo "$slaves" | grep -q "slave" ; then
@@ -67,6 +69,11 @@
 	fi
 
 	ldconfig
+
+	# trigger rebuilding the initrd to (de-)activate the nouveau blacklist
+	if [ -x /usr/sbin/update-initramfs ]; then
+		update-initramfs -u
+	fi
 }
 
 if [ "$1" = "triggered" ]; then
diff -Nru glx-alternatives-0.2.2/debian/glx-diversions.README.Debian glx-alternatives-0.2.90/debian/glx-diversions.README.Debian
--- glx-alternatives-0.2.2/debian/glx-diversions.README.Debian	2011-09-03 07:47:40.000000000 +0200
+++ glx-alternatives-0.2.90/debian/glx-diversions.README.Debian	2012-08-01 21:40:37.000000000 +0200
@@ -25,9 +25,10 @@
 ==================================================
 
 To switch between the GLX implementation from MESA, NVIDIA and AMD(fglrx),
-use
+run
 
     update-alternatives --config glx
+    update-initramfs -u
 
 
 
@@ -74,6 +75,12 @@
 
     update-alternatives --config glx
 
+followed by
+
+    update-initramfs -u
+
+to rebuild the initrd with a possibly changed kernel module blacklist.
+
 For NVIDIA an additional alternative exists that allows one to switch
 between the current driver and legacy versions.  For selection use the
 command
@@ -99,5 +106,5 @@
 is a bug in the application, dlopen(libGL.so.1) needs to be used instead.
 
 
- -- Andreas Beckmann <debian@abeckmann.de>  Wed, 22 Jun 2011 12:44:11 +0200
+ -- Andreas Beckmann <debian@abeckmann.de>  Wed, 01 Aug 2012 21:40:12 +0200
 
diff -Nru glx-alternatives-0.2.2/fglrx-blacklists-radeon.conf glx-alternatives-0.2.90/fglrx-blacklists-radeon.conf
--- glx-alternatives-0.2.2/fglrx-blacklists-radeon.conf	1970-01-01 01:00:00.000000000 +0100
+++ glx-alternatives-0.2.90/fglrx-blacklists-radeon.conf	2012-08-01 12:40:25.000000000 +0200
@@ -0,0 +1,4 @@
+# You need to run "update-initramfs -u" after editing this file.
+
+# fglrx conflicts with the free radeon module.
+blacklist radeon
diff -Nru glx-alternatives-0.2.2/nvidia-blacklists-nouveau.conf glx-alternatives-0.2.90/nvidia-blacklists-nouveau.conf
--- glx-alternatives-0.2.2/nvidia-blacklists-nouveau.conf	1970-01-01 01:00:00.000000000 +0100
+++ glx-alternatives-0.2.90/nvidia-blacklists-nouveau.conf	2012-07-21 19:29:37.000000000 +0200
@@ -0,0 +1,4 @@
+# You need to run "update-initramfs -u" after editing this file.
+
+# see #580894
+blacklist nouveau
diff -Nru glx-alternatives-0.2.2/zz_fglrx-blacklists-radeon glx-alternatives-0.2.90/zz_fglrx-blacklists-radeon
--- glx-alternatives-0.2.2/zz_fglrx-blacklists-radeon	1970-01-01 01:00:00.000000000 +0100
+++ glx-alternatives-0.2.90/zz_fglrx-blacklists-radeon	2012-08-01 21:27:07.000000000 +0200
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "prereqs" ]; then exit 0; fi
+
+. /usr/share/initramfs-tools/hook-functions
+
+BLACKLIST=/etc/modprobe.d/fglrx-blacklists-radeon.conf
+
+# there may be a dangling symlink
+if [ -n "$DESTDIR" ] && [ -L "$DESTDIR$BLACKLIST" ]; then
+	rm -f "$DESTDIR$BLACKLIST"
+fi
+
+if [ -f "$BLACKLIST" ]; then
+	# this will dereference the symlink
+	copy_exec "$BLACKLIST"
+fi
diff -Nru glx-alternatives-0.2.2/zz_nvidia-blacklists-nouveau glx-alternatives-0.2.90/zz_nvidia-blacklists-nouveau
--- glx-alternatives-0.2.2/zz_nvidia-blacklists-nouveau	1970-01-01 01:00:00.000000000 +0100
+++ glx-alternatives-0.2.90/zz_nvidia-blacklists-nouveau	2012-08-01 21:27:36.000000000 +0200
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "prereqs" ]; then exit 0; fi
+
+. /usr/share/initramfs-tools/hook-functions
+
+BLACKLIST=/etc/modprobe.d/nvidia-blacklists-nouveau.conf
+
+# there may be a dangling symlink
+if [ -n "$DESTDIR" ] && [ -L "$DESTDIR$BLACKLIST" ]; then
+	rm -f "$DESTDIR$BLACKLIST"
+fi
+
+if [ -f "$BLACKLIST" ]; then
+	# this will dereference the symlink
+	copy_exec "$BLACKLIST"
+fi
diffstat for nvidia-support-20120630+3 nvidia-support-20120731+1

 changelog                     |   11 +++++++++++
 control                       |    5 ++++-
 nvidia-kernel-common.modprobe |    3 ---
 nvidia-kernel-common.postinst |    2 +-
 nvidia-kernel-common.postrm   |    2 +-
 nvidia-support.templates      |    3 ---
 po/cs.po                      |   17 +++++++----------
 po/da.po                      |   17 +++++++----------
 po/de.po                      |   19 ++++++++-----------
 po/es.po                      |   17 +++++++----------
 po/fi.po                      |   10 +---------
 po/fr.po                      |   18 ++++++++----------
 po/it.po                      |   19 ++++++++-----------
 po/ja.po                      |   10 +---------
 po/nl.po                      |   10 +---------
 po/pl.po                      |   19 ++++++++-----------
 po/pt.po                      |   17 +++++++----------
 po/ru.po                      |   17 +++++++----------
 po/sk.po                      |   17 +++++++----------
 po/sv.po                      |   19 ++++++++-----------
 po/templates.pot              |   10 +---------
 po/zh_CN.po                   |   17 +++++++----------
 22 files changed, 110 insertions(+), 169 deletions(-)

diff -Nru nvidia-support-20120630+3/debian/changelog nvidia-support-20120731+1/debian/changelog
--- nvidia-support-20120630+3/debian/changelog	2012-08-03 14:14:07.000000000 +0200
+++ nvidia-support-20120731+1/debian/changelog	2012-08-03 15:31:19.000000000 +0200
@@ -1,3 +1,14 @@
+nvidia-support (20120731+1) experimental; urgency=low
+
+  * nvidia-kernel-common: The nouveau blacklist is now handled by
+    glx-alternative-nvidia which allows disabling it on removal without
+    requiring nvidia-kernel-common to be purged.
+  * Remove instructions for purging nvidia-kernel-common from the
+    nvidia-support/removed-but-enabled-in-xorg-conf debconf template.
+  * Upload to experimental.
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Fri, 03 Aug 2012 15:31:19 +0200
+
 nvidia-support (20120630+3) unstable; urgency=low
 
   [ Debconf translations ]
diff -Nru nvidia-support-20120630+3/debian/control nvidia-support-20120731+1/debian/control
--- nvidia-support-20120630+3/debian/control	2012-05-22 14:41:26.000000000 +0200
+++ nvidia-support-20120731+1/debian/control	2012-08-03 14:42:55.000000000 +0200
@@ -38,7 +38,10 @@
 Section: contrib/kernel
 Architecture: amd64 i386
 Pre-Depends: ${misc:Pre-Depends}
-Depends: kmod | module-init-tools (<< 4), ${misc:Depends}
+Depends:
+ kmod | module-init-tools (<< 4),
+ glx-alternative-nvidia (>= 0.2.90),
+ ${misc:Depends}
 Description: NVIDIA binary kernel module support files
  This package contains support files used for any version of the NVIDIA
  kernel module.  It sets up udev and ConsoleKit rules, ensures the NVIDIA
diff -Nru nvidia-support-20120630+3/debian/nvidia-kernel-common.modprobe nvidia-support-20120731+1/debian/nvidia-kernel-common.modprobe
--- nvidia-support-20120630+3/debian/nvidia-kernel-common.modprobe	2011-04-27 13:08:15.000000000 +0200
+++ nvidia-support-20120731+1/debian/nvidia-kernel-common.modprobe	2012-08-03 14:40:14.000000000 +0200
@@ -3,6 +3,3 @@
 # To enable FastWrites and Sidebus addressing, uncomment these lines
 # options nvidia NVreg_EnableAGPSBA=1
 # options nvidia NVreg_EnableAGPFW=1
-
-# see #580894
-blacklist nouveau
diff -Nru nvidia-support-20120630+3/debian/nvidia-kernel-common.postinst nvidia-support-20120731+1/debian/nvidia-kernel-common.postinst
diff -Nru nvidia-support-20120630+3/debian/nvidia-kernel-common.postrm nvidia-support-20120731+1/debian/nvidia-kernel-common.postrm
diff -Nru nvidia-support-20120630+3/debian/nvidia-support.templates nvidia-support-20120731+1/debian/nvidia-support.templates
--- nvidia-support-20120630+3/debian/nvidia-support.templates	2012-08-01 10:39:20.000000000 +0200
+++ nvidia-support-20120731+1/debian/nvidia-support.templates	2012-08-03 15:00:38.000000000 +0200
@@ -59,9 +59,6 @@
  is disabled in the following config file(s):
  .
  ${config-files}
- .
- Note that switching to the free Nouveau driver requires the
- nvidia-kernel-common package to be purged (not just removed).
 
 Template: nvidia-support/create-nvidia-conf
 Type: boolean
diff -Nru nvidia-support-20120630+3/debian/po/cs.po nvidia-support-20120731+1/debian/po/cs.po
diff -Nru nvidia-support-20120630+3/debian/po/da.po nvidia-support-20120731+1/debian/po/da.po
diff -Nru nvidia-support-20120630+3/debian/po/de.po nvidia-support-20120731+1/debian/po/de.po
diff -Nru nvidia-support-20120630+3/debian/po/es.po nvidia-support-20120731+1/debian/po/es.po
diff -Nru nvidia-support-20120630+3/debian/po/fi.po nvidia-support-20120731+1/debian/po/fi.po
diff -Nru nvidia-support-20120630+3/debian/po/fr.po nvidia-support-20120731+1/debian/po/fr.po
diff -Nru nvidia-support-20120630+3/debian/po/it.po nvidia-support-20120731+1/debian/po/it.po
diff -Nru nvidia-support-20120630+3/debian/po/ja.po nvidia-support-20120731+1/debian/po/ja.po
diff -Nru nvidia-support-20120630+3/debian/po/nl.po nvidia-support-20120731+1/debian/po/nl.po
diff -Nru nvidia-support-20120630+3/debian/po/pl.po nvidia-support-20120731+1/debian/po/pl.po
diff -Nru nvidia-support-20120630+3/debian/po/pt.po nvidia-support-20120731+1/debian/po/pt.po
diff -Nru nvidia-support-20120630+3/debian/po/ru.po nvidia-support-20120731+1/debian/po/ru.po
diff -Nru nvidia-support-20120630+3/debian/po/sk.po nvidia-support-20120731+1/debian/po/sk.po
diff -Nru nvidia-support-20120630+3/debian/po/sv.po nvidia-support-20120731+1/debian/po/sv.po
diff -Nru nvidia-support-20120630+3/debian/po/templates.pot nvidia-support-20120731+1/debian/po/templates.pot
diff -Nru nvidia-support-20120630+3/debian/po/zh_CN.po nvidia-support-20120731+1/debian/po/zh_CN.po
diffstat for nvidia-graphics-drivers-legacy-96xx-96.43.20 nvidia-graphics-drivers-legacy-96xx-96.43.20

 NEWS                                |    9 ++---
 changelog                           |   13 +++++++
 control                             |    3 +
 module/debian/control.template.in   |    2 -
 po/cs.po                            |   52 ------------------------------
 po/da.po                            |   53 -------------------------------
 po/de.po                            |   60 -----------------------------------
 po/fr.po                            |   61 ------------------------------------
 po/it.po                            |   52 ------------------------------
 po/pl.po                            |   58 ----------------------------------
 po/ru.po                            |   55 --------------------------------
 po/sk.po                            |   52 ------------------------------
 po/sv.po                            |   54 -------------------------------
 po/templates.pot                    |   45 --------------------------
 xserver-xorg-video-nvidia.templates |    7 +---
 15 files changed, 23 insertions(+), 553 deletions(-)

diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/NEWS nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/NEWS
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/NEWS	2012-07-12 08:15:15.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/NEWS	2012-08-04 17:23:42.000000000 +0200
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers-legacy-96xx (96.43.20-5) unstable; urgency=low
+nvidia-graphics-drivers-legacy-96xx (96.43.20-6+) unstable; urgency=low
 
   Nvidia Corporation has not updated the legacy 96xx driver to support 
   current X servers, so this driver is no longer usable.  For graphics
@@ -6,11 +6,10 @@
   the best option is to use the free Nouveau driver.
 
   To switch to the Nouveau driver, please uninstall all Nvidia driver
-  packages, remove all Nvidia-specific configuration from
-  /etc/X11/xorg.conf (and xorg.conf.d/), and *purge* the
-  nvidia-kernel-common package - just removing it is insufficient.
+  packages, and remove all Nvidia-specific configuration from
+  /etc/X11/xorg.conf (and xorg.conf.d/).
 
   The Nouveau driver (xserver-xorg-video-nouveau) should work without
   needing any specific xorg.conf settings.
 
- -- Andreas Beckmann <debian@abeckmann.de>  Thu, 28 Jun 2012 16:36:17 +0200
+ -- Andreas Beckmann <debian@abeckmann.de>  Xxx, 01 Aug 2012 16:36:17 +0200
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/changelog nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/changelog
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/changelog	2012-07-31 13:15:41.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/changelog	2012-08-06 14:12:11.000000000 +0200
@@ -1,3 +1,16 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.20-6+exp1) experimental; urgency=low
+
+  * Upload to experimental.
+  * Temporarily mark template unstranslatable and drop translations.
+  * Bump nvidia-kernel-common dependency to the version that manages the
+    nouveau blacklist via the glx alternative.
+  * libgl1-nvidia*-glx: Add explicit dependency on a newer
+    nvidia-kernel-common to ensure the old blacklist is cleaned up.
+  * Remove the requirement to purge nvidia-kernel-common from NEWS and debconf
+    error message.
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Mon, 06 Aug 2012 14:11:17 +0200
+
 nvidia-graphics-drivers-legacy-96xx (96.43.20-6) unstable; urgency=low
 
   [ Andreas Beckmann ]
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control	2012-07-12 09:12:57.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control	2012-08-04 17:14:29.000000000 +0200
@@ -130,6 +130,7 @@
  nvidia-installer-cleanup,
  ${misc:Pre-Depends}
 Depends:
+ nvidia-kernel-common (>= 20120731),
  nvidia-alternative${nvidia:Legacy},
  nvidia-support,
  ${shlibs:Depends}, ${misc:Depends}
@@ -253,7 +254,7 @@
  nvidia-installer-cleanup,
 Depends:
  dkms (>= 2.1),
- nvidia-kernel-common (>= 20110213),
+ nvidia-kernel-common (>= 20120731),
  ${misc:Depends}
 Recommends:
  nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}),
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/control.template.in nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/control.template.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/control.template.in	2012-06-28 16:23:23.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/control.template.in	2012-08-04 17:09:43.000000000 +0200
@@ -10,7 +10,7 @@
 Package: nvidia-kernel#LEGACY#-#KVERS#
 Architecture: i386 amd64
 Provides: nvidia-kernel-#VERSION#
-Depends: nvidia-kernel-common (>= 20110213)
+Depends: nvidia-kernel-common (>= 20120731)
 Recommends: linux-image-#KVERS#
 Description: NVIDIA binary kernel module for Linux #KVERS#
  This package provides the non-free NVIDIA binary kernel module built for
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/cs.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/cs.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/da.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/da.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/de.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/de.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/fr.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/fr.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/it.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/it.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/pl.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/pl.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/ru.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/ru.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/sk.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/sk.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/sv.po nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/sv.po
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/templates.pot nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/templates.pot
diff -Nru nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.templates nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.templates
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.templates	2012-07-18 18:06:18.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.templates	2012-08-04 17:05:59.000000000 +0200
@@ -1,12 +1,11 @@
 Template: nvidia/unsupported-legacy-96xx
 Type: error
-_Description: Nvidia legacy 96xx driver is no longer supported.
+Description: Nvidia legacy 96xx driver is no longer supported.
  Nvidia Corporation has not updated the legacy 96xx driver to support
  current X servers, so this driver is no longer usable. For graphics
  adapters that are not supported by a newer Nvidia driver generation,
  the best option is to use the free Nouveau driver.
  .
  To switch to the Nouveau driver, please uninstall all Nvidia driver
- packages, remove all Nvidia-specific configuration from
- /etc/X11/xorg.conf (and xorg.conf.d/), and *purge* the
- nvidia-kernel-common package - just removing it is insufficient.
+ packages, and remove all Nvidia-specific configuration from
+ /etc/X11/xorg.conf (and xorg.conf.d/).
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 3274)
+++ debian/changelog	(working copy)
@@ -1,3 +1,13 @@
+nvidia-graphics-drivers-legacy-173xx (173.14.35-3) UNRELEASED; urgency=low
+
+  * Upload to experimental.
+  * Bump nvidia-kernel-common dependency to the version that transferred
+    handling of the blacklist to glx-alternative-nvidia.  This allows
+    switching between Nouveau and Nvidia without requiring
+    nvidia-kernel-common to be purged.
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Tue, 07 Aug 2012 13:03:43 +0200
+
 nvidia-graphics-drivers-legacy-173xx (173.14.35-2) unstable; urgency=low
 
   * Synchronize packaging with nvidia-graphics-drivers 295.59-1:
Index: debian/README.alternatives
===================================================================
--- debian/README.alternatives	(revision 3274)
+++ debian/README.alternatives	(working copy)
@@ -7,9 +7,10 @@
 
 
 To switch between the GLX implementation from MESA, NVIDIA and AMD(fglrx),
-use
+run
 
     update-alternatives --config glx
+    update-initramfs -u
 
 
 
@@ -62,7 +63,12 @@
 
     update-alternatives --config glx
 
-which allows one to select a glx provider from mesa, nvidia, fglrx.
+followed by
+
+    update-initramfs -u
+
+which allows one to select a glx provider from mesa, nvidia, fglrx
+and rebuilds the initrd with a possibly changed kernel module blacklist.
 (Available choices depend on the installed drivers.)
 
 For NVIDIA, there is a second alternative that allows one to switch between
Index: debian/module/debian/control.template.in
===================================================================
--- debian/module/debian/control.template.in	(revision 3274)
+++ debian/module/debian/control.template.in	(working copy)
@@ -10,7 +10,7 @@
 Package: nvidia-kernel#LEGACY#-#KVERS#
 Architecture: i386 amd64
 Provides: nvidia-kernel-#VERSION#
-Depends: nvidia-kernel-common (>= 20110213)
+Depends: nvidia-kernel-common (>= 20120731)
 Recommends: linux-image-#KVERS#
 Description: NVIDIA binary kernel module for Linux #KVERS#
  This package provides the non-free NVIDIA binary kernel module built for
Index: debian/control
===================================================================
--- debian/control	(revision 3274)
+++ debian/control	(working copy)
@@ -223,7 +223,7 @@
  nvidia-installer-cleanup,
 Depends:
  dkms (>= 2.1),
- nvidia-kernel-common (>= 20110213),
+ nvidia-kernel-common (>= 20120731),
  ${misc:Depends}
 Recommends:
  nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}),
diffstat for fglrx-driver-12-6+point fglrx-driver-12-6+point

 changelog                  |   24 +++++++
 control                    |    8 +-
 control.models             |    2 
 fglrx-driver.NEWS          |    9 +-
 fglrx-driver.maintscript   |    1 
 fglrx-driver.modprobe      |    3 
 fglrx-driver.postrm        |    2 
 fglrx-driver.templates     |    4 -
 libfglrx.templates         |   19 +++---
 module/control.template.in |    3 
 module/rules.in            |    7 +-
 po/cs.po                   |  111 -----------------------------------
 po/da.po                   |  111 -----------------------------------
 po/de.po                   |  116 -------------------------------------
 po/es.po                   |  140 ---------------------------------------------
 po/fr.po                   |  118 -------------------------------------
 po/gl.po                   |  119 --------------------------------------
 po/it.po                   |  114 ------------------------------------
 po/ja.po                   |   94 ------------------------------
 po/pl.po                   |  116 -------------------------------------
 po/pt.po                   |  115 ------------------------------------
 po/ru.po                   |  115 ------------------------------------
 po/sk.po                   |   78 -------------------------
 po/sv.po                   |  110 -----------------------------------
 po/templates.pot           |   95 ------------------------------
 25 files changed, 61 insertions(+), 1573 deletions(-)

diff -Nru fglrx-driver-12-6+point/debian/changelog fglrx-driver-12-6+point/debian/changelog
--- fglrx-driver-12-6+point/debian/changelog	2012-07-30 18:15:11.000000000 +0200
+++ fglrx-driver-12-6+point/debian/changelog	2012-08-07 11:44:06.000000000 +0200
@@ -1,3 +1,27 @@
+fglrx-driver (1:12-6+point-1+exp1) experimental; 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
+    to record the exact versions of linux and fglrx-driver that were used
+    during the build.
+  * libgl1-fglrx-glx:i386: Add Breaks: ia32-libs (<< 20120701) because that is
+    still shipping /usr/lib32/libGL.so.1 which gets no longer diverted away.
+    (Closes: #683853)
+  * fglrx-atieventsd: Add Depends: glx-alternative-fglrx to ensure the
+    triggers are processed and the glx alternative is properly setup before
+    the atieventsd is started.  (See: #684000)
+
+  * Upload to experimental.
+  * Temporarily mark templates as untranslatable and drop translations.
+  * Mention the availability of fglrx-legacy-driver (most probably via
+    wheezy-backports).
+  * The radeon backlisting is now handled by glx-alternative-fglrx.
+  * Bump glx-alternative-fglrx dependency accordingly and remove
+    /etc/modprobe.d/fglrx-driver.conf.
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Tue, 07 Aug 2012 11:44:06 +0200
+
 fglrx-driver (1:12-6+point-1) unstable; urgency=low
 
   [ Debconf translations ]
diff -Nru fglrx-driver-12-6+point/debian/control fglrx-driver-12-6+point/debian/control
--- fglrx-driver-12-6+point/debian/control	2012-07-18 20:34:23.000000000 +0200
+++ fglrx-driver-12-6+point/debian/control	2012-08-07 09:12:04.000000000 +0200
@@ -40,7 +40,7 @@
  lib${fglrx} (= ${binary:Version}),
  ${fglrx:XorgDepends},
  xserver-xorg-core,
- glx-alternative-fglrx (>= 0.2),
+ glx-alternative-fglrx (>= 0.2.90),
 Recommends:
  ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
  libgl1-${fglrx}-glx (= ${binary:Version}),
@@ -178,7 +178,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  lib${fglrx} (= ${binary:Version}),
- glx-alternative-fglrx (>= 0.2),
+ glx-alternative-fglrx (>= 0.2.90),
 Provides:
  libgl1-fglrx-glx-virtual,
  libgl1-${fglrx}-glx-i386 [i386],
@@ -188,7 +188,8 @@
 Breaks:
  fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
- libgl1-nvidia-glx (<< 275.09.07-3)
+ libgl1-nvidia-glx (<< 275.09.07-3),
+ ia32-libs (<< 20120701) [i386],
 Replaces:
  libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),
@@ -343,6 +344,7 @@
  ${misc:Depends},
  ${shlibs:Depends},
  lsb-base,
+ glx-alternative-fglrx,
 Recommends:
  ${fglrx}-driver (= ${binary:Version}),
  acpid,
diff -Nru fglrx-driver-12-6+point/debian/control.models fglrx-driver-12-6+point/debian/control.models
--- fglrx-driver-12-6+point/debian/control.models	2012-07-08 23:11:31.000000000 +0200
+++ fglrx-driver-12-6+point/debian/control.models	2012-08-06 22:07:38.000000000 +0200
@@ -1,2 +1,4 @@
 This driver release supports the following graphics adapter families:
 AMD Radeon HD 7000, AMD Radeon HD 6000, and AMD Radeon HD 5000.
+
+For older models try the fglrx-legacy-driver package.
diff -Nru fglrx-driver-12-6+point/debian/fglrx-driver.NEWS fglrx-driver-12-6+point/debian/fglrx-driver.NEWS
--- fglrx-driver-12-6+point/debian/fglrx-driver.NEWS	2012-06-30 21:23:27.000000000 +0200
+++ fglrx-driver-12-6+point/debian/fglrx-driver.NEWS	2012-08-06 15:26:50.000000000 +0200
@@ -1,10 +1,13 @@
 fglrx-driver (1:12-6-2) unstable; urgency=low
 
-  Starting with the Catalyst 12.6 release, support for R6XX/R7XX based GPUs
-  has been dropped by AMD/ATI.  This includes any RadeonHD older than 5xxx,
+  Starting with the Catalyst 12.6 release, AMD/ATI has moved the support for
+  R6XX/R7XX based GPUs to a legacy driver.
+  This includes any RadeonHD older than 5xxx,
   e.g.  RadeonHD 2000
         RadeonHD 3000
         RadeonHD 4000
-  Please switch to the free radeon driver (xserver-xorg-video-radeon).
+  These graphics adapters are only supported by the fglrx-legacy-driver
+  (which will be available via wheezy-backports), or
+  the free Radeon driver (xserver-xorg-video-radeon).
 
  -- Andreas Beckmann <debian@abeckmann.de>  Mon, 04 Jun 2012 10:39:13 +0200
diff -Nru fglrx-driver-12-6+point/debian/fglrx-driver.maintscript fglrx-driver-12-6+point/debian/fglrx-driver.maintscript
--- fglrx-driver-12-6+point/debian/fglrx-driver.maintscript	2012-07-10 11:15:58.000000000 +0200
+++ fglrx-driver-12-6+point/debian/fglrx-driver.maintscript	2012-08-06 17:15:13.000000000 +0200
@@ -2,3 +2,4 @@
 rm_conffile /etc/acpi/events/fglrx-ac	1:12-1-2~
 rm_conffile /etc/acpi/events/fglrx-lid	1:12-1-2~
 rm_conffile /etc/default/fglrx-driver	1:12-6-3~
+rm_conffile /etc/modprobe.d/fglrx-driver.conf	1:12-6+point-1+
diff -Nru fglrx-driver-12-6+point/debian/fglrx-driver.modprobe fglrx-driver-12-6+point/debian/fglrx-driver.modprobe
--- fglrx-driver-12-6+point/debian/fglrx-driver.modprobe	2011-08-08 18:36:18.000000000 +0200
+++ fglrx-driver-12-6+point/debian/fglrx-driver.modprobe	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# fglrx conflicts with the free radeon module.
-
-blacklist radeon
diff -Nru fglrx-driver-12-6+point/debian/fglrx-driver.postrm fglrx-driver-12-6+point/debian/fglrx-driver.postrm
diff -Nru fglrx-driver-12-6+point/debian/fglrx-driver.templates fglrx-driver-12-6+point/debian/fglrx-driver.templates
--- fglrx-driver-12-6+point/debian/fglrx-driver.templates	2012-06-30 20:34:00.000000000 +0200
+++ fglrx-driver-12-6+point/debian/fglrx-driver.templates	2012-08-06 15:21:12.000000000 +0200
@@ -1,6 +1,6 @@
 Template: fglrx-driver/needs-xorg-conf-to-enable
 Type: note
-_Description: Manual configuration required to enable fglrx driver
+Description: Manual configuration required to enable fglrx driver
  The fglrx driver is not yet configured.
  Please consider /usr/bin/aticonfig to create a
  working xorg.conf configuration.
@@ -18,7 +18,7 @@
 Template: fglrx-driver/removed-but-enabled-in-xorg-conf
 Type: note
 #flag:translate!:3
-_Description: Fglrx driver is still enabled in xorg.conf
+Description: Fglrx driver is still enabled in xorg.conf
  The fglrx driver was just removed, but it is still enabled in the
  Xorg configuration. X cannot be (re-)started successfully until fglrx
  is disabled in the following config file(s):
diff -Nru fglrx-driver-12-6+point/debian/libfglrx.templates fglrx-driver-12-6+point/debian/libfglrx.templates
--- fglrx-driver-12-6+point/debian/libfglrx.templates	2012-06-30 21:05:29.000000000 +0200
+++ fglrx-driver-12-6+point/debian/libfglrx.templates	2012-08-06 22:03:36.000000000 +0200
@@ -2,23 +2,26 @@
 Type: boolean
 Default: true
 Description: for internal use
- Can be preseeded.  If set to false, disables the check for no longer
- supported GPUs based on R6XX/R7XX.
+ Can be preseeded.  If set to false, disables the check for
+ legacy GPUs based on R6XX/R7XX.
 
 Template: fglrx-driver/install-even-if-unsupported-gpu-exists
 Type: boolean
 Default: false
 #flag:translate!:3
-_Description: Install fglrx driver despite unsupported graphics card?
+Description: Install fglrx driver despite unsupported graphics card?
  The following graphics chipset found in your system is no longer handled
- by the fglrx driver:
+ by the Fglrx driver:
  .
  ${unsupported-device}
  .
- The above card requires the free Radeon driver in the package
- xserver-xorg-video-radeon. Before the Radeon driver can be used you must
- remove fglrx configuration from xorg.conf (and xorg.conf.d/) and purge
- (not just remove) the fglrx-driver package.
+ The above card requires either the non-free legacy Fglrx driver
+ (package fglrx-legacy-driver) or the free Radeon driver
+ (package xserver-xorg-video-radeon).
+ Before the Radeon driver can be used you must
+ remove Fglrx configuration from xorg.conf (and xorg.conf.d/).
+ .
+ The fglrx-legacy-driver package will be provided in wheezy-backports.
  .
  You may wish to keep fglrx (for instance to drive some other card), but
  the above card won't be usable.
diff -Nru fglrx-driver-12-6+point/debian/module/control.template.in fglrx-driver-12-6+point/debian/module/control.template.in
--- fglrx-driver-12-6+point/debian/module/control.template.in	2012-07-10 14:24:37.000000000 +0200
+++ fglrx-driver-12-6+point/debian/module/control.template.in	2012-08-06 20:48:36.000000000 +0200
@@ -24,6 +24,9 @@
  fglrx-module-#KVERS#,
 Replaces:
  fglrx-module-#KVERS#,
+Built-Using:
+ ${built:using:kernel},
+ ${built:using:fglrx},
 Description: FGLRX binary kernel module for Linux #KVERS#
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
  ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
diff -Nru fglrx-driver-12-6+point/debian/module/rules.in fglrx-driver-12-6+point/debian/module/rules.in
--- fglrx-driver-12-6+point/debian/module/rules.in	2012-07-10 01:13:02.000000000 +0200
+++ fglrx-driver-12-6+point/debian/module/rules.in	2012-08-06 21:10:12.000000000 +0200
@@ -54,6 +54,8 @@
 	dh_prep
 	$(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
 
+get_built_using	?= $(filter-out (=),$(shell dpkg-query -f='$${source:Package} (=$${source:Version})' -W $1))
+
 binary_modules: build
 	dh_testdir
 	dh_testroot
@@ -69,7 +71,10 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:Version=$(subst ~,-,$(upstream_version))'
+	dh_gencontrol -- -v$(PKG_VERSION) \
+		-V'fglrx:Version=$(subst ~,-,$(upstream_version))' \
+		-V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))' \
+		-V'built:using:fglrx=$(call get_built_using,_FGLRX_-source)'
 	dh_md5sums
 ifdef KPKG_DEST_DIR
 	dh_builddeb --destdir=$(KPKG_DEST_DIR)
diff -Nru fglrx-driver-12-6+point/debian/po/cs.po fglrx-driver-12-6+point/debian/po/cs.po
diff -Nru fglrx-driver-12-6+point/debian/po/da.po fglrx-driver-12-6+point/debian/po/da.po
diff -Nru fglrx-driver-12-6+point/debian/po/de.po fglrx-driver-12-6+point/debian/po/de.po
diff -Nru fglrx-driver-12-6+point/debian/po/es.po fglrx-driver-12-6+point/debian/po/es.po
diff -Nru fglrx-driver-12-6+point/debian/po/fr.po fglrx-driver-12-6+point/debian/po/fr.po
diff -Nru fglrx-driver-12-6+point/debian/po/gl.po fglrx-driver-12-6+point/debian/po/gl.po
diff -Nru fglrx-driver-12-6+point/debian/po/it.po fglrx-driver-12-6+point/debian/po/it.po
diff -Nru fglrx-driver-12-6+point/debian/po/ja.po fglrx-driver-12-6+point/debian/po/ja.po
diff -Nru fglrx-driver-12-6+point/debian/po/pl.po fglrx-driver-12-6+point/debian/po/pl.po
diff -Nru fglrx-driver-12-6+point/debian/po/pt.po fglrx-driver-12-6+point/debian/po/pt.po
diff -Nru fglrx-driver-12-6+point/debian/po/ru.po fglrx-driver-12-6+point/debian/po/ru.po
diff -Nru fglrx-driver-12-6+point/debian/po/sk.po fglrx-driver-12-6+point/debian/po/sk.po
diff -Nru fglrx-driver-12-6+point/debian/po/sv.po fglrx-driver-12-6+point/debian/po/sv.po
diff -Nru fglrx-driver-12-6+point/debian/po/templates.pot fglrx-driver-12-6+point/debian/po/templates.pot

Reply to: