Jonathan Nieder wrote:
> So it looks like this wasn't an upstream bug after all. Here's a
> better patch.
... and here are some corrections on top. Sorry for the trouble (I
just sent the wrong diff, but this should fix it).
---
debian/changelog | 8 ++++----
debian/rules | 27 +--------------------------
2 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7e8d4d87..01bdf39a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
atris (1.0.7.dfsg.1-7.2) local; urgency=low
- * [debian/patches/01-atris-1.0.7.Makefile.am_pathfix.diff]:
- - Avoid brace expansions (closes: #619717).
- * [debian/patches, debian/source/format]:
- - Use source format 3.0 (quilt) (closes: #619714).
+ * [debian/patches/01-atris-1.0.7.Makefile.am_pathfix.diff]:
+ - Avoid brace expansions (closes: #619717).
+ * [debian/patches, debian/source/format]:
+ - Use source format 3.0 (quilt) (closes: #619714).
-- Jonathan Nieder <jrnie...@gmail.com> Sun, 11 Dec 2011 10:23:38 -0600
diff --git a/debian/rules b/debian/rules
index 6e7a586a..d388e04a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,24 +7,7 @@
DEBIAN_DIR = $(shell pwd)/debian
-patchdir = $(DEBIAN_DIR)/patches
-patches = $(shell ls $(patchdir)/[0-9][0-9]*.diff | sort -n | sed -e
's@$(patchdir)/@@')
-rev_patches = $(shell ls $(patchdir)/[0-9][0-9]*.diff | sort -n -r | sed -e
's@$(patchdir)/@@')
-
-
-build: patch-stamp configure build-stamp
-
-patch-stamp:
- dh_testdir
-
- @for file in $(patches); do \
- if [ ! -f $(patchdir)/$$file.stamp ]; then \
- echo Applying $$file...; \
- patch -p0 < $(patchdir)/$$file; \
- touch $(patchdir)/$$file.stamp; \
- fi; \
- done
-
+build: configure build-stamp
configure: configure-stamp
configure-stamp:
@@ -50,14 +33,6 @@ clean:
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
- @for file in $(rev_patches); do \
- if [ -f $(patchdir)/$$file.stamp ]; then \
- echo Reversing $$file...; \
- patch -R -p0 < $(patchdir)/$$file; \
- rm -f $(patchdir)/$$file.stamp; \
- fi; \
- done
-
-rm -f build-stamp configure-stamp install-stamp configure
-rm -f config.guess config.sub config.h config.h.in
-rm -f missing aclocal.m4 Makefile.in depcomp
--
1.7.8
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
