[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.0.1-1-1-gb7d8457

[Iain Lane]

The following commit has been merged in the master branch:
commit b7d8457e321373b46cde68d3863954ea7efad009
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Dec 16 14:24:20 2009 +0000

    Stop using ltmain-as-needed
    
    Version mismatch with Debian's libtool causes FTBFS

diff --git a/debian/changelog b/debian/changelog
index 9cfa60f..9a79169 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomboy (1.0.1-2) UNRELEASED; urgency=low
+
+  * debian/control: Stop using patched ltmain as a version mismatch with
+    Debian's libtool now causes FTBFS (Closes: #560664)
+
+ -- Iain Lane <laney at ubuntu.com>  Wed, 16 Dec 2009 14:23:39 +0000
+
 tomboy (1.0.1-1) unstable; urgency=low
 
   * New upstream release 1.0.1:
diff --git a/debian/rules b/debian/rules
index 870efea..2f4f34e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ autoreconf-stamp:
 	cp /usr/share/gnome-doc-utils/gnome-doc-utils.make $(CURDIR)
 	autoreconf -f -i -s
 	# replace ltmain.sh with our patched one that supports --as-needed
-	install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
+	#install --mode=755 $(CURDIR)/debian/ltmain-as-needed.sh $(CURDIR)/ltmain.sh
 	touch $@
 
 override_dh_auto_configure: autoreconf-stamp

-- 
Tomboy - desktop note taking program using Wiki style links