[Pkg-Cyrus-imapd-Debian-devel] [SVN] r177 - trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch

[debian at incase.de]

Author: sven
Date: Fri Nov 11 20:01:48 2005
New Revision: 177

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=177
Log:
Needed to disable most of the debian stuff since it seems to clash with a fully dpatch based patching system. Especially: Running the clean target removes all patches, including the one that created the autogen.sh script and the ones which adjust many autoconf/automake files to our needs)
Modified:
    trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch?view=diff&rev=177&p1=trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch&r1=176&p2=trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch&r2=177
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/04-add_autogen.sh.dpatch Fri Nov 11 20:01:48 2005
@@ -5,9 +5,9 @@
 ## DP: Add autogen.sh
 
 @DPATCH@
-diff -urNad complete.dpatch/autogen.sh /tmp/dpep.kPXQsQ/complete.dpatch/autogen.sh
---- complete.dpatch/autogen.sh	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.kPXQsQ/complete.dpatch/autogen.sh	2005-11-10 16:41:07.825648811 +0100
+diff -urNad cyrus-imapd-2.2.12/autogen.sh /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh
+--- cyrus-imapd-2.2.12/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh	2005-11-11 19:47:43.571058024 +0100
 @@ -0,0 +1,77 @@
 +#!/bin/sh
 +#
@@ -37,17 +37,17 @@
 +# For the Debian build
 +test -d debian && {
 +	# Kill executable list first
-+	rm -f debian/executable.files
++	#rm -f debian/executable.files
 +
 +	# Make sure our executable and removable lists won't be screwed up
-+	debclean && echo Cleaned buildtree just in case...
++	#debclean && echo Cleaned buildtree just in case...
 +
 +	# refresh list of executable scripts, to avoid possible breakage if
 +	# upstream tarball does not include the file or if it is mispackaged
 +	# for whatever reason.
-+	echo Generating list of executable files...
-+	rm -f debian/executable.files
-+	find -type f -perm +111 ! -name '.*' -print  | sort > debian/executable.files
++	#echo Generating list of executable files...
++	#rm -f debian/executable.files
++	#find -type f -perm +111 ! -name '.*' -print  | sort > debian/executable.files
 +
 +	# even in Debian builds, copy them in, don't link them
 +	rm -f config.sub config.guess
@@ -59,30 +59,30 @@
 +	# THIS CRAP IS NOT EMBEDDED SPACE-SAFE!
 +	version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'`
 +	source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
-+	if test -r ../${source}_${version}.orig.tar.gz ; then
-+		echo Generating list of files that should be removed...
-+		rm -f debian/deletable.files
-+		touch debian/deletable.files.new
-+		mkdir debian/tmp
-+		cd debian/tmp
-+		tar -zxf ../../../${source}_${version}.orig.tar.gz
-+		# et/ we handle directly
-+		rm -fr */et/
-+		cd ../..
-+		for i in `find debian/tmp/ -type f ! -name '.*' -print | xargs` ; do
-+		  if test -r ${i} ; then
-+		     filename=`echo "${i}" | sed -e 's#.*debian/tmp/[^/]+/##'`
-+		     test -r "${filename}" || echo "${filename}" >>debian/deletable.files.new
-+		  fi
-+		done
-+		sort < debian/deletable.files.new > debian/deletable.files \
-+			&& rm debian/deletable.files.new
-+		rm -fr debian/tmp
-+	else
-+		echo Emptying list of files that should be deleted...
-+		rm -f debian/deletable.files
-+		touch debian/deletable.files
-+	fi
++	#if test -r ../${source}_${version}.orig.tar.gz ; then
++	#	echo Generating list of files that should be removed...
++	#	rm -f debian/deletable.files
++	#	touch debian/deletable.files.new
++	#	mkdir debian/tmp
++	#	cd debian/tmp
++	#	tar -zxf ../../../${source}_${version}.orig.tar.gz
++	#	# et/ we handle directly
++	#	rm -fr */et/
++	#	cd ../..
++	#	for i in `find debian/tmp/ -type f ! -name '.*' -print | xargs` ; do
++	#	  if test -r ${i} ; then
++	#	     filename=`echo "${i}" | sed -e 's#.*debian/tmp/[^/]+/##'`
++	#	     test -r "${filename}" || echo "${filename}" >>debian/deletable.files.new
++	#	  fi
++	#	done
++	#	sort < debian/deletable.files.new > debian/deletable.files \
++	#		&& rm debian/deletable.files.new
++	#	rm -fr debian/tmp
++	#else
++	#	echo Emptying list of files that should be deleted...
++	#	rm -f debian/deletable.files
++	#	touch debian/deletable.files
++	#fi
 +}
 +
 +exit 0