Fixed new lintian warnings.

Removed .cvsignore files from cp -R 'd examples.
(Please don't use -R in install targets -- we don't need CVS cruft installed on
 peoples machines..)
Added extra contrib libs to contrib-dev package.
Removed 'shell' line from some non executable .py scripts.
Updated lintian overrides.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 3435dc23ca99b5d009c269bb6973c1c4e66fceec..0993d1022707c391e3b36c7ea146c733f011d53c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1356,7 +1356,7 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
        @# in other dist targets.  Ugly and hardly portable but it
        @# will run on any Debian box and that's enough for now.
 
        @# in other dist targets.  Ugly and hardly portable but it
        @# will run on any Debian box and that's enough for now.
 

-       find $(DISTDIR) \( -name "CVS" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
+       find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \

                        \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
                        -print0 | xargs -0 rm -rf
 
                        \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
                        -print0 | xargs -0 rm -rf
 

diff --git a/debian/libwxgtk-contrib-dev.files b/debian/libwxgtk-contrib-dev.files
index 96ed45a3df7215c5ccff9ca7e0a0515029bab590..edf71a58b5c49c91955265740f0d475e8553db8f 100644 (file)
--- a/debian/libwxgtk-contrib-dev.files
+++ b/debian/libwxgtk-contrib-dev.files
@@ -1,5 +1,9 @@
 usr/include/wx/
 usr/include/wx/

+usr/lib/libcanvas.so
+usr/lib/libfl.so

 usr/lib/libmmedia.so
 usr/lib/libogl.so
 usr/lib/libstc.so
 usr/lib/libmmedia.so
 usr/lib/libogl.so
 usr/lib/libstc.so

+usr/lib/libwx_plot.so
+usr/lib/libwxxrc.so

 
 

diff --git a/debian/lintian-override b/debian/lintian-override
index 9a3e92062062a4252baad7ca92e487659eb1026e..801c034a551bf1b4ce301ddfba25b0146ac654c4 100644 (file)
--- a/debian/lintian-override
+++ b/debian/lintian-override
@@ -1,5 +1,3 @@
-libwxgtk2.2-dbg: non-dev-pkg-with-shlib-symlink
-libwxgtk2.2-dbg: unused-shlib-entry-in-control-file
-libwxbase2.2-dbg: non-dev-pkg-with-shlib-symlink
-libwxbase2.2-dbg: unused-shlib-entry-in-control-file
+libwxgtk2.3-dbg: non-dev-pkg-with-shlib-symlink
+libwxbase2.3-dbg: non-dev-pkg-with-shlib-symlink

 
 

diff --git a/wxPython/wxPython/lib/colourselect.py b/wxPython/wxPython/lib/colourselect.py
index 590cf64e76399e3545977f2194266008705e855c..cef3f4d445ebc2ef905e54d6dfb75e1ca019d2fe 100644 (file)
--- a/wxPython/wxPython/lib/colourselect.py
+++ b/wxPython/wxPython/lib/colourselect.py
@@ -1,4 +1,3 @@
-#!/bin/env python

 #----------------------------------------------------------------------------
 # Name:         ColourSelect.py
 # Purpose:      Colour Box Selection Control
 #----------------------------------------------------------------------------
 # Name:         ColourSelect.py
 # Purpose:      Colour Box Selection Control


@@ -64,7 +63,3 @@ class ColourSelect(wxButton):
             self.OnChange()
         dlg.Destroy()
 
             self.OnChange()
         dlg.Destroy()
 

-
-
-
-

diff --git a/wxPython/wxPython/lib/imagebrowser.py b/wxPython/wxPython/lib/imagebrowser.py
index 0c758a38122bbc6a5d31c94e2439a069cb272623..31cdbcdebeb039887bb76a64de7c4fbf5fc9303a 100644 (file)
--- a/wxPython/wxPython/lib/imagebrowser.py
+++ b/wxPython/wxPython/lib/imagebrowser.py
@@ -1,4 +1,3 @@
-#!/bin/env python

 #----------------------------------------------------------------------------
 # Name:         BrowseImage.py
 # Purpose:      Display and Select Image Files
 #----------------------------------------------------------------------------
 # Name:         BrowseImage.py
 # Purpose:      Display and Select Image Files