diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 19 | ||||
| -rw-r--r-- | debian/control-uml | 51 | ||||
| -rwxr-xr-x | debian/rules | 15 | ||||
| -rwxr-xr-x | debian/rules-uml | 82 |
6 files changed, 152 insertions, 33 deletions
@@ -1,3 +1,9 @@ +2004-10-20 Junichi Uekawa <dancer@debian.org> + + * debian/control: Remove uml package + * debian/rules: Remove uml package + workaround for sarge release. + 2004-10-09 Junichi Uekawa <dancer@debian.org> * Documentation/pbuilder-doc.xml (PBUILDER_UML_IMAGE): documentation on diff --git a/debian/changelog b/debian/changelog index 2609d15..a4c831f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pbuilder (0.117) unstable; urgency=HIGH + + * Remove pbuilder-user-mode-linux package for the time being, until + such time that user-mode-linux package is properly restored into Debian. + (closes: #276992) + - this is a task specially done for sarge release; to create a package + which does create pbuilder-uml, copy the files and rebuild: + debian/rules-uml -> debian/rules + debian/control-uml -> debian/control + + -- Junichi Uekawa <dancer@debian.org> Wed, 20 Oct 2004 08:15:40 +0900 + pbuilder (0.116) unstable; urgency=low * Maintenance update on pbuilder diff --git a/debian/control b/debian/control index 96d2d67..d4882ed 100644 --- a/debian/control +++ b/debian/control @@ -28,22 +28,3 @@ Description: personal package builder for Debian packages . pdebuild is a wrapper for Debian Developers, to allow running pbuilder just like "debuild", as a normal user. - -Package: pbuilder-uml -Architecture: i386 -Depends: rootstrap (>= 0.3.9-1), user-mode-linux, pbuilder (= ${Source-Version}) -Description: user-mode-linux version of pbuilder - pbuilder-uml uses a User-mode-linux system, and builds Debian packages - inside the UML image. It is an ideal system to use to check - that a package has correct build-dependencies. - It uses apt extensively, and a local mirror, or a fast connection - to a Debian mirror is ideal, but not necessary. - . - Requires user-mode-linux to function correctly - . - "pbuilder-user-mode-linux create" uses rootstrap to create UML image - . - "pbuilder-user-mode-linux update" updates the image to the current state of - testing/unstable/whatever - . - "pbuilder-user-mode-linux build" takes a *.dsc file and builds a binary in the UML diff --git a/debian/control-uml b/debian/control-uml new file mode 100644 index 0000000..a6d2875 --- /dev/null +++ b/debian/control-uml @@ -0,0 +1,51 @@ +# note: this version is with UML support. 20041020 + +Source: pbuilder +Section: devel +Priority: extra +Maintainer: Junichi Uekawa <dancer@debian.org> +Build-Depends: debhelper (>= 4.1.0), docbook-xsl, ldp-docbook-xsl, xsltproc +Standards-Version: 3.6.1 + +Package: pbuilder +Architecture: all +Depends: debootstrap (>= 0.2.29), wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1) +Recommends: fakeroot, sudo, devscripts +Suggests: pbuilder-uml +Description: personal package builder for Debian packages + pbuilder constructs a chroot system, and builds a package inside the + chroot. + It is an ideal system to use to check + that a package has correct build-dependencies. + It uses apt extensively, and a local mirror, or a fast connection + to a Debian mirror is ideal, but not necessary. + . + "pbuilder create" uses debootstrap to create a chroot image. + . + "pbuilder update" updates the image to the current state of + testing/unstable/whatever + . + "pbuilder build" takes a *.dsc file and builds a binary in the chroot + image. + . + pdebuild is a wrapper for Debian Developers, to allow running + pbuilder just like "debuild", as a normal user. + +Package: pbuilder-uml +Architecture: i386 +Depends: rootstrap (>= 0.3.9-1), user-mode-linux, pbuilder (= ${Source-Version}) +Description: user-mode-linux version of pbuilder + pbuilder-uml uses a User-mode-linux system, and builds Debian packages + inside the UML image. It is an ideal system to use to check + that a package has correct build-dependencies. + It uses apt extensively, and a local mirror, or a fast connection + to a Debian mirror is ideal, but not necessary. + . + Requires user-mode-linux to function correctly + . + "pbuilder-user-mode-linux create" uses rootstrap to create UML image + . + "pbuilder-user-mode-linux update" updates the image to the current state of + testing/unstable/whatever + . + "pbuilder-user-mode-linux build" takes a *.dsc file and builds a binary in the UML diff --git a/debian/rules b/debian/rules index bc1d7c7..bfd7b65 100755 --- a/debian/rules +++ b/debian/rules @@ -60,20 +60,7 @@ binary-indep: build install # Build architecture-dependent files here. binary-arch: build install -ifeq (${ARCH},i386) - dh_testdir -a - dh_testroot -a - dh_installdocs -a - dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1 - dh_installchangelogs -a - dh_link -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a -endif + echo NOTE: pbuilder-uml is not built see changelog for version 0.117 binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/rules-uml b/debian/rules-uml new file mode 100755 index 0000000..6f17f09 --- /dev/null +++ b/debian/rules-uml @@ -0,0 +1,82 @@ +#!/usr/bin/make -f +# This file is with UML support. +# + +# 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 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 +ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/build-package. + $(MAKE) check + $(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder + dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installman pbuilder.8 pbuilderrc.5 pdebuild.1 debuild-pbuilder.1 + dh_installchangelogs -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install +ifeq (${ARCH},i386) + dh_testdir -a + dh_testroot -a + dh_installdocs -a + dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1 + dh_installchangelogs -a + dh_link -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a +endif + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure |