summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/00list2
-rwxr-xr-xdebian/rules5
-rw-r--r--debian/wireshark-dev.files2
-rw-r--r--debian/wireshark-dev.manpages2
4 files changed, 7 insertions, 4 deletions
diff --git a/debian/patches/00list b/debian/patches/00list
index 9149b587b8..8c6dbb5f94 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,3 @@
-#01_idl2deb
-#02_asn2deb
03_preferences
#04_drop-capabilities
#05_plugin-libdir
diff --git a/debian/rules b/debian/rules
index 4869053992..2661f2d4a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
cp debian/wireshark.desktop $(CURDIR)/debian/tmp/usr/share/applications/
- cp tools/idl2wrs $(CURDIR)/debian/tmp/usr/bin/
+ cp tools/asn2deb tools/idl2deb tools/idl2wrs $(CURDIR)/debian/tmp/usr/bin/
#cp debian/wireshark-root.desktop $(CURDIR)/debian/tmp/usr/share/applications/
mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/
cp image/hi48-app-wireshark.png $(CURDIR)/debian/tmp/usr/share/pixmaps/
@@ -93,8 +93,9 @@ install: build
cp --parents $$F $(CURDIR)/debian/tmp/usr/include/wireshark; \
done
-rm -rf $(CURDIR)/debian/tmp/usr/man
+ mkdir -p $(CURDIR)/debian/tmp/usr/man
dh_installman
- cp doc/idl2wrs.1 $(CURDIR)/debian/tmp/usr/man
+ cp doc/asn2deb.1 doc/idl2deb.1 doc/idl2wrs.1 $(CURDIR)/debian/tmp/usr/man
dh_movefiles
dh_pysupport
diff --git a/debian/wireshark-dev.files b/debian/wireshark-dev.files
index c70c05ef5d..51a3b0f8f5 100644
--- a/debian/wireshark-dev.files
+++ b/debian/wireshark-dev.files
@@ -1,3 +1,5 @@
+/usr/bin/asn2deb
+/usr/bin/idl2deb
/usr/bin/idl2wrs
/usr/lib/wireshark/libwireshark.so
/usr/lib/wireshark/libwireshark.la
diff --git a/debian/wireshark-dev.manpages b/debian/wireshark-dev.manpages
index 25b2ec47a7..1737947d30 100644
--- a/debian/wireshark-dev.manpages
+++ b/debian/wireshark-dev.manpages
@@ -1 +1,3 @@
+doc/asn2deb.1
+doc/idl2deb.1
doc/idl2wrs.1