From 6a18dcab449496c47e8d920e568eceb4a6101994 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Apr 2009 14:57:31 +0000
Subject: * 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
---
 .../package-management/checkinstall/default.nix    |  3 +++
 .../package-management/checkinstall/etc-dirs.patch | 25 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/package-management/checkinstall/etc-dirs.patch

(limited to 'pkgs/tools/package-management')

diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index fe8f20bb456a..818d4e836d88 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
     # Implement the getxattr(), lgetxattr(), __open_2() and
     # __open64_2() functions.  Needed for doing builds on Ubuntu 8.10.
     ./missing-functions.patch
+
+    # Don't include directories in the Debian `conffiles' file.
+    ./etc-dirs.patch
   ];
 
   buildInputs = [gettext];
diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/pkgs/tools/package-management/checkinstall/etc-dirs.patch
new file mode 100644
index 000000000000..a811e4afbb97
--- /dev/null
+++ b/pkgs/tools/package-management/checkinstall/etc-dirs.patch
@@ -0,0 +1,25 @@
+diff -rc checkinstall-orig/checkinstall checkinstall/checkinstall
+*** checkinstall-orig/checkinstall	2009-03-27 17:07:26.000000000 +0100
+--- checkinstall/checkinstall	2009-04-14 16:34:08.000000000 +0200
+***************
+*** 2607,2615 ****
+     chmod 755 $BUILD_DIR/DEBIAN/postrm
+  fi
+  
+! # Tag files in /etc to be conffiles
+  find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \
+! 	grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles
+  
+  # The package will be saved here (ignores <epoch>: prefix):
+  DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"
+--- 2607,2616 ----
+     chmod 755 $BUILD_DIR/DEBIAN/postrm
+  fi
+  
+! # Tag non-directory files in /etc to be conffiles
+  find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \
+!         (while read fn; do test ! -d "$BUILD_DIR/$fn" && echo "$fn"; done) \
+!         > $BUILD_DIR/DEBIAN/conffiles
+  
+  # The package will be saved here (ignores <epoch>: prefix):
+  DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"
-- 
cgit 1.4.1