[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#769075: unblock: ettercap/1:0.8.1-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ettercap

unblock ettercap/1:0.8.1-2

I'm asking to unblock, mainly because of RC bug #768831


uebdiffcp-0.8.1/debian/changelog ettercap-0.8.1/debian/changelog
--- ettercap-0.8.1/debian/changelog	2014-10-18 11:17:12.000000000 +0200
+++ ettercap-0.8.1/debian/changelog	2014-11-11 09:41:06.000000000 +0100
@@ -1,3 +1,14 @@
+ettercap (1:0.8.1-2) unstable; urgency=medium
+
+  * Remove byacc | byacc-j | btyacc, not compatible after
+    the cmake switch.
+  * Add flex-old as b-d, used with bison++.
+  * Fix conflicting files in both common and graphical package
+    (Closes: #768831).
+  * Remove the gksu dependency, not needed anymore.
+
+ -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it>  Tue, 21 Oct 2014 13:19:19 +0200
+
 ettercap (1:0.8.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru ettercap-0.8.1/debian/control ettercap-0.8.1/debian/control
--- ettercap-0.8.1/debian/control	2014-10-18 11:17:12.000000000 +0200
+++ ettercap-0.8.1/debian/control	2014-11-11 09:42:20.000000000 +0100
@@ -4,12 +4,12 @@
 Maintainer: Barak A. Pearlmutter <bap@debian.org>
 Uploaders: Murat Demirten <murat@debian.org>,
            Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-Build-Depends: bison | bison++ | byacc | byacc-j | btyacc,
+Build-Depends: bison | bison++,
                check,
                chrpath,
                cmake,
                debhelper (>= 9),
-               flex,
+               flex | flex-old,
                ghostscript,
                libbsd-dev,
                libcurl4-openssl-dev,
@@ -88,7 +88,6 @@
 Replaces: ettercap, ettercap-common, ettercap-gtk, ettercap-text-only
 Conflicts: ettercap (<= 1:0.7.3), ettercap-gtk, ettercap-text-only
 Provides: ettercap
-Recommends: gksu
 Description: Ettercap GUI-enabled executable
  Ettercap supports active and passive dissection of many protocols
  (even encrypted ones) and includes many feature for network and host
diff -Nru ettercap-0.8.1/debian/ettercap-common.install ettercap-0.8.1/debian/ettercap-common.install
--- ettercap-0.8.1/debian/ettercap-common.install	2014-10-18 11:17:12.000000000 +0200
+++ ettercap-0.8.1/debian/ettercap-common.install	2014-11-11 09:43:32.000000000 +0100
@@ -2,9 +2,12 @@
 /usr/bin/etterfilter
 /usr/bin/etterlog
 /usr/lib/
-/usr/share/ettercap
-# The next line accidentally gets
+# The next lines accidentally gets
+#  /usr/share/ettercap/ettercap.png
+#  /usr/share/ettercap/ettercap-small.png
+#  /usr/share/ettercap/ettercap.svg
 #  /usr/share/man/ettercap-pkexec*
 # which belongs in ettercap-graphical.
 # This is worked around in debian/rules.
+/usr/share/ettercap
 /usr/share/man
diff -Nru ettercap-0.8.1/debian/ettercap-graphical.install ettercap-0.8.1/debian/ettercap-graphical.install
--- ettercap-0.8.1/debian/ettercap-graphical.install	2014-10-18 11:17:12.000000000 +0200
+++ ettercap-0.8.1/debian/ettercap-graphical.install	2014-11-11 09:42:20.000000000 +0100
@@ -2,7 +2,8 @@
 /usr/bin/ettercap-pkexec
 /usr/share/appdata
 /usr/share/applications
-/usr/share/ettercap/ettercap.png
+/usr/share/ettercap/*.png
+/usr/share/ettercap/*.svg
 /usr/share/man/man*/ettercap-pkexec*
 /usr/share/pixmaps
 /usr/share/polkit-1
diff -Nru ettercap-0.8.1/debian/rules ettercap-0.8.1/debian/rules
--- ettercap-0.8.1/debian/rules	2014-10-18 11:17:12.000000000 +0200
+++ ettercap-0.8.1/debian/rules	2014-11-11 09:41:06.000000000 +0100
@@ -56,6 +56,9 @@
 	dh_install --list-missing
 	@echo The ettercap-pkexec man page belongs in ettercap-graphical
 	-rm --verbose debian/ettercap-common/usr/share/man/man*/ettercap-pkexec*
+	@echo The ettercap images belongs in ettercap-graphical
+	-rm --verbose debian/ettercap-common/usr/share/ettercap/*.png
+	-rm --verbose debian/ettercap-common/usr/share/ettercap/*.svg
 	@echo "Upstream does not set RPATH, but the file is not handled by cmake install (dh_auto_install target)"
 	chrpath --list   debian/ettercap-text-only/usr/bin/ettercap
 	chrpath --delete debian/ettercap-text-only/usr/bin/ettercap


Reply to: