Revert "Rename package for coexistence of multiple version."

This reverts commit dcc8ce2.

debian/templates/control.extra.in

@@ -25,7 +25,7 @@ Description: Compiler for Linux on x86 (meta-package)
  This package depends on gcc 5 of the appropriate architecture for
  Linux on amd64, i386 and x32.
 
-Package: linux-image-@distributor@-@abiname@-amd64
+Package: linux-image-@distributor@-amd64
 Build-Profiles: <!stage1>
 Architecture: amd64
 Depends: linux-image-@abiname@-@distributor@-amd64, ${misc:Depends}
@@ -36,23 +36,23 @@ Description: Linux for 64-bit PCs (meta-package)
  This kernel also runs on a Xen hypervisor.  It supports both privileged
  (dom0) and unprivileged (domU) operation.
 
-Package: linux-headers-@distributor@-@abiname@-amd64
+Package: linux-headers-@distributor@-amd64
 Build-Profiles: <!stage1>
 Architecture: amd64
 Depends: linux-headers-@abiname@-@distributor@-amd64, ${misc:Depends}
 Description: Header files for Linux amd64 configuration (meta-package)
  This package depends on the architecture-specific header files for the
  latest Linux kernel amd64 configuration.
 
-Package: linux-image-@distributor@-@abiname@-amd64-dbg
+Package: linux-image-@distributor@-amd64-dbg
 Build-Profiles: <!stage1>
 Architecture: amd64
 Depends: linux-image-@abiname@-@distributor@-amd64-dbg, ${misc:Depends}
 Description: Debugging symbols for Linux amd64 configuration (meta-package)
  This package depends on the detached debugging symbols for the latest
  Linux kernel amd64 configuration.
 
-Package: xen-linux-system-@distributor@-@abiname@-amd64
+Package: xen-linux-system-@distributor@-amd64
 Build-Profiles: <!stage1>
 Architecture: amd64
 Provides: xen-linux-system
@@ -61,7 +61,7 @@ Description: Xen system with Linux for 64-bit PCs (meta-package)
  This package depends on the Xen hypervisor and the latest Linux kernel
  amd64 configuration.
 
-Package: linux-image-@distributor@-@abiname@-686
+Package: linux-image-@distributor@-686
 Build-Profiles: <!stage1>
 Architecture: i386
 Depends: linux-image-@abiname@-@distributor@-686, ${misc:Depends}
@@ -70,15 +70,15 @@ Description: Linux for 32-bit PCs (meta-package)
  The Linux kernel 4.4 and modules for use on PCs with one or more
  processors not supporting PAE.
 
-Package: linux-headers-@distributor@-@abiname@-686
+Package: linux-headers-@distributor@-686
 Build-Profiles: <!stage1>
 Architecture: i386
 Depends: linux-headers-@abiname@-@distributor@-686, ${misc:Depends}
 Description: Header files for Linux 686 configuration (meta-package)
  This package depends on the architecture-specific header files for the
  latest Linux kernel 686 configuration.
 
-Package: linux-image-@distributor@-@abiname@-686-pae
+Package: linux-image-@distributor@-686-pae
 Build-Profiles: <!stage1>
 Architecture: i386
 Depends: linux-image-@abiname@-@distributor@-686-pae, ${misc:Depends}
@@ -87,15 +87,15 @@ Description: Linux for 32-bit PCs (meta-package)
  The Linux kernel 4.4 and modules for use on PCs with one or more
  processors supporting PAE.
 
-Package: linux-headers-@distributor@-@abiname@-686-pae
+Package: linux-headers-@distributor@-686-pae
 Build-Profiles: <!stage1>
 Architecture: i386
 Depends: linux-headers-@abiname@-@distributor@-686-pae, ${misc:Depends}
 Description: Header files for Linux 686-pae configuration (meta-package)
  This package depends on the architecture-specific header files for the
  latest Linux kernel 686-pae configuration.
 
-Package: linux-image-@distributor@-@abiname@-686-pae-dbg
+Package: linux-image-@distributor@-686-pae-dbg
 Build-Profiles: <!stage1>
 Architecture: i386
 Depends: linux-image-@abiname@-@distributor@-686-dbg, ${misc:Depends}