Control: tags 771232 - moreinfo Hi Sebastian
On 27/11/14 21:09, Sebastian Ramacher wrote: [...] > > This does not seem to be the correct fix. Now it does not install at > all: > > Setting up gns3 (0.8.7-2) ... > Error: The new file /usr/share/doc/gns3/gns3.ini does not exist! > dpkg: error processing package gns3 (--configure): > > This file is still mentioned in debian/ucf. Did you forget to update > that reference? > I had indeed missed that... despite noting I needed to update it! New package should be appearing on mentors shortly. I've also attached the updated debdiff Regards Daniel
diff -Nru gns3-0.8.7/debian/changelog gns3-0.8.7/debian/changelog --- gns3-0.8.7/debian/changelog 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/changelog 2014-11-27 21:10:44.000000000 +0000 @@ -1,3 +1,11 @@ +gns3 (0.8.7-2) unstable; urgency=medium + + * Do not install files needed by the program to /usr/share/doc + (Closes: #771135) + * Add dh-python to build-depends + + -- Daniel Lintott <dan...@serverb.co.uk> Thu, 27 Nov 2014 19:56:04 +0000 + gns3 (0.8.7-1) unstable; urgency=medium * Imported Upstream version 0.8.7 diff -Nru gns3-0.8.7/debian/control gns3-0.8.7/debian/control --- gns3-0.8.7/debian/control 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/control 2014-11-27 21:10:44.000000000 +0000 @@ -3,6 +3,7 @@ Priority: optional Maintainer: Daniel Lintott <dan...@serverb.co.uk> Build-Depends: debhelper (>= 9), + dh-python, libqt4-dev, python Standards-Version: 3.9.5 diff -Nru gns3-0.8.7/debian/docs gns3-0.8.7/debian/docs --- gns3-0.8.7/debian/docs 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/docs 2014-11-27 21:10:44.000000000 +0000 @@ -1,6 +1,3 @@ AUTHORS -baseconfig.txt -baseconfig_sw.txt README TODO -debian/additional/gns3.ini diff -Nru gns3-0.8.7/debian/install gns3-0.8.7/debian/install --- gns3-0.8.7/debian/install 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/install 2014-11-27 21:10:44.000000000 +0000 @@ -2,3 +2,4 @@ debian/additional/applications/* usr/share/applications/ debian/additional/icons/* usr/share/icons/ debian/additional/pixmaps/* usr/share/pixmaps/ +debian/additional/gns3.ini usr/share/gns3/ diff -Nru gns3-0.8.7/debian/patches/baseconfig_dir.patch gns3-0.8.7/debian/patches/baseconfig_dir.patch --- gns3-0.8.7/debian/patches/baseconfig_dir.patch 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/patches/baseconfig_dir.patch 2014-11-27 21:10:44.000000000 +0000 @@ -4,16 +4,14 @@ Author: Daniel Lintott <dan...@serverb.co.uk> Forwarded: Not needed, debian specific --- -Index: gns3/src/GNS3/Config/Defaults.py -=================================================================== ---- gns3.orig/src/GNS3/Config/Defaults.py 2013-10-24 11:57:33.518105996 +0100 -+++ gns3/src/GNS3/Config/Defaults.py 2013-10-24 22:34:35.869585964 +0100 +--- a/src/GNS3/Config/Defaults.py ++++ b/src/GNS3/Config/Defaults.py @@ -48,7 +48,7 @@ elif sys.platform.startswith('win'): BASECONFIG_DIR = '' else: - BASECONFIG_DIR = '/usr/local/share/examples/gns3/' -+ BASECONFIG_DIR = '/usr/share/doc/gns3/' ++ BASECONFIG_DIR = '/usr/share/gns3/' # Default path to qemuwrapper if sys.platform.startswith('win'): diff -Nru gns3-0.8.7/debian/patches/setup.py.patch gns3-0.8.7/debian/patches/setup.py.patch --- gns3-0.8.7/debian/patches/setup.py.patch 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/patches/setup.py.patch 2014-11-27 21:10:44.000000000 +0000 @@ -2,16 +2,17 @@ Author: Daniel Lintott <dan...@serverb.co.uk> Forwarded: Not needed, debian specific --- -Index: gns3-0.8.6/setup.py -=================================================================== ---- gns3-0.8.6.orig/setup.py 2013-10-26 12:52:22.628993000 +0100 -+++ gns3-0.8.6/setup.py 2013-10-26 13:34:26.477263931 +0100 -@@ -284,7 +284,5 @@ +--- a/setup.py ++++ b/setup.py +@@ -283,8 +283,7 @@ + 'GNS3.Ui.ConfigurationPages', 'GNS3.Langs'], package_data = { 'GNS3': ['Langs/*.qm', 'Dynagen/configspec'] }, - data_files = [ (wrapper_dir, ['qemuwrapper/qemuwrapper.py', 'vboxwrapper/vboxcontroller_4_1.py', 'vboxwrapper/vboxwrapper.py', 'vboxwrapper/tcp_pipe_proxy.py']), +- data_files = [ (wrapper_dir, ['qemuwrapper/qemuwrapper.py', 'vboxwrapper/vboxcontroller_4_1.py', 'vboxwrapper/vboxwrapper.py', 'vboxwrapper/tcp_pipe_proxy.py']), - ('/usr/local/share/examples/gns3/', ['baseconfig.txt', 'baseconfig_sw.txt']), - ('/usr/local/share/doc/gns3/', ['README', 'COPYING', 'CHANGELOG']), - ('/usr/local/share/man/man1/', ['docs/man/gns3.1'])] ++ data_files = [ (wrapper_dir, ['qemuwrapper/qemuwrapper.py', 'vboxwrapper/vboxcontroller_4_1.py', 'vboxwrapper/vboxwrapper.py', 'vboxwrapper/tcp_pipe_proxy.py', ++ 'baseconfig.txt', 'baseconfig_sw.txt']), + ('/usr/share/man/man1/', ['docs/man/gns3.1'])] ) diff -Nru gns3-0.8.7/debian/ucf gns3-0.8.7/debian/ucf --- gns3-0.8.7/debian/ucf 2014-07-08 17:30:56.000000000 +0100 +++ gns3-0.8.7/debian/ucf 2014-11-27 21:10:44.000000000 +0000 @@ -1 +1 @@ -/usr/share/doc/gns3/gns3.ini /etc/gns3/gns3.ini +/usr/share/gns3/gns3.ini /etc/gns3/gns3.ini
signature.asc
Description: OpenPGP digital signature