Bug#632954: make fakechroot multiarch
tag 632954 pending thanks Thank you very much for rewritting this package and I will upload new version as far as I'll fix some other bugs. 2011/7/30 Johannes Schauer j.scha...@email.de 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 -- .''`.Piotr Roszatycki : :' :mailto:piotr.roszaty...@gmail.com `. `' mailto:dex...@debian.org `-
Bug#632954: make fakechroot multiarch
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/changelog2010-12-18 02:00:44.0 +0100
+++ fakechroot-2.14/debian/changelog2011-07-07 12:35:19.0 +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 j.scha...@email.de 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/clean2010-12-18 01:56:38.0 +0100
+++ fakechroot-2.14/debian/clean1970-01-01 01:00:00.0 +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.0 +0100
+++ fakechroot-2.14/debian/compat 2011-07-07 10:46:57.0 +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.0 +0100
+++ fakechroot-2.14/debian/control 2011-07-07 12:39:27.0 +0200
@@ -2,24 +2,17 @@
Maintainer: Piotr Roszatycki dex...@debian.org
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.0
+0100
+++ fakechroot-2.14/debian/fakechroot.install 2011-07-07 11:04:05.0
+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.install1970-01-01
01:00:00.0 +0100
+++ fakechroot-2.14/debian/libfakechroot.install2011-07-07
11:04:19.0 +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.0
+0100
+++ fakechroot-2.14/debian/patches/series 1970-01-01 01:00:00.0
+0100
@@ -1 +0,0 @@
-# series file
diff -Nru fakechroot-2.14/debian/rules fakechroot-2.14/debian/rules
--- fakechroot-2.14/debian/rules2010-12-18 02:12:23.0 +0100
+++ fakechroot-2.14/debian/rules2011-07-07 12:09:15.0 +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)
Bug#632954: make fakechroot multiarch
On Thu, Jul 07, 2011 at 05:51:11PM +0200, Johannes Schauer wrote: On Thu, Jul 07, 2011 at 02:28:04PM +0200, Geert Stappers wrote: bigsnip/ At least is it hard to see what the actual multiarch enabling is. The enabling is in increasing the compatibility level to 9, build depending on debhelper (= 8.1.3), and setting Multi-Arch: same for the shared library. Now I do understand why the patch did look so intrusive. Thanks for elaborating. Groeten Geert Stappers -- And is there a policy on top-posting vs. bottom-posting? Yes. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#632954: make fakechroot multiarch
Package: fakechroot
Version: 2.14-1
Severity: normal
Tags: patch
Hi,
I prepared a patch that enables multiarch for fakechroot. Please have a
look at it and see that everything is okay.
cheers, josch
diff -Nru fakechroot-2.14/debian/changelog fakechroot-2.14/debian/changelog
--- fakechroot-2.14/debian/changelog 2010-12-18 02:00:44.0 +0100
+++ fakechroot-2.14/debian/changelog 2011-07-07 12:35:19.0 +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 j.scha...@email.de 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.0 +0100
+++ fakechroot-2.14/debian/clean 1970-01-01 01:00:00.0 +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.0 +0100
+++ fakechroot-2.14/debian/compat 2011-07-07 10:46:57.0 +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.0 +0100
+++ fakechroot-2.14/debian/control 2011-07-07 12:39:27.0 +0200
@@ -2,24 +2,17 @@
Maintainer: Piotr Roszatycki dex...@debian.org
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.0 +0100
+++ fakechroot-2.14/debian/fakechroot.install 2011-07-07 11:04:05.0 +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.0 +0100
+++ fakechroot-2.14/debian/libfakechroot.install 2011-07-07 11:04:19.0 +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.0 +0100
+++ fakechroot-2.14/debian/patches/series 1970-01-01 01:00:00.0 +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.0 +0100
+++ fakechroot-2.14/debian/rules 2011-07-07 12:09:15.0 +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:=
Bug#632954: make fakechroot multiarch
On Thu, Jul 07, 2011 at 12:50:54PM +0200, Johannes Schauer wrote: Hi, I prepared a patch that enables multiarch for fakechroot. Please have a look at it and see that everything is okay. To me does look this NMU as a complete rewrite of the debian directory. At least is it hard to see what the actual multiarch enabling is. Cheers Stappers who could resist to remove the patch tag +++ fakechroot-2.14/debian/control2011-07-07 12:39:27.0 +0200 -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 snip/ diff -Nru fakechroot-2.14/debian/rules fakechroot-2.14/debian/rules --- fakechroot-2.14/debian/rules 2010-12-18 02:12:23.0 +0100 +++ fakechroot-2.14/debian/rules 2011-07-07 12:09:15.0 +0200 @@ -1,97 +1,4 @@ ninety-seven lines deleted, four lines inserted. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#632954: make fakechroot multiarch
On Thu, Jul 07, 2011 at 02:28:04PM +0200, Geert Stappers wrote: On Thu, Jul 07, 2011 at 12:50:54PM +0200, Johannes Schauer wrote: Hi, I prepared a patch that enables multiarch for fakechroot. Please have a look at it and see that everything is okay. To me does look this NMU as a complete rewrite of the debian directory. It is not but as you pointed out it is a complete rewrite of the rules file. ninety-seven lines deleted, four lines inserted. If you had a look at what was deleted you would have seen that those lines served the purpose of compiling lib32 and lib64 shared libraries for certain architectures. This is no longer needed and also conflicts with multiarch where every package should only install binaries into the matching triplet and no other. Consult the debian policy manual section 9.1.1. That the only thing that remains is the most minimal debhelper rules file is only convenient and makes mantaining the package easier. No functionality was lost - you can check that by having a closer look to the diff. At least is it hard to see what the actual multiarch enabling is. The enabling is in increasing the compatibility level to 9, build depending on debhelper (= 8.1.3), and setting Multi-Arch: same for the shared library. The package had also to be split into two because of reasons you can all read about here: http://wiki.debian.org/Multiarch/Implementation When building fakechroot with my patch applied, it will nicely result in libfakechroot being installend into /usr/lib/triplet/fakechroot as it should. cheers, josch -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
