Package: knetfilter Priority: normal Tags: patch Attached is the patch for the NMU of the 3.3.1-1.2 version. The conflict with kxsldbg is solved by renaming the icon upon installation to avoid the generic 'mark' name. Notice, however, that this might happend in the future with some other icons (like 'probe' or 'stop' which are quite generic) and it would be best to rename all of them to prevent name collisions.
Regards Javier
diff -Nru knetfilter-3.3.1.old/debian/changelog
knetfilter-3.3.1/debian/changelog
--- knetfilter-3.3.1.old/debian/changelog 2005-03-08 10:19:27.000000000
+0100
+++ knetfilter-3.3.1/debian/changelog 2005-03-29 01:30:31.000000000 +0200
@@ -1,3 +1,24 @@
+knetfilter (3.3.1-1.2) unstable; urgency=low
+
+ * Rename mark to knet_mark in order to avoid breaking KDE's
+ metapackage (which includes both knetfilter and kxsldbg).
+
+ -- Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]> Tue, 29 Mar 2005
01:29:48 +0200
+
+knetfilter (3.3.1-1.1) unstable; urgency=medium
+
+ * NMU for RC bugs.
+ * Conflict on kxsldbg which provides the same (mark) icon. I've reviewed
+ with 'apt-file search' that there are no other conflicts bound to happen
+ because of filename space collition with other packages providing stuff
+ at /usr/share/icons/ (Closes: #296311, #292176)
+ Note: This is a temporary (and bad) solution either the icons should be
+ renamed (to make them knetfilter-specific) or their location should be
+ changed (what's the standard in KDE?). The names are so generic that this
+ is bound to happen with other packages in the future.
+
+ -- Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]> Tue, 8 Mar 2005
10:16:52 +0100
+
knetfilter (3.3.1-1) unstable; urgency=low
* New upstream release (Closes: #289420).
diff -Nru knetfilter-3.3.1.old/debian/rules knetfilter-3.3.1/debian/rules
--- knetfilter-3.3.1.old/debian/rules 2005-03-08 10:19:27.000000000 +0100
+++ knetfilter-3.3.1/debian/rules 2005-03-29 01:29:04.000000000 +0200
@@ -73,6 +73,7 @@
cp src/pics/knetfilter.png
debian/knetfilter/usr/share/icons/hicolor/16x16/apps/knetfilter.png
mkdir -p debian/knetfilter/usr/share/icons/hicolor/16x16/actions
mv debian/knetfilter/usr/share/icons/*png
debian/knetfilter/usr/share/icons/hicolor/16x16/actions
+ mv debian/knetfilter/usr/share/icons/hicolor/16x16/actions/mark.png
debian/knetfilter/usr/share/icons/hicolor/16x16/actions/knet_mark.png
# Build architecture-independent files here.
binary-indep: build install
diff -Nru knetfilter-3.3.1.old/src/knat_toolbar.cpp
knetfilter-3.3.1/src/knat_toolbar.cpp
--- knetfilter-3.3.1.old/src/knat_toolbar.cpp 2003-07-21 17:41:59.000000000
+0200
+++ knetfilter-3.3.1/src/knat_toolbar.cpp 2005-03-29 01:29:24.000000000
+0200
@@ -297,7 +297,7 @@
toolbar->insertButton("stop_icmp.xpm",del,SIGNAL(clicked()),
this,SLOT(delRule_icmp()),TRUE,i18n("Delete rule to
icmp"));
toolbar->insertSeparator();
- toolbar->insertButton("mark.xpm",add,SIGNAL(clicked()),
+ toolbar->insertButton("knet_mark.xpm",add,SIGNAL(clicked()),
this,SLOT(markRules()),TRUE,i18n("Set Up Mark based
rules"));
toolbar->insertSeparator();
toolbar->insertButton("probe.xpm",add,SIGNAL(clicked()),
signature.asc
Description: Digital signature
