[d-i-commits] r32154 - in trunk/packages/partman/partman-auto: . debian

[Joey Hess]

Author: joeyh
Date: 2005-11-16 01:04:34 +0000 (Wed, 16 Nov 2005)
New Revision: 32154

Modified:
   trunk/packages/partman/partman-auto/README
   trunk/packages/partman/partman-auto/debian/changelog
   trunk/packages/partman/partman-auto/debian/control
   trunk/packages/partman/partman-auto/debian/rules
Log:
* Switch package to arch all and only include recipes for the given
  architecture and any subarches in each package.
* Rules file cleanups.
* Control file cleanups.

Modified: trunk/packages/partman/partman-auto/README
===================================================================
--- trunk/packages/partman/partman-auto/README	2005-11-16 00:54:26 UTC (rev 32153)
+++ trunk/packages/partman/partman-auto/README	2005-11-16 01:04:34 UTC (rev 32154)
@@ -1,3 +1,7 @@
+This package adds to the main partitioning menu of partman an item
+`Automatically partition the storage devices'.  For each free space
+it also adds an item `Automatically partition this free space'.
+
 For a description of the format and use of recipe files and other important
 documentation, see installer/doc/devel/partman-auto-recipe.txt
 

Modified: trunk/packages/partman/partman-auto/debian/changelog
===================================================================
--- trunk/packages/partman/partman-auto/debian/changelog	2005-11-16 00:54:26 UTC (rev 32153)
+++ trunk/packages/partman/partman-auto/debian/changelog	2005-11-16 01:04:34 UTC (rev 32154)
@@ -2,8 +2,12 @@
 
   * Renamed multi_user scheme to just "multi" as in multiple partitions.
     There are more uses for this scheme than multi user systems.
+  * Switch package to arch all and only include recipes for the given
+    architecture and any subarches in each package.
+  * Rules file cleanups.
+  * Control file cleanups.
 
- -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 19:54:27 -0500
+ -- Joey Hess <joeyh at debian.org>  Tue, 15 Nov 2005 20:00:28 -0500
 
 partman-auto (45) unstable; urgency=low
 

Modified: trunk/packages/partman/partman-auto/debian/control
===================================================================
--- trunk/packages/partman/partman-auto/debian/control	2005-11-16 00:54:26 UTC (rev 32153)
+++ trunk/packages/partman/partman-auto/debian/control	2005-11-16 01:04:34 UTC (rev 32154)
@@ -4,13 +4,9 @@
 Maintainer: Debian Install System Team <debian-boot at lists.debian.org>
 Uploaders: Anton Zinoviev <zinoviev at debian.org>, Joey Hess <joeyh at debian.org>, Sven Luther <luther at debian.org>
 Build-Depends: debhelper (>= 4.2.0), po-debconf (>= 0.5.0)
-Standards-Version: 3.5.6
 
 Package: partman-auto
 XC-Package-Type: udeb
-Architecture: all
+Architecture: any
 Depends: partman-base, partman-basicfilesystems, partman-ext3
 Description: Automatically partition storage devices (partman)
- This package adds to the main partitioning menu of partman an item
- `Automatically partition the storage devices'.  For each free space
- it also adds an item `Automatically partition this free space'.

Modified: trunk/packages/partman/partman-auto/debian/rules
===================================================================
--- trunk/packages/partman/partman-auto/debian/rules	2005-11-16 00:54:26 UTC (rev 32153)
+++ trunk/packages/partman/partman-auto/debian/rules	2005-11-16 01:04:34 UTC (rev 32154)
@@ -1,19 +1,12 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-PACKAGE = partman-auto
-
 build:
-# Ye olde no-op.
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f `find . -name '*~'`
 	dh_clean
 
 install: build
@@ -23,36 +16,31 @@
 	dh_install autopartition bin
 	dh_install perform_recipe bin
 	dh_install recipes.sh lib/partman
-	debian/install-rc recipes
-	debian/install-rc recipes-alpha
-	debian/install-rc recipes-arm-netwinder
-	debian/install-rc recipes-hppa
-	debian/install-rc recipes-ia64
-	debian/install-rc recipes-mips-sb1-swarm-bn
-	debian/install-rc recipes-mipsel-sb1-swarm-bn
-	debian/install-rc recipes-mipsel-cobalt
-	debian/install-rc recipes-powerpc-powermac_newworld
-	debian/install-rc recipes-powerpc-chrp_ibm
-	debian/install-rc recipes-powerpc-chrp_rs6k
-	debian/install-rc recipes-powerpc-prep
-	debian/install-rc recipes-sparc
+	if [ -d recipes-$(ARCH) ]; then \
+		debian/install-rc recipes-$(ARCH); \
+	else \
+		debian/install-rc recipes; \
+	fi
+	for sub in recipes-$(ARCH)-*; do \
+		if [ -d "$$sub" ]; then \
+			debian/install-rc $$sub; \
+		fi; \
+	done
 	debian/install-rc choose_partition
 	debian/install-rc free_space
 	debian/install-rc automatically_partition
 	debian/install-rc init.d
-	rm -rf `find debian/$(PACKAGE) -name CVS`
-	rm -rf `find debian/$(PACKAGE) -name .svn`
 
-binary-indep: build install
+binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdebconf -n
+	dh_installdebconf
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol
 	dh_builddeb
 
-binary-arch: build install
+binary-indep: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install