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:00:56.000000000 -0500
@@ -1,3 +1,13 @@
+ktorrent (2.0-0ubuntu1) edgy; urgency=low
+
+ * New Upstream Version
+ * Updated admin/ directory so .pot would generate correctly
+ * removed debian/patches/kubuntu_01_kdepot.patch and changes the debian/rules
+ reflect this as its 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/patches/kubuntu_01_kdepot.patch ktorrent-2.0/debian/patches/kubuntu_01_kdepot.patch
--- /home/brandon/files/devel/ktorrent/ubuntu/ktorrent-1.2/debian/patches/kubuntu_01_kdepot.patch 2006-08-08 21:23:46.000000000 -0500
+++ ktorrent-2.0/debian/patches/kubuntu_01_kdepot.patch 1969-12-31 18:00:00.000000000 -0600
@@ -1,20 +0,0 @@
---- ktorrent-1.2/admin/cvs.sh 2006-05-23 16:54:17.000000000 +0200
-+++ ktorrent-1.2/admin/cvs.sh 2006-05-23 16:55:10.000000000 +0200
-@@ -564,6 +564,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/usr/include/kde/kde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -581,7 +583,7 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
-+# kdepotpath=${includedir:-${KDEDIR:-`kde-config --prefix`}/include}/kde.pot
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
- XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -kaliasLocale -x $kdepotpath" messages
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 13:49:09.000000000 -0500
@@ -18,15 +18,7 @@
endif
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man --disable-rpath --enable-final
-
-patch: patch-stamp
-patch-stamp:
- dh_testdir
-
- patch -p1 < debian/patches/kubuntu_01_kdepot.patch
- touch patch-stamp
-
-build: patch build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -34,16 +26,7 @@
touch build-stamp
-unpatch: unpatch-stamp
-unpatch-stamp:
- dh_testdir
-
- if [ -e patch-stamp ]; then \
- patch -p1 -R < debian/patches/kubuntu_01_kdepot.patch ; \
- rm -f patch-stamp ; \
- fi
-
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
brandon@voyager:/devel/ktorrent$