Bug#573671: tetradraw: diff for NMU version 2.0.3-8.2

[Jakub Wilk]

tags 573671 + pending
thanks

Dear maintainer,



--
Jakub Wilk

reverted:
--- tetradraw-2.0.3/573671.patch
+++ tetradraw-2.0.3.orig/573671.patch
@@ -1,27 +0,0 @@
-diff -u tetradraw-2.0.3/debian/changelog tetradraw-2.0.3/debian/changelog
---- tetradraw-2.0.3/debian/changelog
-+++ tetradraw-2.0.3/debian/changelog
-@@ -1,3 +1,11 @@
-+tetradraw (2.0.3-8.1) unstable; urgency=low
-+
-+  * Non-maintainer upload.
-+  * debian/control
-+    - add "Build-Depends: automake" to fix FTBFS (Closes: #573671) 
-+
-+ -- Hideki Yamane (Debian-JP) <henr...@debian.or.jp>  Tue, 20 Apr 2010 15:28:57 +0900
-+
- tetradraw (2.0.3-8) unstable; urgency=low
- 
-   * Updated to policy 3.8.4, no changes needed.
-diff -u tetradraw-2.0.3/debian/control tetradraw-2.0.3/debian/control
---- tetradraw-2.0.3/debian/control
-+++ tetradraw-2.0.3/debian/control
-@@ -2,7 +2,7 @@
- Section: editors
- Priority: optional
- Maintainer: Gerfried Fuchs <rho...@debian.at>
--Build-Depends: libncursesw5-dev, quilt, autotools-dev
-+Build-Depends: libncursesw5-dev, quilt, autotools-dev, automake
- Standards-Version: 3.8.4
- 
- Package: tetradraw
diff -u tetradraw-2.0.3/debian/control tetradraw-2.0.3/debian/control
--- tetradraw-2.0.3/debian/control
+++ tetradraw-2.0.3/debian/control
@@ -2,7 +2,7 @@
 Section: editors
 Priority: optional
 Maintainer: Gerfried Fuchs <rho...@debian.at>
-Build-Depends: libncursesw5-dev, quilt, autotools-dev, automake
+Build-Depends: libncursesw5-dev, quilt, autotools-dev
 Standards-Version: 3.8.4
 
 Package: tetradraw
diff -u tetradraw-2.0.3/debian/changelog tetradraw-2.0.3/debian/changelog
--- tetradraw-2.0.3/debian/changelog
+++ tetradraw-2.0.3/debian/changelog
@@ -1,3 +1,13 @@
+tetradraw (2.0.3-8.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove automake from Build-Depends.
+  * Remove 573671.patch from the diff.
+  * Pass AUTOMAKE=true to make, in order to prevent from running automake-1.7
+    at build time (closes: #573671).
+
+ -- Jakub Wilk <jw...@debian.org>  Tue, 20 Jul 2010 00:58:15 +0200
+
 tetradraw (2.0.3-8.1) unstable; urgency=medium
 
   [ Jari Aalto ]
diff -u tetradraw-2.0.3/debian/rules tetradraw-2.0.3/debian/rules
--- tetradraw-2.0.3/debian/rules
+++ tetradraw-2.0.3/debian/rules
@@ -53,7 +53,7 @@
 build-stamp: configure
 	$(checkdir)
 
-	$(MAKE) CFLAGS="$(CFLAGS)"
+	$(MAKE) CFLAGS="$(CFLAGS)" AUTOMAKE=true
 	touch build-stamp
 
 

I've prepared an NMU for tetradraw (versioned as 2.0.3-8.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer.

signature.asc
Description: Digital signature