* Moved *_debug.prl and *_debug.la support files to the libqt4-debug-dev

    package
  * Updated to debhelper v5 compatibility
  * debian/qt4-dev-tools.install: removed the /usr/share/qt4/templates
    entry, which no longer contains anything

7 files changed, 24 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 5840acf..c01191c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+qt4-x11 (4.1.0-3) UNRELEASED; urgency=low
+
+  * Moved *_debug.prl and *_debug.la support files to the libqt4-debug-dev
+    package
+
+  * Updated to debhelper v5 compatibility
+
+  * debian/qt4-dev-tools.install: removed the /usr/share/qt4/templates
+    entry, which no longer contains anything
+
+ -- Brian Nelson <pyro@debian.org>  Thu, 12 Jan 2006 12:11:18 -0800
+
 qt4-x11 (4.1.0-2) unstable; urgency=low
 
   * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 3423e1b..bd062f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Brian Nelson <pyro@debian.org>
-Build-Depends: debhelper (>= 4.1.26), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libjpeg62-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-dev, libsqlite0-dev
+Build-Depends: debhelper (>= 5.0.0), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libjpeg62-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-dev, libsqlite0-dev
 Standards-Version: 3.6.2
 
 Package: libqt4-dev
diff --git a/debian/libqt4-debug-dev.install b/debian/libqt4-debug-dev.install
index e830869..b7dbfc6 100644
--- a/debian/libqt4-debug-dev.install
+++ b/debian/libqt4-debug-dev.install
@@ -1 +1,4 @@
 usr/lib/*_debug.so
+usr/lib/*_debug.prl
+usr/lib/*_debug.pc usr/lib/pkgconfig/
+usr/lib/*_debug.la
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 6b21765..a5af477 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -1,17 +1,7 @@
 usr/include/qt4/*
 usr/lib/*.la
+usr/lib/*.so
 usr/lib/*.prl
-usr/lib/libQt3Support.so
-usr/lib/libQtCore.so
-usr/lib/libQtDesigner.so
-usr/lib/libQtDesignerComponents.so
-usr/lib/libQtGui.so
-usr/lib/libQtNetwork.so
-usr/lib/libQtOpenGL.so
-usr/lib/libQtSql.so
-usr/lib/libQtSvg.so
-usr/lib/libQtTest.so
-usr/lib/libQtXml.so
 usr/lib/*.pc usr/lib/pkgconfig/
 usr/share/qt4/q3porting.xml
 usr/share/qt4/mkspecs/*
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 7752f91..6fe1401 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -1,4 +1,3 @@
 usr/bin/assistant-qt4
 usr/bin/linguist-qt4
-usr/share/qt4/templates/*
 usr/share/qt4/phrasebooks/*
diff --git a/debian/rules b/debian/rules
index e18d08c..dbbe20e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,3 +88,9 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 	    install -p -D -m644 debian/$(cdbs_curpkg).lintian \
 	    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
         fi
+
+# Remove debugging library junk from libqt4-dev, it goes in
+#libqt4-debug-dev instead.
+binary-post-install/libqt4-dev::
+	rm -f debian/$(cdbs_curpkg)/usr/lib/*_debug.* \
+	      debian/$(cdbs_curpkg)/usr/lib/pkgconfig/*_debug.*