[kernel] r19068 - in dists/sid/linux/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sun Jun  3 19:50:07 2012
New Revision: 19068

Log:
linux-patch-debian: Remove

It is no longer necessary for GPL compliance and does not work with our
current patch management.

Deleted:
   dists/sid/linux/debian/templates/patch.unpatch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/rules
   dists/sid/linux/debian/rules.real
   dists/sid/linux/debian/templates/control.main.in

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Jun  3 17:55:07 2012	(r19067)
+++ dists/sid/linux/debian/changelog	Sun Jun  3 19:50:07 2012	(r19068)
@@ -13,6 +13,8 @@
     (Closes: #629410)
   * Build-Depend on kmod or module-init-tools, not just the latter
   * README.source: Update description of patch system to match current usage
+  * linux-patch-debian: Remove; it is no longer necessary for GPL compliance
+    and does not work with our current patch management
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 Jun 2012 20:31:53 +0100
 

Modified: dists/sid/linux/debian/rules
==============================================================================
--- dists/sid/linux/debian/rules	Sun Jun  3 17:55:07 2012	(r19067)
+++ dists/sid/linux/debian/rules	Sun Jun  3 19:50:07 2012	(r19068)
@@ -63,7 +63,7 @@
 
 clean: debian/control
 	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/linux-patch-debian-* debian/xen-linux-system-* debian/*-modules-*-di*
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc debian/linux-headers-* debian/linux-image-* debian/linux-support-* debian/linux-source-* debian/linux-doc-* debian/linux-manual-* debian/xen-linux-system-* debian/*-modules-*-di*
 	dh_clean
 
 binary-indep: $(STAMPS_DIR)/source-base

Modified: dists/sid/linux/debian/rules.real
==============================================================================
--- dists/sid/linux/debian/rules.real	Sun Jun  3 17:55:07 2012	(r19067)
+++ dists/sid/linux/debian/rules.real	Sun Jun  3 19:50:07 2012	(r19068)
@@ -48,7 +48,6 @@
 
 binary-indep: install-doc
 binary-indep: install-manual
-binary-indep: install-patch
 binary-indep: install-source
 binary-indep: install-support
 
@@ -473,21 +472,6 @@
 	dh_gencontrol
 	dh_builddeb
 
-install-patch: PACKAGE = linux-patch-debian-$(VERSION)
-install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAMVERSION)
-install-patch: pfull := debian/$(PACKAGE)$(pbase)
-install-patch: DH_OPTIONS = -p$(PACKAGE)
-install-patch:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
-	dh_install -X.svn debian/patches/* '$(pbase)/debian'
-	install debian/bin/patch.apply '$(pfull)/apply/debian'
-	install debian/templates/patch.unpatch '$(pfull)/unpatch/debian'
-	find '$(pfull)/debian' ! -path '*/series/*' -type f -execdir bzip2 '{}' ';' -execdir chmod 644 '{}.bz2' ';'
-	+$(MAKE_SELF) install-base
-
 install-source: DH_OPTIONS = -plinux-source-$(VERSION)
 install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2
 	dh_testdir

Modified: dists/sid/linux/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux/debian/templates/control.main.in	Sun Jun  3 17:55:07 2012	(r19067)
+++ dists/sid/linux/debian/templates/control.main.in	Sun Jun  3 19:50:07 2012	(r19068)
@@ -41,19 +41,6 @@
  may be installed at a time.  The linux-doc package containing the
  documentation in other formats is free from such restriction.
 
-Package: linux-patch-debian- at version@
-Architecture: all
-Depends: bzip2, linux-support- at abiname@, python, ${misc:Depends}
-Suggests: linux-source- at version@
-Description: Debian patches to version @version@ of the Linux kernel
- This package includes the patches used to produce the prepackaged
- linux-source- at version@ package, as well as architecture-specific
- patches.
- .
- Note that these patches do NOT apply against a pristine
- Linux @version@ kernel but only against the kernel tarball
- @source_package at _@source_upstream at .orig.tar.gz from the Debian archive.
-
 Package: linux-support- at abiname@
 Architecture: all
 Section: devel