diff -u quilt-0.46/debian/control quilt-0.46/debian/control --- quilt-0.46/debian/control +++ quilt-0.46/debian/control @@ -3,7 +3,8 @@ Source: quilt Section: vcs Priority: optional -Maintainer: Martin Quinson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Martin Quinson Uploaders: Simon Horman , Raphaël Hertzog Build-Depends: cdbs, debhelper (>= 5) Build-Depends-Indep: gettext, hevea, lynx, diffstat, perl diff -u quilt-0.46/debian/changelog quilt-0.46/debian/changelog --- quilt-0.46/debian/changelog +++ quilt-0.46/debian/changelog @@ -1,3 +1,10 @@ +quilt (0.46-8ubuntu1) karmic; urgency=low + + * debian/patches/check_series_is_no_dir: + - Check that series is no directory. (LP: #428657) + + -- Christoph Korn Sun, 13 Sep 2009 01:26:44 +0200 + quilt (0.46-8) unstable; urgency=low * Move to section “vcs” to match with ftpmasters' overrides. diff -u quilt-0.46/debian/patches/series quilt-0.46/debian/patches/series --- quilt-0.46/debian/patches/series +++ quilt-0.46/debian/patches/series @@ -20,0 +21 @@ +check_series_is_no_dir only in patch2: unchanged: --- quilt-0.46.orig/debian/patches/check_series_is_no_dir +++ quilt-0.46/debian/patches/check_series_is_no_dir @@ -0,0 +1,13 @@ +Index: quilt-0.46/quilt/scripts/patchfns.in +=================================================================== +--- quilt-0.46.orig/quilt/scripts/patchfns.in 2009-09-13 01:23:46.230905410 +0200 ++++ quilt-0.46/quilt/scripts/patchfns.in 2009-09-13 01:25:53.242973129 +0200 +@@ -931,7 +931,7 @@ + elif [ -e $QUILT_PC/series ] + then + SERIES=$QUILT_PC/series +-elif [ -e series ] ++elif [ -e series -a ! -d series ] + then + SERIES=series + else