Hi,
My sponsor noticed serious DSFG violation -- some icon themes in
kadu-0.6.0.2-4 are licensed under CC-SA 2.5, which is not DSFG-compliant [1].
I removed them in 0.6.0.2.ds1-1. Please unblock this upload.
[1]
http://wiki.debian.org/DFSGLicenses#head-6a3510b8d0c9c867b9dd73b634675e5631ba8fc8
In 0.6.0.2.ds1-1 I also changed (C) to © in debian/copyright and added
${misc:Depends} in debian/control.
Debdiff between 0.6.0.2-4 and 0.6.0.2.ds1-1:
diff -Nru kadu-0.6.0.2/debian/changelog kadu-0.6.0.2.ds1/debian/changelog
--- kadu-0.6.0.2/debian/changelog 2009-01-21 12:22:54.000000000 +0100
+++ kadu-0.6.0.2.ds1/debian/changelog 2009-01-21 12:22:55.000000000 +0100
@@ -1,3 +1,11 @@
+kadu (0.6.0.2.ds1-1) unstable; urgency=medium
+
+ * Removed glass and tango icon themes, because their license (CC-SA 2.5)
+ is not DFSG-compliant
+ * Changed "(C)" to "©" in debian/copyright
+
+ -- Patryk Cisek <patryk@prezu.one.pl> Mon, 19 Jan 2009 21:01:06 +0100
+
kadu (0.6.0.2-4) unstable; urgency=low
* Added debian/patches/07-gcc-4.4-includes.patch, which fixes missing
diff -Nru kadu-0.6.0.2/debian/control kadu-0.6.0.2.ds1/debian/control
--- kadu-0.6.0.2/debian/control 2009-01-21 12:22:54.000000000 +0100
+++ kadu-0.6.0.2.ds1/debian/control 2009-01-21 12:22:55.000000000 +0100
@@ -8,7 +8,7 @@
Package: kadu
Architecture: any
-Depends: ${shlibs:Depends}, kadu-common (= ${source:Version})
+Depends: ${shlibs:Depends}, kadu-common (= ${source:Version}),
${misc:Depends}
Recommends: kadu-external-modules (>= 0.6.0~rc3-1), kadu-kde-modules
Conflicts: kadu-external-modules (<= 0.6.0~rc3-1)
Suggests: kadu-themes
@@ -20,7 +20,7 @@
Package: kadu-common
Architecture: all
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: kadu-external-modules (>= 0.6.0~rc3-1), kadu-kde-modules,
kadu-gtk-modules
Conflicts: kadu (<= 0.6.0-1)
Suggests: kadu-themes
@@ -32,6 +32,7 @@
Package: kadu-dev
Architecture: all
+Depends: ${misc:Depends}
Recommends: kadu
Section: libdevel
Description: Development files for Kadu
@@ -42,7 +43,7 @@
Package: kadu-external-modules
Architecture: any
-Depends: kadu (= ${binary:Version}), ${shlibs:Depends}
+Depends: kadu (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: kadu (<= 0.6.0~rc3-1)
Description: Additional modules for Kadu
Gadu-Gadu is a Windows instant messenger, very popular in Poland.
@@ -53,7 +54,7 @@
Package: kadu-gtk-modules
Architecture: any
-Depends: kadu (= ${binary:Version}), ${shlibs:Depends}
+Depends: kadu (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: kadu (<= 0.6.0~rc3-1)
Description: Additional modules for Kadu
Gadu-Gadu is a Windows instant messenger, very popular in Poland.
@@ -64,7 +65,7 @@
Package: kadu-kde-modules
Architecture: any
-Depends: kadu (= ${binary:Version}), ${shlibs:Depends}
+Depends: kadu (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: kadu-external-modules (<= 0.5.0-2)
Description: Modules dependent on kdelibs
Gadu-Gadu is a Windows instant messenger, very popular in Poland.
@@ -75,6 +76,7 @@
Package: kadu-themes
Architecture: all
+Depends: ${misc:Depends}
Recommends: kadu (>= 0.5.0-1)
Description: Additional icons and emoticons for Kadu
Gadu-Gadu is a Windows instant messenger, very popular in Poland.
diff -Nru kadu-0.6.0.2/debian/copyright kadu-0.6.0.2.ds1/debian/copyright
--- kadu-0.6.0.2/debian/copyright 2009-01-21 12:22:54.000000000 +0100
+++ kadu-0.6.0.2.ds1/debian/copyright 2009-01-21 12:22:55.000000000 +0100
@@ -6,130 +6,130 @@
Note that there are far more contributors in Kadu that the ones listed here.
Kadu:
-Copyright (C) 2001,2002,2003,2004,2005,2006 Kadu Team
+Copyright © 2001,2002,2003,2004,2005,2006 Kadu Team
agent module:
-Copyright (C) 2007,2007 Michał Żarłok
+Copyright © 2007,2007 Michał Żarłok
anonymous_check module:
-Copyright (C) 2008 PK Team, Patryk Cisek
+Copyright © 2008 PK Team, Patryk Cisek
antistring, auto_hide, cenzor modules:
-Copyright (C) 2007,2008 PK Team
-Copyright (C) 2008 Dorregaray
+Copyright © 2007,2008 PK Team
+Copyright © 2008 Dorregaray
ao_sound, exec_notify, xosd_notify modules:
-Copyright (C) 2004,2005,2006 Marcin Slusarz
+Copyright © 2004,2005,2006 Marcin Slusarz
audacious_mediaplayer module:
-Copyright (C) 2008 Googie, Rafał 'Vogel' Malinowski
+Copyright © 2008 Googie, Rafał 'Vogel' Malinowski
autostatus module:
-Copyright (C) 2007,2008 PK Team
-Copyright (C) 2008 Dorregaray
+Copyright © 2007,2008 PK Team
+Copyright © 2008 Dorregaray
dcc module:
-Copyright (C) 2004,2005,2006 Kadu Team
-Copyright (C) 2004,2005,2006 Rafał 'Vogel' Malinowski
+Copyright © 2004,2005,2006 Kadu Team
+Copyright © 2004,2005,2006 Rafał 'Vogel' Malinowski
amarok_mediaplayer, falf_mediaplayer, filedesc, mediaplayer, screenshot
modules:
-Copyright (C) 2004,2005,2006 Googie
+Copyright © 2004,2005,2006 Googie
dcopexport,filtering modules:
-Copyright (C) 2004,2005,2006 pinkworm
+Copyright © 2004,2005,2006 pinkworm
ext_info module:
-Copyright (C) 2004,2005,2006 Dzwiedziu
+Copyright © 2004,2005,2006 Dzwiedziu
firewall module:
-Copyright (C) 2005,2006 Wojtek Sulewski
-Copyright (C) 2005,2006 Attis
+Copyright © 2005,2006 Wojtek Sulewski
+Copyright © 2005,2006 Attis
globalhotkeys module:
-Copyright (C) 2008 ultr
+Copyright © 2008 ultr
iwait4u, osdhints_notify modules:
-Copyright (C) 2005,2006 Wojtek Sulewski
+Copyright © 2005,2006 Wojtek Sulewski
last_seen module:
-Copyright (C) 2007,2008 PK Team
-Copyright (C) 2008 Dorregaray
+Copyright © 2007,2008 PK Team
+Copyright © 2008 Dorregaray
led_notify, weather modules:
-Copyright (C) 2004,2005,2006 Blysk
+Copyright © 2004,2005,2006 Blysk
mail module:
-Copyright (C) 2004,2005,2006 Michal Podsiadlik
+Copyright © 2004,2005,2006 Michal Podsiadlik
miastoplusa_sms module:
-Copyright (C) 2005,2006 Patryk Cisek
+Copyright © 2005,2006 Patryk Cisek
mx610_notify module:
-Copyright (C) 2007,2008 Korneliusz Jarzębski
+Copyright © 2007,2008 Korneliusz Jarzębski
config_wizard, desktop_docking, pcspeaker modules:
-Copyright (C) 2004,2005,2006 Tomasz Rostanski
+Copyright © 2004,2005,2006 Tomasz Rostanski
mimeTeX (used by mime_tex module):
-Copyright (C) 2002,2003,2004,2005,2006 John Forkosh Associates, Inc.
+Copyright © 2002,2003,2004,2005,2006 John Forkosh Associates, Inc.
mime_tex module:
-Copyright (C) 2008 Agnieszka Cicha
-Copyright (C) 2007,2008 Patryk Cisek
+Copyright © 2008 Agnieszka Cicha
+Copyright © 2007,2008 Patryk Cisek
osdhinst_notify module:
-Copyright (C) 2006,2007,2008 Wojtek Sulewski (Pan Wojtas)
-Copyright (C) 2008 Dorregaray
+Copyright © 2006,2007,2008 Wojtek Sulewski (Pan Wojtas)
+Copyright © 2008 Dorregaray
panelkadu module:
-Copyright (C) 2008 ultr
+Copyright © 2008 ultr
parser_extender module:
-Copyright (C) 2008 Dorregaray
+Copyright © 2008 Dorregaray
powerkadu module:
-powerkadu (C) 2007,2008 PT Team
-powerkadu (C) 2008 Dorregaray
+powerkadu © 2007,2008 PT Team
+powerkadu © 2008 Dorregaray
profiles module:
-Copyright (C) 2006 Tomasz Rostanski
+Copyright © 2006 Tomasz Rostanski
spellchecker module:
-Copyright (C) 2004,2005,2006 nazgul
-Copyright (C) 2005,2006 Googie
+Copyright © 2004,2005,2006 nazgul
+Copyright © 2005,2006 Googie
split_messages module:
-Copyright (C) 2007,2008 PT Team
-Copyright (C) 2008 Dorregaray
+Copyright © 2007,2008 PT Team
+Copyright © 2008 Dorregaray
tabs module:
-Copyright (C) 2005,2006 Michal Podsiadlik
+Copyright © 2005,2006 Michal Podsiadlik
water_notify module:
-Copyright (C) 2008 Korneliusz Jarzębski
+Copyright © 2008 Korneliusz Jarzębski
word_fix module:
-Copyright (C) 2007,2008 PT Team
-Copyright (C) 2008 Dorregaray
+Copyright © 2007,2008 PT Team
+Copyright © 2008 Dorregaray
crystal16, crystal22 icon themes:
-Copyright (C) 2004,2005,2006 Dariusz Arciszewski
-Copyright (C) 2004,2005,2006 Everaldo
+Copyright © 2004,2005,2006 Dariusz Arciszewski
+Copyright © 2004,2005,2006 Everaldo
nuvola16, nuvola22 icon themes:
-Copyright (C) 2004,2005,2006 Kadu Team
-Copyright (C) 2004,2005,2006 David Vignoni
+Copyright © 2004,2005,2006 Kadu Team
+Copyright © 2004,2005,2006 David Vignoni
glass16, glass22 icon themes:
-Copyright (C) 2006 Mariusz Waluga
+Copyright © 2006 Mariusz Waluga
penguins emoticons theme:
-Copyright (C) 2006 Kamil Dziedzic
-Copyright (C) 2006 Lukasz Florczak
-Copyright (C) 2006 Mariusz Waluga
-Copyright (C) 2006 Karolina Weiss
-Copyright (C) 2006 Hubert Wrzesinki
+Copyright © 2006 Kamil Dziedzic
+Copyright © 2006 Lukasz Florczak
+Copyright © 2006 Mariusz Waluga
+Copyright © 2006 Karolina Weiss
+Copyright © 2006 Hubert Wrzesinki
Active members of Kadu Team (in an alphabetical order) are:
Tomasz Chilinski
@@ -150,7 +150,7 @@
Marek Kubicki
Maverick
-The Debian packaging is (C) 2007, Patryk Cisek <patryk@prezu.one.pl> and is
+The Debian packaging is © 2007, Patryk Cisek <patryk@prezu.one.pl> and is
licensed under the GPL.
License:
diff -Nru kadu-0.6.0.2/debian/kadu-themes.install
kadu-0.6.0.2.ds1/debian/kadu-themes.install
--- kadu-0.6.0.2/debian/kadu-themes.install 2009-01-21 12:22:54.000000000
+0100
+++ kadu-0.6.0.2.ds1/debian/kadu-themes.install 2009-01-21 12:22:55.000000000
+0100
@@ -1,7 +1,4 @@
debian/tmp/usr/share/kadu/themes/emoticons/gg6_compatible
debian/tmp/usr/share/kadu/themes/emoticons/tango
-debian/tmp/usr/share/kadu/themes/icons/glass16
-debian/tmp/usr/share/kadu/themes/icons/glass22
debian/tmp/usr/share/kadu/themes/icons/kadu05
debian/tmp/usr/share/kadu/themes/icons/oxygen16
-debian/tmp/usr/share/kadu/themes/icons/tango16
diff -Nru kadu-0.6.0.2/debian/patches/02-.config.patch
kadu-0.6.0.2.ds1/debian/patches/02-.config.patch
--- kadu-0.6.0.2/debian/patches/02-.config.patch 2009-01-21 12:22:54.000000000
+0100
+++ kadu-0.6.0.2.ds1/debian/patches/02-.config.patch 2009-01-21
12:22:55.000000000 +0100
@@ -1,5 +1,5 @@
diff --git a/.config b/.config
-index 5659335..0e9426d 100644
+index 5659335..31a691f 100644
--- a/.config
+++ b/.config
@@ -43,13 +43,13 @@ module_x11_docking=m
@@ -276,7 +276,7 @@
############################################# ICONS
###########################################################################
# PL: ####################################### IKONY
###########################################################################
-@@ -420,19 +420,19 @@ module_senthistory=n
+@@ -420,7 +420,7 @@ module_senthistory=n
icons_default=y
# Description: Default theme from kadu 0.5.x
@@ -284,16 +284,9 @@
+icons_kadu05=y
# Description: Glass 16x16 icons made by Mariusz Waluga
--icons_glass16=n
-+icons_glass16=y
-
- # Description: Glass 22x22 icons made by Mariusz Waluga
--icons_glass22=n
-+icons_glass22=y
-
- # Desctiption: Tango 16x16 icons made by BlotoPosniegowe
--icons_tango16=n
-+icons_tango16=y
+ icons_glass16=n
+@@ -432,7 +432,7 @@ icons_glass22=n
+ icons_tango16=n
# Description: Oxygen 16x16 icons maintained by Piotr Pelzowski
-icons_oxygen16=n
diff -Nru kadu-0.6.0.2/debian/watch kadu-0.6.0.2.ds1/debian/watch
--- kadu-0.6.0.2/debian/watch 2009-01-21 12:22:54.000000000 +0100
+++ kadu-0.6.0.2.ds1/debian/watch 2009-01-21 12:22:55.000000000 +0100
@@ -1,3 +1,3 @@
version=3
-opts=uversionmangle=s/-(alpha|beta|rc)/~$1/ \
+opts="dversionmangle=s/\.ds\.\d+$//,uversionmangle=s/-(alpha|beta|rc)/~$1/" \
http://www.kadu.net/download/stable/kadu-(.*)\.tar\.bz2
Pliki
binarne /tmp/2FvG4CWrPw/kadu-0.6.0.2/external/themes/icons/glass16.tar.gz
i /tmp/uXNXEVjEJV/kadu-0.6.0.2.ds1/external/themes/icons/glass16.tar.gz się
różnią
Pliki
binarne /tmp/2FvG4CWrPw/kadu-0.6.0.2/external/themes/icons/glass22.tar.gz
i /tmp/uXNXEVjEJV/kadu-0.6.0.2.ds1/external/themes/icons/glass22.tar.gz się
różnią
Pliki
binarne /tmp/2FvG4CWrPw/kadu-0.6.0.2/external/themes/icons/tango16.tar.gz
i /tmp/uXNXEVjEJV/kadu-0.6.0.2.ds1/external/themes/icons/tango16.tar.gz się
różnią
--
Patryk Cisek
Attachment:
signature.asc
Description: This is a digitally signed message part.