rev 9330 - in kde-extras/ktorrent: branches/experimental/debian trunk/debian trunk/debian/patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Feb 6 21:15:07 UTC 2008
Author: modax-guest
Date: 2008-02-06 21:15:07 +0000 (Wed, 06 Feb 2008)
New Revision: 9330
Added:
kde-extras/ktorrent/branches/experimental/debian/ktorrent.lintian
kde-extras/ktorrent/trunk/debian/patches/07_drop_geoip_from_makefile_am.diff
Removed:
kde-extras/ktorrent/branches/experimental/debian/overrides.lintian
Modified:
kde-extras/ktorrent/branches/experimental/debian/changelog
kde-extras/ktorrent/branches/experimental/debian/copyright
kde-extras/ktorrent/branches/experimental/debian/copyright.manual
kde-extras/ktorrent/branches/experimental/debian/rules
kde-extras/ktorrent/trunk/debian/changelog
kde-extras/ktorrent/trunk/debian/copyright
kde-extras/ktorrent/trunk/debian/patches/98_buildprep.diff
kde-extras/ktorrent/trunk/debian/patches/series
kde-extras/ktorrent/trunk/debian/rules
Log:
Last touches for 3.0rc1 and 2.2.5 uploads
Modified: kde-extras/ktorrent/branches/experimental/debian/changelog
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/changelog 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/branches/experimental/debian/changelog 2008-02-06 21:15:07 UTC (rev 9330)
@@ -5,6 +5,8 @@
* Major part of packaging was done from scratch in comparision with
2.2.4.dfsg.1-1 therefore some changes might have been left undocumented
in this changelog.
+ * Remove all GeoIP stuff from ktorrent tarball including LGPL library
+ source code. Debian uses libgeoip1 anyway.
* Switching to CDBS and debhelper v6. Build-Depend on cdbs (>= 0.4.51)
to get non-empty -dbg package with compat=6.
* Update Standards-Version to 3.7.3.0
@@ -55,7 +57,7 @@
there is no confusion anymore (Closes: #372162).
* Update debian/copyright.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 06 Feb 2008 01:08:00 +0200
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 06 Feb 2008 22:04:13 +0200
ktorrent (2.2.4.dfsg.1-1) unstable; urgency=medium
Modified: kde-extras/ktorrent/branches/experimental/debian/copyright
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/copyright 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/branches/experimental/debian/copyright 2008-02-06 21:15:07 UTC (rev 9330)
@@ -6,24 +6,15 @@
The original source was downloaded from
http://ktorrent.org/index.php?page=downloads
-License for all components unless stated otherwise:
+License for all components:
* GNU General Public License version 2 or later
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'
-Other used licenses:
- * GNU Lesser General Public License version 2.1 or later
-
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`
-
- The files (1) below are licensed under this license:
- - plugins/infowidget/GeoIP.h
-
----------------------------------------------------------------------
-- Copyright Holders Report --
--- (Out of 662 copyright statements) --
+-- (Out of 660 copyright statements) --
----------------------------------------------------------------------
Copyright © Joris Guisson:
@@ -717,17 +708,6 @@
ktorrent/app.cpp
ktorrent/app.h
-Copyright © MaxMind LLC All Rights Reserved.:
- Credited 2 times;
- Other name: MaxMind LLC;
- Years: 2003;
- Used licenses (2):
- GNU General Public License v2.1 or later
- GNU General Public License v2 or later
- Copyrighted files (2):
- plugins/infowidget/GeoIP.c
- plugins/infowidget/GeoIP.h
-
Copyright © Waldemar Silva Júnior:
Credited 2 times;
Other name: Waldemar Silva Junior;
@@ -2677,12 +2657,6 @@
License: GNU General Public License version 2 or later (implicit)
CMakeLists.txt:
License: GNU General Public License version 2 or later (implicit)
- GeoIP.c:
- Copyright ©: MaxMind LLC All Rights Reserved. 2003
- License: GNU General Public License version 2 or later
- GeoIP.h:
- Copyright ©: MaxMind LLC 2003
- License: GNU General Public License version 2.1 or later
availabilitychunkbar.cpp:
Copyright ©: Joris Guisson <joris.guisson at gmail.com> 2005-2007
License: GNU General Public License version 2 or later
Modified: kde-extras/ktorrent/branches/experimental/debian/copyright.manual
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/copyright.manual 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/branches/experimental/debian/copyright.manual 2008-02-06 21:15:07 UTC (rev 9330)
@@ -6,18 +6,9 @@
The original source was downloaded from
http://ktorrent.org/index.php?page=downloads
-License for all components unless stated otherwise:
+License for all components:
* GNU General Public License version 2 or later
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'
-Other used licenses:
- * GNU Lesser General Public License version 2.1 or later
-
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`
-
- The files (1) below are licensed under this license:
- - plugins/infowidget/GeoIP.h
-
Added: kde-extras/ktorrent/branches/experimental/debian/ktorrent.lintian
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/ktorrent.lintian (rev 0)
+++ kde-extras/ktorrent/branches/experimental/debian/ktorrent.lintian 2008-02-06 21:15:07 UTC (rev 9330)
@@ -0,0 +1 @@
+ktorrent: package-name-doesnt-match-sonames libktcore2 libktupnp1
Deleted: kde-extras/ktorrent/branches/experimental/debian/overrides.lintian
Modified: kde-extras/ktorrent/branches/experimental/debian/rules
===================================================================
--- kde-extras/ktorrent/branches/experimental/debian/rules 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/branches/experimental/debian/rules 2008-02-06 21:15:07 UTC (rev 9330)
@@ -4,19 +4,17 @@
DEB_CMAKE_EXTRA_FLAGS += -DWITH_SYSTEM_GEOIP:BOOL=ON \
-DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
-
DEB_DH_INSTALL_ARGS =
-install/ktorrent::
- # Install lintian overrides
- install -D -o root -g root -m 0644 debian/overrides.lintian \
- $(CURDIR)/debian/ktorrent/usr/share/lintian/overrides/ktorrent
+DEB_DH_SHLIBDEPS_ARGS_libbtcore2 = -- -xkdebase-runtime
prune-tarball:
- # Remove non-free components: flags and geoip data file
+ # Remove non-free components: flags and geoip stuff
rm -f plugins/infowidget/geoip/*.png
rm -f plugins/infowidget/geoip/FLAGS_LICENCE
rm -f plugins/infowidget/geoip/geoip.dat
rm -f plugins/infowidget/geoip/GeoIP-LICENSE.txt
+ rm -f plugins/infowidget/GeoIP.c
+ rm -f plugins/infowidget/GeoIP.h
.PHONY: prune-tarball
Modified: kde-extras/ktorrent/trunk/debian/changelog
===================================================================
--- kde-extras/ktorrent/trunk/debian/changelog 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/trunk/debian/changelog 2008-02-06 21:15:07 UTC (rev 9330)
@@ -4,6 +4,8 @@
* New upstream bugfix release.
- Fixes "Refuses to add downloads to existing group" bug (probably
upstream SVN commit r762299) (Closes: #460470)
+ * Remove unused GeoIP.{c,h} from tarball. Update debian/copyright
+ accordingly and add patch 07_ to shut automake up.
* Add "DM-Upload-Allowed: yes" debian/control source section.
* Update Standards-Version to 3.7.3.0
* Move Homepage from ktorrent long Description to debian/control source
@@ -19,7 +21,7 @@
couple of more specific patterns.
* Replace - with \- in debian/ktorrent.1 where a minus sign was intended.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 05 Feb 2008 02:29:25 +0200
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 06 Feb 2008 23:07:08 +0200
ktorrent (2.2.4.dfsg.1-1) unstable; urgency=medium
Modified: kde-extras/ktorrent/trunk/debian/copyright
===================================================================
--- kde-extras/ktorrent/trunk/debian/copyright 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/trunk/debian/copyright 2008-02-06 21:15:07 UTC (rev 9330)
@@ -107,10 +107,6 @@
plugins/infowidget/infowidget.h
plugins/infowidget/infowidget.cpp
-Copyright (c) 2003 MaxMind LLC.
- plugins/infowidget/GeoIP.h
- plugins/infowidget/GeoIP.c
-
License (for all components):
This program is free software; you can redistribute it and/or modify
Added: kde-extras/ktorrent/trunk/debian/patches/07_drop_geoip_from_makefile_am.diff
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/07_drop_geoip_from_makefile_am.diff (rev 0)
+++ kde-extras/ktorrent/trunk/debian/patches/07_drop_geoip_from_makefile_am.diff 2008-02-06 21:15:07 UTC (rev 9330)
@@ -0,0 +1,11 @@
+--- ktorrent-2.2.5.dfsg.1/plugins/infowidget/Makefile.am 2008-02-06 22:25:31.000000000 +0200
++++ ktorrent-2.2.5.dfsg.1/plugins/infowidget/Makefile.am 2008-02-06 22:50:28.000000000 +0200
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes)
+ METASOURCES = AUTO
+ kde_module_LTLIBRARIES = ktinfowidgetplugin.la
+-noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h GeoIP.h \
++noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h \
+ statustab.h fileview.h
+ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
+ chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp flagdb.cpp peerview.cpp \
Modified: kde-extras/ktorrent/trunk/debian/patches/98_buildprep.diff
===================================================================
Modified: kde-extras/ktorrent/trunk/debian/patches/series
===================================================================
--- kde-extras/ktorrent/trunk/debian/patches/series 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/trunk/debian/patches/series 2008-02-06 21:15:07 UTC (rev 9330)
@@ -4,5 +4,6 @@
04_disable_no_undefined.diff
05_cleanup_am_lib_qt.diff
06_makefile_am_fixups.diff
+07_drop_geoip_from_makefile_am.diff
10_ru_translation_fix.diff
98_buildprep.diff
Modified: kde-extras/ktorrent/trunk/debian/rules
===================================================================
--- kde-extras/ktorrent/trunk/debian/rules 2008-02-06 19:51:39 UTC (rev 9329)
+++ kde-extras/ktorrent/trunk/debian/rules 2008-02-06 21:15:07 UTC (rev 9330)
@@ -93,11 +93,13 @@
# nop - no common archives
prune-tarball:
- # Remove non-free components: flags and geoip data file
+ # Remove non-free components: flags and geoip stuff
rm -f plugins/infowidget/geoip/*.png
rm -f plugins/infowidget/geoip/FLAGS_LICENCE
rm -f plugins/infowidget/geoip/geoip.dat
rm -f plugins/infowidget/geoip/GeoIP-LICENSE.txt
+ rm -f plugins/infowidget/GeoIP.c
+ rm -f plugins/infowidget/GeoIP.h
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install prune-tarball
More information about the pkg-kde-commits
mailing list