releasing version 4.0.0-3debian/4.0.0-3

6 files changed, 26 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 1bf19ae..a2b9fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,24 @@ qt4-x11 (4.0.0-3) unstable; urgency=low
     the alternatives, the symlinks to them no longer dangle.
     (Closes: #319456)
 
- --
+  * debian/libqt4-core.install: added
+    usr/lib/qt4/plugins/imageformats/libqjpeg.so to include the jpeg
+    plugin (Closes: #321582)
+
+  * debian/libqt4-debug.install: added the libqjpeg_debug.so plugin
+  
+  * debian/rules: don't hardcode the /usr/include/postgresql/8.0 path,
+    instead of the output of `pg_config --includedir`, stolen from Qt3
+    packages
+
+  * debian/libqt4-gui.install: added the OpenGL module library so that it
+    actually gets included in a package (Closes: #321874)
+
+  * debian/control: updated the package descriptions to note that the
+    Network and XML modules are included in the libqt4-core package, and
+    the OpenGL module is included in the libqt4-gui package
+
+ -- Brian Nelson <pyro@debian.org>  Mon,  8 Aug 2005 08:58:10 -0700
 
 qt4-x11 (4.0.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cc69156..15d21ae 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,8 @@ Description: Qt 4 core non-GUI functionality runtime library
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This packages contains the core non-GUI shared library.
+ This packages contains the core non-GUI shared library, and the Network
+ and XML modules.
  .
   Homepage: http://www.trolltech.com
 
@@ -43,7 +44,8 @@ Description: Qt 4 core GUI functionality runtime library
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This packages contains the core GUI shared library.
+ This packages contains the core GUI shared library and the OpenGL
+ module.
  .
   Homepage: http://www.trolltech.com
 
diff --git a/debian/libqt4-core.install b/debian/libqt4-core.install
index bd7c0ea..1aef8c6 100644
--- a/debian/libqt4-core.install
+++ b/debian/libqt4-core.install
@@ -2,3 +2,4 @@ usr/lib/libQtCore.so.*
 usr/lib/libQtNetwork.so.*
 usr/lib/libQtXml.so.*
 usr/share/qt4/translations/*.qm
+usr/lib/qt4/plugins/imageformats/libqjpeg.so
diff --git a/debian/libqt4-debug.install b/debian/libqt4-debug.install
index 5c2ae9b..b59de8a 100644
--- a/debian/libqt4-debug.install
+++ b/debian/libqt4-debug.install
@@ -1,2 +1,3 @@
 usr/lib/lib*_debug.so.*
 usr/lib/qt4/plugins/designer/*_debug.so
+usr/lib/qt4/plugins/imageformats/*_debug.so
diff --git a/debian/libqt4-gui.install b/debian/libqt4-gui.install
index 4436e8e..b1f11fe 100644
--- a/debian/libqt4-gui.install
+++ b/debian/libqt4-gui.install
@@ -1,2 +1,3 @@
 usr/lib/libQtGui.so.*
+usr/lib/libQtOpenGL.so.*
 usr/bin/qtconfig-qt4
diff --git a/debian/rules b/debian/rules
index b5c7a75..de079ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ common-configure-arch::
 		    -qt-sql-sqlite \
 	            -I/usr/include/mysql \
 	            -I/usr/include/freetype2 \
-	            -I/usr/include/postgresql/8.0 \
+	            -I`pg_config --includedir` \
 	            -lfontconfig \
 	            -cups