* debian/changelog: Update.

* debian/rules, debian/rules.real: Remove linux-tools build and removal.
* debian/templates/control.main.in: Remove linux-tools-* package.

svn path=/dists/trunk/linux-2.6/; revision=18195

debian/changelog

@@ -15,6 +15,8 @@ linux-2.6 (3.1.0-1~experimental.1) UNRELEASED; urgency=low
   [ Bastian Blank ]
   * Use xz compression for debug packages.
   * Make gcc-4.6 the default compiler.
+  * Use shorter versions in the package names.
+  * Remove linux-tools-* binary package.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 27 Sep 2011 06:02:56 +0100
 

debian/rules

@@ -56,7 +56,7 @@ maintainerclean:
 
 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-tools-* 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/linux-patch-debian-* debian/xen-linux-system-* debian/*-modules-*-di*
 	dh_clean
 
 binary-indep: $(STAMPS_DIR)/source-base

debian/rules.real

@@ -45,9 +45,6 @@ MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=
 #
 binary-arch-arch: install-headers_$(ARCH)
 binary-arch-arch: install-libc-dev_$(ARCH)
-ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(ARCH)),)
-  binary-arch-arch: install-tools_$(ARCH)
-endif
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
 binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 ifeq ($(DEBUG),True)
@@ -146,14 +143,6 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
 	python debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	@$(stamp)
 
-$(STAMPS_DIR)/build-tools_$(ARCH): SOURCE_DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/build-tools_$(ARCH): DIR=$(BUILD_DIR)/build-tools_$(ARCH)
-$(STAMPS_DIR)/build-tools_$(ARCH): $(STAMPS_DIR)/source
-	rm -rf $(DIR)
-	cp -al $(SOURCE_DIR) $(DIR)
-	+$(MAKE_CLEAN) -C '$(DIR)/tools/perf' $(JOBS_ARG) $(MAKE_PERF_VARS) all man
-	@$(stamp)
-
 $(STAMPS_DIR)/build-doc: SOURCE_DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
 $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
@@ -510,29 +499,6 @@ install-udeb_$(ARCH):
 	dh_gencontrol
 	dh_builddeb
 
-install-tools_$(ARCH): PACKAGE_NAME = linux-tools-$(VERSION)
-install-tools_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
-install-tools_$(ARCH): DIR = $(BUILD_DIR)/build-tools_$(ARCH)
-install-tools_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-tools_$(ARCH): $(STAMPS_DIR)/build-tools_$(ARCH)
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs usr/bin
-	+$(MAKE_CLEAN) -C '$(DIR)/tools/perf' $(MAKE_PERF_VARS) \
-		DESTDIR='$(CURDIR)/$(PACKAGE_DIR)' install install-man
-	# Rename command and manual pages to include version
-	mv $(PACKAGE_DIR)/usr/bin/perf $(PACKAGE_DIR)/usr/bin/perf_$(VERSION)
-	for manpage in $(PACKAGE_DIR)/usr/share/man/*/*; do \
-		mv "$$manpage" "$$(echo "$$manpage" | sed 's,/perf,&_$(VERSION),')" || exit; \
-	done
-	# Fix up cross-references
-	sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
-		$(PACKAGE_DIR)/usr/share/man/*/*
-	dh_perl /usr/share/perf_$(VERSION)-core/scripts/perl/Perf-Trace-Util/lib/
-	dh_python2 /usr/share/perf_$(VERSION)-core/scripts/python/Perf-Trace-Util/lib/
-	+$(MAKE_SELF) install-base
-
 install-patch: PACKAGE = linux-patch-debian-$(VERSION)
 install-patch: pbase := /usr/src/kernel-patches/all/$(UPSTREAMVERSION)
 install-patch: pfull := debian/$(PACKAGE)$(pbase)

debian/templates/control.main.in

@@ -1,15 +1,3 @@
-Package: linux-tools-@version@
-Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
-Recommends: linux-base (>= 2.6.32-16)
-Suggests: linux-doc-@version@
-Description: Performance analysis tools for Linux @upstreamversion@
- This package contains the 'perf' performance analysis tools for Linux
- kernel version @upstreamversion@.
- .
- The linux-base package contains a 'perf' command which will invoke the
- appropriate version for the running kernel.
-
 Package: linux-source-@version@
 Architecture: all
 Section: kernel