rendered paste bodybrandon@voyager:/devel/ktorrent$ diff -ruN /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian ktorrent-2.0/debian
diff -ruN /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/changelog ktorrent-2.0/debian/changelog
--- /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/changelog 2006-08-08 21:23:46.000000000 -0500
+++ ktorrent-2.0/debian/changelog 2006-08-10 14:26:49.000000000 -0500
@@ -1,3 +1,12 @@
+ktorrent (2.0-0ubuntu1) edgy; urgency=low
+
+ * New Upstream Version
+ * Updated admin/ directory so .pot would generate correctly
+ * commented debian/patches/kubuntu_01_kdepot.patch from debian/rules , not needed
+ * added libgmp3-dev to build depends as required to build 2.0
+
+ -- Brandon Holtsclaw <imbrandon@kubuntu.org> Wed, 09 Aug 2006 09:51:44 -0500
+
ktorrent (1.2-1ubuntu3) edgy; urgency=low
* debian/rules: moved the fix from clean to install rule, to fix the ftbfs,
diff -ruN /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/control ktorrent-2.0/debian/control
--- /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/control 2006-08-08 21:23:46.000000000 -0500
+++ ktorrent-2.0/debian/control 2006-08-10 14:00:19.000000000 -0500
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Joel Johnson <mrjoel@lixil.net>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev, libpcre3-dev, libx11-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, kdelibs4-dev, libpcre3-dev, libx11-dev, libgmp3-dev
Standards-Version: 3.6.2
Package: ktorrent
diff -ruN /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/rules ktorrent-2.0/debian/rules
--- /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/rules 2006-08-08 21:23:46.000000000 -0500
+++ ktorrent-2.0/debian/rules 2006-08-10 14:25:53.000000000 -0500
@@ -23,7 +23,7 @@
patch-stamp:
dh_testdir
- patch -p1 < debian/patches/kubuntu_01_kdepot.patch
+# patch -p1 < debian/patches/kubuntu_01_kdepot.patch
touch patch-stamp
build: patch build-stamp
@@ -39,7 +39,7 @@
dh_testdir
if [ -e patch-stamp ]; then \
- patch -p1 -R < debian/patches/kubuntu_01_kdepot.patch ; \
+# patch -p1 -R < debian/patches/kubuntu_01_kdepot.patch ; \
rm -f patch-stamp ; \
fi
brandon@voyager:/devel/ktorrent$