Rename to ubuntu-drivers-common, as this package is already necessary…

… for fglrx as well, and will soon get support for more drivers (replacing Jockey). Update file references and names everywhere, and drop the obsolete debian/README.Debian and debian/nvidia-common.preinst.

NvidiaDetector/nvidiadetector.py

@@ -25,7 +25,7 @@
 import sys, logging
 import apt
 
-obsoletePackagesPath = '/usr/share/nvidia-common/obsolete'
+obsoletePackagesPath = '/usr/share/ubuntu-drivers-common/obsolete'
 
 class NoDatadirError(Exception):
     "Exception thrown when no modaliases dir can be found"

PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
-Name: nvidia-common
+Name: ubuntu-drivers-common
 Version: 0.1
-Summary: Find obsolete NVIDIA drivers
+Summary: Detect and install additional Ubuntu driver packages
 Home-page: http://pyserial.sourceforge.net/
 Author: Alberto Milone
 Author-email: [email protected]
 License: GPLv2
-Description: Find obsolete NVIDIA drivers
+Description: Detect and install additional Ubuntu driver packages
 Platform: Linux

debian/changelog

@@ -1,3 +1,12 @@
+ubuntu-drivers-common (1:0.2.46) UNRELEASED; urgency=low
+
+  * Rename to ubuntu-drivers-common, as this package is already necessary for
+    fglrx as well, and will soon get support for more drivers (replacing
+    Jockey). Update file references and names everywhere, and drop the
+    obsolete debian/README.Debian and debian/nvidia-common.preinst.
+
+ -- Martin Pitt <[email protected]>  Mon, 21 May 2012 11:15:01 +0200
+
 nvidia-common (1:0.2.45) quantal; urgency=low
 
   * Don't write to /usr/share for hybrid graphics

debian/control

@@ -1,4 +1,4 @@
-Source: nvidia-common
+Source: ubuntu-drivers-common
 Section: admin
 Priority: optional
 Maintainer: Ubuntu Developers <[email protected]>
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~),
 Standards-Version: 3.9.1
 XS-Python-Version: >= 2.6
 
-Package: nvidia-common
+Package: ubuntu-drivers-common
 Architecture: i386 amd64 armel armhf
 Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${python:Depends}, 
@@ -22,11 +22,19 @@ Depends: ${python:Depends},
  pciutils,
  python-apt,
  python-xkit
-Replaces: nvidia-180-modaliases, nvidia-185-modaliases, nvidia-current-modaliases
-Conflicts: nvidia-180-modaliases, nvidia-185-modaliases, nvidia-current-modaliases
+Replaces: nvidia-common (<< 1:0.2.46)
+Conflicts: nvidia-common (<< 1:0.2.46)
+Provides: nvidia-common
 XB-Python-Version: ${python:Versions}
-Description: Find obsolete NVIDIA drivers
+Description: Detect and install additional Ubuntu driver packages
  This package will find obsolete NVIDIA drivers in use,
  detect the hardware and recommend the most appropriate
  driver.
 
+Package: nvidia-common
+Section: oldlibs
+Architecture: i386 amd64 armel armhf
+Depends: ubuntu-drivers-common
+Description: transitional package for ubuntu-drivers-common
+ This is a transitional package for ubuntu-drivers-common. You can remove it
+ after upgrading.

debian/po/POTFILES.in

@@ -1 +1 @@
-[type: gettext/rfc822deb] nvidia-common.templates
+[type: gettext/rfc822deb] ubuntu-drivers-common.templates

debian/po/templates.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Source: nvidia[email protected]\n"
+"Report-Msgid-Bugs-To: Source: ubuntu-drivers[email protected]\n"
 "POT-Creation-Date: 2008-07-10 15:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -18,32 +18,32 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../nvidia-common.templates:1001
+#: ../ubuntu-drivers-common.templates:1001
 msgid "Obsolete NVIDIA Driver version"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nvidia-common.templates:1001
+#: ../ubuntu-drivers-common.templates:1001
 msgid "The system has detected an obsolete NVIDIA driver in your system."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nvidia-common.templates:1001
+#: ../ubuntu-drivers-common.templates:1001
 msgid ""
 "Please install ${latest} at the end of the installation with the following "
 "command:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nvidia-common.templates:1001
+#: ../ubuntu-drivers-common.templates:1001
 msgid "sudo apt-get install ${latest}"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nvidia-common.templates:1001
+#: ../ubuntu-drivers-common.templates:1001
 msgid "The removal of other NVIDIA drivers will be dealt with automatically."
 msgstr ""

debian/nvidia-common.config → debian/ubuntu-drivers-common.config

@@ -3,7 +3,7 @@ set -e
 
 # Do not remove this file. It's supposed to
 # get debconf to load the template file
-# when nvidia-common is triggered by kernel
+# when ubuntu-drivers-common is triggered by kernel
 # hooks.
 
 . /usr/share/debconf/confmodule

debian/ubuntu-drivers-common.install

@@ -0,0 +1,3 @@
+etc
+usr
+var

debian/nvidia-common.templates → debian/ubuntu-drivers-common.templates

@@ -1,4 +1,4 @@
-Template: nvidia-common/obsolete-driver
+Template: ubuntu-drivers-common/obsolete-driver
 Type: error
 _Description: Obsolete NVIDIA Driver version
  The system has detected an obsolete NVIDIA driver in your system.

nvidia-common

@@ -1,14 +1,14 @@
 #!/bin/bash -e
 . /usr/share/debconf/confmodule
-db_set nvidia-common/obsolete-driver false
-db_input high nvidia-common/obsolete-driver || true
+db_set ubuntu-drivers-common/obsolete-driver false
+db_input high ubuntu-drivers-common/obsolete-driver || true
 
 if [ -x /usr/bin/nvidia-detector ]; then
     LATEST=$(nvidia-detector)
     if [ ${LATEST} ] && [ "${LATEST}" != "none" ]; then
-        db_fset nvidia-common/obsolete-driver seen false
-        db_subst nvidia-common/obsolete-driver latest $LATEST
-        db_input high nvidia-common/obsolete-driver || true
+        db_fset ubuntu-drivers-common/obsolete-driver seen false
+        db_subst ubuntu-drivers-common/obsolete-driver latest $LATEST
+        db_input high ubuntu-drivers-common/obsolete-driver || true
         db_go || true
     fi
 fi

quirks-handler

@@ -27,7 +27,7 @@ import Quirks.quirkapplier
 
 
 # Here's where we look for quirks
-quirks_path = '/usr/share/nvidia-common/quirks'
+quirks_path = '/usr/share/ubuntu-drivers-common/quirks'
 
 def main(options):
     if options.verbose:

setup.py

@@ -21,19 +21,19 @@
     os.chmod(x, 0755)
 
 setup(
-    name="nvidia-common",
+    name="ubuntu-drivers-common",
     author="Alberto Milone",
     author_email="[email protected]",
     maintainer="Alberto Milone",
     maintainer_email="[email protected]",
     url="http://www.albertomilone.com",
     license="gpl",
-    description="Find obsolete NVIDIA drivers",
+    description="Detect and install additional Ubuntu driver packages",
     packages=["NvidiaDetector", "Quirks"],
-    data_files=[("/usr/share/nvidia-common/", glob.glob("share/obsolete")),
-                ("/var/lib/nvidia-common/", glob.glob("share/last_gfx_boot")),
+    data_files=[("/usr/share/ubuntu-drivers-common/", glob.glob("share/obsolete")),
+                ("/var/lib/ubuntu-drivers-common/", glob.glob("share/last_gfx_boot")),
                 ("/etc/init/", glob.glob("share/hybrid/hybrid-gfx.conf")),
-                ("/usr/share/nvidia-common/quirks", glob.glob("quirks/*")),
+                ("/usr/share/ubuntu-drivers-common/quirks", glob.glob("quirks/*")),
                 ("/usr/lib/nvidia/", glob.glob("nvidia-installer-hooks/*")),
                ],# + mo_files,
     scripts=["nvidia-detector", "quirks-handler", "share/hybrid/hybrid-detect"],

share/hybrid/hybrid-detect.c

@@ -65,7 +65,7 @@
       || ((((c) & 0x00ffff00)                                           \
            == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) )
 
-#define FILENAME "/var/lib/nvidia-common/last_gfx_boot"
+#define FILENAME "/var/lib/ubuntu-drivers-common/last_gfx_boot"
 
 static struct pci_slot_match match = {
     PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0