rev 6512 - in kde-extras/ktorrent/trunk/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sat Jun 16 10:18:20 UTC 2007
Author: modax-guest
Date: 2007-06-16 10:18:20 +0000 (Sat, 16 Jun 2007)
New Revision: 6512
Modified:
kde-extras/ktorrent/trunk/debian/changelog
kde-extras/ktorrent/trunk/debian/control
kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff
kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff
kde-extras/ktorrent/trunk/debian/patches/98_buildprep.diff
Log:
Package ktorrent 2.2~rc1
Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog 2007-06-16 07:31:12 UTC (rev 6511)
+++ kde-extras/ktorrent/trunk/debian/changelog 2007-06-16 10:18:20 UTC (rev 6512)
@@ -1,3 +1,16 @@
+ktorrent (2.2~rc1.dfsg.1-1) experimental; urgency=low
+
+ [Modestas Vainius]
+ * New upstream development release.
+ * Update patches:
+ - 10_use_system_geoip.diff - fix offsets.
+ - 11_flagdb-alternative-source.diff - fix offsets.
+ - 98_buildprep.diff - regenerate.
+ * Use ${binary:Version} instead of ${Source-Version} for ktorrent-dbg
+ dependency on ktorrent.
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sat, 16 Jun 2007 11:54:04 +0300
+
ktorrent (2.2~beta1.dfsg.1-2) experimental; urgency=low
[Modestas Vainius]
Modified: kde-extras/ktorrent/trunk/debian/control
===================================================================
--- kde-extras/ktorrent/trunk/debian/control 2007-06-16 07:31:12 UTC (rev 6511)
+++ kde-extras/ktorrent/trunk/debian/control 2007-06-16 10:18:20 UTC (rev 6512)
@@ -43,7 +43,7 @@
Package: ktorrent-dbg
Architecture: any
-Depends: ktorrent (= ${Source-Version})
+Depends: ktorrent (= ${binary:Version})
Recommends: kdelibs-dbg
Description: KTorrent debugging symbols
This package contains debugging symbols for KTorrent. When KTorrent crashes,
Modified: kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff 2007-06-16 07:31:12 UTC (rev 6511)
+++ kde-extras/ktorrent/trunk/debian/patches/10_use_system_geoip.diff 2007-06-16 10:18:20 UTC (rev 6512)
@@ -1,7 +1,6 @@
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/configure.in.in ktorrent-2.2~beta1.dfsg.1.n/configure.in.in
--- ktorrent-2.2~beta1.dfsg.1/configure.in.in 2007-05-24 20:39:02.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/configure.in.in 2007-06-03 22:46:08.000000000 +0300
-@@ -81,6 +81,8 @@
+@@ -95,6 +95,8 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE ktorrent"
])
@@ -10,7 +9,7 @@
KDE_INIT_DOXYGEN([The API Reference], [Version $VERSION])
AC_ARG_ENABLE(
-@@ -93,15 +95,35 @@
+@@ -107,15 +109,35 @@
[AS_HELP_STRING(--enable-profile,[Enable profiling])],
[CXXFLAGS="$CXXFLAGS -DKT_PROFILE"])
@@ -47,7 +46,6 @@
AC_ARG_ENABLE(torrent-mimetype,
[ --enable-torrent-mimetype Enables the installation of the torrent mimetype which uses a KTorrent based icon],
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am 2007-05-24 20:38:55.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am 2007-06-03 22:35:58.000000000 +0300
@@ -6,18 +6,27 @@
@@ -79,7 +77,6 @@
# rc file containing the GUI for the plugin
# pluginsdir = $(kde_datadir)/ktsearchplugin
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp 2007-05-24 20:38:55.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp 2007-06-03 22:46:12.000000000 +0300
@@ -1,6 +1,6 @@
Modified: kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff 2007-06-16 07:31:12 UTC (rev 6511)
+++ kde-extras/ktorrent/trunk/debian/patches/11_flagdb-alternative-source.diff 2007-06-16 10:18:20 UTC (rev 6512)
@@ -1,6 +1,6 @@
--- ktorrent-2.1.4/configure.in.in 2007-06-02 17:31:29.000000000 +0300
+++ ktorrent-2.1.4/configure.in.in 2007-06-02 17:26:28.000000000 +0300
-@@ -125,6 +125,16 @@
+@@ -139,6 +139,16 @@
fi
@@ -17,7 +17,6 @@
AC_ARG_ENABLE(torrent-mimetype,
[ --enable-torrent-mimetype Enables the installation of the torrent mimetype which uses a KTorrent based icon],
[case "${enableval}" in
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.cpp ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.cpp
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.cpp 1970-01-01 03:00:00.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.cpp 2007-06-03 23:02:45.000000000 +0300
@@ -0,0 +1,119 @@
@@ -140,7 +139,6 @@
+ }
+ return db[c];
+}
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.h ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.h
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/flagdb.h 1970-01-01 03:00:00.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/flagdb.h 2007-06-03 23:02:45.000000000 +0300
@@ -0,0 +1,68 @@
@@ -212,7 +210,6 @@
+};
+
+ #endif
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/geoip/Makefile.am ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/geoip/Makefile.am
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/geoip/Makefile.am 2007-05-24 20:38:54.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/geoip/Makefile.am 2007-06-03 23:02:45.000000000 +0300
@@ -9,8 +9,8 @@
@@ -238,7 +235,6 @@
+
+ktdata_DATA = $(FLAG_FILES) $(GEOIP_FILES)
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/Makefile.am 2007-06-03 22:52:21.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/Makefile.am 2007-06-03 22:54:51.000000000 +0300
@@ -4,7 +4,7 @@
@@ -250,7 +246,6 @@
ktorrentmonitor.cpp iwfiletreediritem.cpp iwfiletreeitem.cpp infowidgetprefpage.cpp \
infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp floatspinbox.cpp \
localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp fileview.cpp
-diff -uNr -x debian -x .pc ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp
--- ktorrent-2.2~beta1.dfsg.1/plugins/infowidget/peerview.cpp 2007-06-03 22:52:21.000000000 +0300
+++ ktorrent-2.2~beta1.dfsg.1.n/plugins/infowidget/peerview.cpp 2007-06-03 23:02:45.000000000 +0300
@@ -37,6 +37,7 @@
Modified: kde-extras/ktorrent/trunk/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list