[Pkg-kde-commits] rev 1015 - branches/kde-3.4.0/cdbs people/chrsmrtn/cdbs-experimental

[Achim Bohnet]

On Thursday 21 April 2005 22:42, Christopher Martin wrote:
> Author: chrsmrtn-guest
> Date: 2005-04-21 20:42:27 +0000 (Thu, 21 Apr 2005)
> New Revision: 1015
> 
> Modified:
>    branches/kde-3.4.0/cdbs/kde.mk
>    people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
> Log:
> Add the rest of the fix, and remove the unnecessary stamping
> of the patch itself - besides, it was kdewebdev specific
> (this must have been what allee was getting at).

Yes.   

Isn't there a rm -f debian/stamp-patched missing in clean::
missing.

Stupid question.  Why wasn't simple-patchsys.mk extended
for .uu files.  It handles already diff.{gz,bz2}.
I have not checked for special features of the kde.mk patch
system.  But in case it's only the uu handling
another case *.uu) cat="uudecode -o -"  can be added.

Independently replacing

		cd $(CURDIR)/debian/patches ; \
                uudecode $$i ; \
                cd $(CURDIR) ; \
                patch -N -p1 < "$${i%%.uu}" ; \

with
		uudecode -o - $(CURDIR)/debian/patches/$$i | patch -N -p1

should simply matters due to removing ambiguitiy if a .diff is from
a .uu for a plain .diff file as well as it saves a temporary file.

Achim

 
> The whole thing is still awfully hackish, but it seems to work
> well enough for now (CDBS really should build something like
> this in).
> 
> 
> Modified: branches/kde-3.4.0/cdbs/kde.mk
> ===================================================================
> --- branches/kde-3.4.0/cdbs/kde.mk	2005-04-21 17:51:50 UTC (rev 1014)
> +++ branches/kde-3.4.0/cdbs/kde.mk	2005-04-21 20:42:27 UTC (rev 1015)
> @@ -132,7 +132,7 @@
>  		uudecode $$i ; \
>  		cd $(CURDIR) ; \
>  		patch -N -p1 < "$${i%%.uu}" ; \
> -		touch debian/stamp-patch-00_kdewebdev_branch_2005-04-19.diff ; \
> +		touch debian/stamp-patched ; \
>  	done
>  
>  clean:: reverse-patches
> 
> Modified: people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk
> ===================================================================
> --- people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk	2005-04-21 17:51:50 UTC (rev 1014)
> +++ people/chrsmrtn/cdbs-experimental/debian-qt-kde.mk	2005-04-21 20:42:27 UTC (rev 1015)
> @@ -93,7 +93,7 @@
>  		uudecode $$i ; \
>  		cd $(CURDIR) ; \
>  		patch -N -p1 < "$${i%%.uu}" ; \
> -		touch debian/stamp-patch-00_kdewebdev_branch_2005-04-19.diff ; \
> +		touch debian/stamp-patched ; \
>  	done
>  
>  clean:: reverse-patches
> 
> 
> _______________________________________________
> Pkg-kde-commits mailing list
> Pkg-kde-commits@lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-commits
> 
> 

-- 
  To me vi is Zen.  To use vi is to practice zen. Every command is
  a koan. Profound to the user, unintelligible to the uninitiated.
  You discover truth everytime you use it.
                                      -- reddy@lion.austin.ibm.com