Hi,

I modified my patch by just adding a --parallel to the dh call as
suggested here: [1]

find the new patch attached

cheers, josch

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617669#5
diff -Nru fakechroot-2.14/debian/changelog fakechroot-2.14/debian/changelog
--- fakechroot-2.14/debian/changelog    2010-12-18 02:00:44.000000000 +0100
+++ fakechroot-2.14/debian/changelog    2011-07-07 12:35:19.000000000 +0200
@@ -1,3 +1,11 @@
+fakechroot (2.14-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * splitting package into fakechroot and libfakechroot
+  * multiarch support
+
+ -- Johannes Schauer <[email protected]>  Thu, 07 Jul 2011 12:33:58 +0200
+
 fakechroot (2.14-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru fakechroot-2.14/debian/clean fakechroot-2.14/debian/clean
--- fakechroot-2.14/debian/clean        2010-12-18 01:56:38.000000000 +0100
+++ fakechroot-2.14/debian/clean        1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-config*.cache
diff -Nru fakechroot-2.14/debian/compat fakechroot-2.14/debian/compat
--- fakechroot-2.14/debian/compat       2010-12-18 01:56:38.000000000 +0100
+++ fakechroot-2.14/debian/compat       2011-07-07 10:46:57.000000000 +0200
@@ -1 +1 @@
-7
+9
diff -Nru fakechroot-2.14/debian/control fakechroot-2.14/debian/control
--- fakechroot-2.14/debian/control      2010-12-18 01:56:38.000000000 +0100
+++ fakechroot-2.14/debian/control      2011-07-07 12:39:27.000000000 +0200
@@ -2,24 +2,17 @@
 Maintainer: Piotr Roszatycki <[email protected]>
 Section: utils
 Priority: optional
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Build-Depends:
- libc6-dev-i386 [amd64],
- libc6-dev-amd64 [i386],
- libc6-dev-powerpc [ppc64],
- libc6-dev-s390x [s390],
- libc6-dev-sparc64 [sparc],
- libc0.1-dev-i386 [kfreebsd-amd64],
- gcc-multilib [amd64 i386 powerpc s390 sparc kfreebsd-amd64],
- debhelper (>= 7.0.50~)
+ autotools-dev,
+ debhelper (>= 8.1.3)
 Homepage: http://fakechroot.alioth.debian.org/
-Vcs-Browser: http://bazaar.launchpad.net/~dexter/fakechroot/sid/files
-Vcs-Bzr: lp:fakechroot
+Vcs-Browser: https://github.com/fakechroot/fakechroot
+Vcs-Git: git://github.com/fakechroot/fakechroot.git
 
 Package: fakechroot
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${shlibs-biarch:Suggests}
 Description: gives a fake chroot environment
  This package provides a library which overrides libc functions, so
  it is possible to use root-specific tools without root privileges.
@@ -27,3 +20,20 @@
  In fake chroot you can install i.e. Debian bootstrap, create developer's
  environment and build packages inside chroot'ed system using standard
  non-root user account.
+ .
+ fakechroot executable wrapper script
+
+Package: libfakechroot
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Description: gives a fake chroot environment
+ This package provides a library which overrides libc functions, so
+ it is possible to use root-specific tools without root privileges.
+ .
+ In fake chroot you can install i.e. Debian bootstrap, create developer's
+ environment and build packages inside chroot'ed system using standard
+ non-root user account.
+ .
+ fakechroot library
diff -Nru fakechroot-2.14/debian/fakechroot.install 
fakechroot-2.14/debian/fakechroot.install
--- fakechroot-2.14/debian/fakechroot.install   2010-12-18 01:56:38.000000000 
+0100
+++ fakechroot-2.14/debian/fakechroot.install   2011-07-07 11:04:05.000000000 
+0200
@@ -1,3 +1,2 @@
 usr/bin/*
-usr/lib*/fakechroot/*.so
 usr/share/man/man*/*
diff -Nru fakechroot-2.14/debian/libfakechroot.install 
fakechroot-2.14/debian/libfakechroot.install
--- fakechroot-2.14/debian/libfakechroot.install        1970-01-01 
01:00:00.000000000 +0100
+++ fakechroot-2.14/debian/libfakechroot.install        2011-07-07 
11:04:19.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/*/fakechroot/*.so
diff -Nru fakechroot-2.14/debian/patches/series 
fakechroot-2.14/debian/patches/series
--- fakechroot-2.14/debian/patches/series       2010-12-18 01:56:38.000000000 
+0100
+++ fakechroot-2.14/debian/patches/series       1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-# series file
diff -Nru fakechroot-2.14/debian/rules fakechroot-2.14/debian/rules
--- fakechroot-2.14/debian/rules        2010-12-18 02:12:23.000000000 +0100
+++ fakechroot-2.14/debian/rules        2011-07-07 12:09:15.000000000 +0200
@@ -1,97 +1,4 @@
 #!/usr/bin/make -f
 
-CC = gcc
-
-DEB_HOST_ARCH      := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 
2>/dev/null)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 
2>/dev/null)
-
-ifneq (,$(findstring 
:$(DEB_HOST_ARCH):,:amd64:i386:ppc64:s390:sparc:kfreebsd-amd64:))
-ifeq ($(DEB_HOST_ARCH),amd64)
-BIARCH_LIBDIR        := /usr/lib32
-BIARCH_HOST_GNU_TYPE := i486-linux-gnu
-BIARCH_CC            := $(CC) -m32
-endif
-ifeq ($(DEB_HOST_ARCH),i386)
-BIARCH_LIBDIR        := /usr/lib64
-BIARCH_HOST_GNU_TYPE := x86_64-linux-gnu
-BIARCH_CC            := $(CC) -m64
-endif
-ifeq ($(DEB_HOST_ARCH),ppc64)
-BIARCH_LIBDIR        := /usr/lib32
-BIARCH_HOST_GNU_TYPE := powerpc-linux-gnu
-BIARCH_CC            := $(CC) -m32
-endif
-ifeq ($(DEB_HOST_ARCH),s390)
-BIARCH_LIBDIR        := /usr/lib64
-BIARCH_HOST_GNU_TYPE := s390x-linux-gnu
-BIARCH_CC            := $(CC) -m64
-endif
-ifeq ($(DEB_HOST_ARCH),sparc)
-BIARCH_LIBDIR        := /usr/lib64
-BIARCH_HOST_GNU_TYPE := sparc64-linux-gnu
-BIARCH_CC            := $(CC) -m64
-endif
-ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
-BIARCH_LIBDIR        := /usr/lib32
-BIARCH_HOST_GNU_TYPE := i486-kfreebsd-gnu
-BIARCH_CC            := $(CC) -m32
-endif
-LIBPATH := /usr/lib/fakechroot:$(BIARCH_LIBDIR)/fakechroot
-else
-BIARCH_HOST_GNU_TYPE :=
-LIBPATH := /usr/lib/fakechroot
-endif
-
-COMMON_CONFIG := \
-    --config-cache \
-    --prefix=/usr \
-    --mandir=/usr/share/man \
-    --with-libpath=$(LIBPATH) \
-    --disable-static \
-    --disable-maintainer-mode \
-    --disable-dependency-tracking
-
 %:
        dh $@ --parallel
-
-override_dh_auto_clean:
-       test -f Makefile && make distclean || true
-       rm -rf build-tree-*
-
-override_dh_auto_configure:
-       mkdir -p build-tree-lib
-       cd build-tree-lib && \
-       ../configure \
-           $(COMMON_CONFIG) \
-           CC="$(CC)"
-       
-ifneq (,$(BIARCH_HOST_GNU_TYPE))
-       mkdir -p build-tree-lib-biarch
-       cd build-tree-lib-biarch && \
-       ../configure \
-           --build=$(DEB_BUILD_GNU_TYPE) \
-           --host=$(BIARCH_HOST_GNU_TYPE) \
-           --libdir=$(BIARCH_LIBDIR) \
-           $(COMMON_CONFIG) \
-           CC="$(BIARCH_CC)"
-endif
-
-override_dh_auto_build:
-       cd build-tree-lib && make
-       cd build-tree-lib && make test PROVE='prove --failures'
-ifneq (,$(BIARCH_HOST_GNU_TYPE))
-       cd build-tree-lib-biarch && make
-endif
-
-override_dh_auto_install:
-       cd build-tree-lib && make install DESTDIR=$(CURDIR)/debian/tmp
-ifneq (,$(BIARCH_HOST_GNU_TYPE))
-       cd build-tree-lib-biarch && make install DESTDIR=$(CURDIR)/debian/tmp
-endif
-
-override_dh_shlibdeps:
-       dh_shlibdeps -X/usr/lib32/fakechroot/ -X/usr/lib64/fakechroot/
-ifneq (,$(BIARCH_HOST_GNU_TYPE))
-       dh_shlibdeps -X/usr/lib/fakechroot/ -- -pshlibs-biarch -dSuggests
-endif

Reply via email to