lol

* checkinstall: don't include directories in the Debian `conffiles' file. This caused the Nix Debian build to fail (because it installs a file /etc/profile.d/nix.sh).

svn path=/nixpkgs/trunk/; revision=15038

+28
+3
pkgs/tools/package-management/checkinstall/default.nix
··· 20 20 # Implement the getxattr(), lgetxattr(), __open_2() and 21 21 # __open64_2() functions. Needed for doing builds on Ubuntu 8.10. 22 22 ./missing-functions.patch 23 + 24 + # Don't include directories in the Debian `conffiles' file. 25 + ./etc-dirs.patch 23 26 ]; 24 27 25 28 buildInputs = [gettext];
+25
pkgs/tools/package-management/checkinstall/etc-dirs.patch
··· 1 + diff -rc checkinstall-orig/checkinstall checkinstall/checkinstall 2 + *** checkinstall-orig/checkinstall 2009-03-27 17:07:26.000000000 +0100 3 + --- checkinstall/checkinstall 2009-04-14 16:34:08.000000000 +0200 4 + *************** 5 + *** 2607,2615 **** 6 + chmod 755 $BUILD_DIR/DEBIAN/postrm 7 + fi 8 + 9 + ! # Tag files in /etc to be conffiles 10 + find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ 11 + ! grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles 12 + 13 + # The package will be saved here (ignores <epoch>: prefix): 14 + DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb" 15 + --- 2607,2616 ---- 16 + chmod 755 $BUILD_DIR/DEBIAN/postrm 17 + fi 18 + 19 + ! # Tag non-directory files in /etc to be conffiles 20 + find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \ 21 + ! (while read fn; do test ! -d "$BUILD_DIR/$fn" && echo "$fn"; done) \ 22 + ! > $BUILD_DIR/DEBIAN/conffiles 23 + 24 + # The package will be saved here (ignores <epoch>: prefix): 25 + DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"