[Pkg-kde-commits] rev 1326 - trunk/packages/qt-x11-free/debian

Adeodato Simó adeodato at costa.debian.org
Tue Jul 19 01:07:12 UTC 2005 

Author: adeodato
Date: 2005-07-19 01:07:11 +0000 (Tue, 19 Jul 2005)
New Revision: 1326

Added:
   trunk/packages/qt-x11-free/debian/libqt3-ibase.install
   trunk/packages/qt-x11-free/debian/libqt3-mt-ibase.install
   trunk/packages/qt-x11-free/debian/libqt3-mt-mysql.install
   trunk/packages/qt-x11-free/debian/libqt3-mt-odbc.install
   trunk/packages/qt-x11-free/debian/libqt3-mt-psql.install
   trunk/packages/qt-x11-free/debian/libqt3-mt-sqlite.install
   trunk/packages/qt-x11-free/debian/libqt3-mt.install
   trunk/packages/qt-x11-free/debian/libqt3-mt.links
   trunk/packages/qt-x11-free/debian/libqt3-mt.postrm
   trunk/packages/qt-x11-free/debian/libqt3-mysql.install
   trunk/packages/qt-x11-free/debian/libqt3-odbc.install
   trunk/packages/qt-x11-free/debian/libqt3-psql.install
   trunk/packages/qt-x11-free/debian/libqt3-sqlite.install
   trunk/packages/qt-x11-free/debian/libqt3.install
   trunk/packages/qt-x11-free/debian/libqt3.links
   trunk/packages/qt-x11-free/debian/libqt3.postrm
Removed:
   trunk/packages/qt-x11-free/debian/libqt3c102-ibase.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt-ibase.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt-mysql.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt-odbc.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt-psql.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt-sqlite.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt.install
   trunk/packages/qt-x11-free/debian/libqt3c102-mt.links
   trunk/packages/qt-x11-free/debian/libqt3c102-mt.postrm
   trunk/packages/qt-x11-free/debian/libqt3c102-mysql.install
   trunk/packages/qt-x11-free/debian/libqt3c102-odbc.install
   trunk/packages/qt-x11-free/debian/libqt3c102-psql.install
   trunk/packages/qt-x11-free/debian/libqt3c102-sqlite.install
   trunk/packages/qt-x11-free/debian/libqt3c102.install
   trunk/packages/qt-x11-free/debian/libqt3c102.links
   trunk/packages/qt-x11-free/debian/libqt3c102.postrm
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/rules
Log:
There we go, whee.

  * Transition to the new C++ ABI. Rename all the library packages as
    necessary: every libqt3c102-* goes back to libqt3-* now. Changes based in
    the patch provided by Matthias Klose in Ubuntu Bug 10723.

    + debian/control:
      - renamed library packages.
      - add conflicts and replaces against the libqt3c102-* packages, or
        change the existing libqt3-* ones.
      - change the existing recommends and suggests on libqt3c102-* to
        libqt3-*.
      - adjusted descriptions where appropriate.

    + debian/rules:
      - s/c102// in various places.

    + debian/*.install, debian/*.links:
      - renamed as appropriate.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-07-19 01:03:42 UTC (rev 1325)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-07-19 01:07:11 UTC (rev 1326)
@@ -13,9 +13,29 @@
 
   +++ Changes by Adeodato Simó:
 
-  * TODO C++ stuff here.
-    (Closes: #317768)
+  * Transition to the new C++ ABI. Rename all the library packages as
+    necessary: every libqt3c102-* goes back to libqt3-* now. Changes based in
+    the patch provided by Matthias Klose in Ubuntu Bug 10723.
 
+    + debian/control:
+      - renamed library packages.
+      - add conflicts and replaces against the libqt3c102-* packages, or
+        change the existing libqt3-* ones.
+      - change the existing recommends and suggests on libqt3c102-* to
+        libqt3-*.
+      - adjusted descriptions where appropriate.
+
+    + debian/rules:
+      - s/c102// in various places.
+
+    + debian/*.install, debian/*.links:
+      - renamed as appropriate.
+
+   TODO: disable firebird2 support.
+
+   The above solves trouble for users when using qt3-designer with g++ 4.0, so
+   this upload closes: #317768.
+
   * Transition to the new X.org packages:
     + debian/control:
       - build-depend in libglu1-xorg-dev instead of xlibmesa-glu-dev; make the

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2005-07-19 01:03:42 UTC (rev 1325)
+++ trunk/packages/qt-x11-free/debian/control	2005-07-19 01:07:11 UTC (rev 1326)
@@ -6,150 +6,161 @@
 Priority: optional
 Standards-Version: 3.6.2
 
-Package: libqt3c102
+Package: libqt3
 Architecture: any
 Section: libs
-Replaces: libqt3-gl, qt3-tools (<< 2:3.0.2-20020306-1), libqt3, libqt3-mt
+Replaces: libqt3-gl, qt3-tools (<< 2:3.0.2-20020306-1), libqt3c102, libqt3-mt
 Depends: ${shlibs:Depends}, fontconfig
-Conflicts: libqt3-gl, libqt3, libqt3c
-Suggests: libqt3c102-psql, libqt3c102-mysql, libqt3c102-odbc
+Conflicts: libqt3-gl, libqt3c102, libqt3c
+Suggests: libqt3-psql, libqt3-mysql, libqt3-odbc
 Description: Qt GUI Library, Version 3
  This is the Trolltech Qt library, version 3. It's necessary for
  applications that link against the libqt.so.3.
  .
  WARNING: The nonthreaded version of Qt3 is considered deprecated and
- may disappear anytime in the future. Please use libqt3c102-mt instead 
+ may disappear anytime in the future. Please use libqt3-mt instead 
  (Read README.Debian for instructions).
 
-Package: libqt3c102-mt
+Package: libqt3-mt
 Architecture: any
 Section: libs
-Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3-mt
+Replaces: qt3-tools (<< 2:3.0.2-20020306-1), libqt3-helper, libqt3, libqt3c102-mt
 Depends: ${shlibs:Depends}, fontconfig
-Conflicts: libqt3-mt, libqui1-emb, libqt3c-mt
-Suggests: libqt3c102-mt-psql, libqt3c102-mt-mysql, libqt3c102-mt-odbc
+Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
+Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
 Description: Qt GUI Library (Threaded runtime version), Version 3
  This is the Trolltech Qt library, version 3. It's necessary for
  applications that link against the libqt-mt.so.3, e.g. all KDE3 
  applications.
  
-Package: libqt3c102-mysql
+Package: libqt3-mysql
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libqt3-mysql, libqt3c-mysql
+Conflicts: libqt3c102-mysql, libqt3c-mysql
+Replaces: libqt3c102-mysql
 Description: MySQL database driver for Qt3
  This package contains the MySQL plugin for Qt3. Install it if you
  intend to use or write Qt programs that are to access a MySQL DB
- and if you are absolutely sure that libqt3c102-mt-mysql does not
+ and if you are absolutely sure that libqt3-mt-mysql does not
  suit your needs.
  .
  WARNING: The nonthreaded version of Qt3 is considered deprecated and
  may disappear anytime in the future. Please use the proper threaded
  version instead (Read README.Debian for instructions).
    
-Package: libqt3c102-mt-mysql
+Package: libqt3-mt-mysql
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1)
-Conflicts: libqt3-mt-mysql, libqt3c-mt-mysql
+Replaces: libqt3-mysql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-mysql
+Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql
 Description: MySQL database driver for Qt3 (Threaded)
  This package contains the threaded MySQL plugin for Qt3. Install it if
  you intend to use or write Qt programs that are to access a MySQL DB.
 
-Package: libqt3c102-odbc
+Package: libqt3-odbc
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libqt3-odbc, libqt3c-odbc
+Conflicts: libqt3c102-odbc, libqt3c-odbc
+Replaces: libqt3c102-odbc
 Description: ODBC database driver for Qt3
  This package contains the ODBC plugin for Qt3. Install it if you 
  intend to use or write Qt programs that are to access an ODBC DB
- and if you are absolutely sure that libqt3c102-mt-odbc does not
+ and if you are absolutely sure that libqt3-mt-odbc does not
  suit your needs.
  .
  WARNING: The nonthreaded version of Qt3 is considered deprecated and
  may disappear anytime in the future. Please use the proper threaded
  version instead (Read README.Debian for instructions).
  
-Package: libqt3c102-mt-odbc
+Package: libqt3-mt-odbc
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1)
-Conflicts: libqt3-mt-odbc, libqt3c-mt-odbc
+Replaces: libqt3-odbc (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-odbc
+Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc
 Description: ODBC database driver for Qt3 (Threaded)
  This package contains the threaded ODBC plugin for Qt3. Install it if
  you intend to use or write Qt programs that are to access an ODBC DB.
 
-Package: libqt3c102-psql
+Package: libqt3-psql
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libqt3-psql, libqt3c-psql
+Conflicts: libqt3c102-psql, libqt3c-psql
+Replaces: libqt3c102-psql
 Description: PostgreSQL database driver for Qt3
  This package contains the unthreaded PostgreSQL plugin for Qt3. 
  Install it if you intend to use or write Qt programs that are 
  to access a PostgreSQL DB and if you are absolutely sure that
- libqt3c102-mt-psql does not suit your needs.
+ libqt3-mt-psql does not suit your needs.
  .
  WARNING: The nonthreaded version of Qt3 is considered deprecated and
  may disappear anytime in the future. Please use the proper threaded
  version instead (Read README.Debian for instructions).
  
-Package: libqt3c102-mt-psql
+Package: libqt3-mt-psql
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1)
-Conflicts: libqt3-mt-psql, libqt3c-mt-psql
+Replaces: libqt3-psql (<= 2:3.1.1+cvs.20021220-1), libqt3c102-mt-psql
+Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql
 Description: PostgreSQL database driver for Qt3 (Threaded)
  This package contains the threaded PostgreSQL plugin for Qt3. 
  Install it if you intend to use or write Qt programs that are 
  to access a PostgreSQL DB.
 
-Package: libqt3c102-ibase
+Package: libqt3-ibase
 Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-ibase
+Replaces: libqt3c102-ibase
 Description: InterBase/FireBird database driver for Qt3
  This package contains the InterBase/FireBird plugin for Qt3. Install 
  it if you intend to use or write Qt programs that are to access 
  an InterBase/FireBird DB and if you are absolutely sure that
- libqt3c102-mt-ibase does not suit your needs.
+ libqt3-mt-ibase does not suit your needs.
  .
  WARNING: The nonthreaded version of Qt3 is considered deprecated and
  may disappear anytime in the future. Please use the proper threaded
  version instead (Read README.Debian for instructions).
 
-Package: libqt3c102-mt-ibase
+Package: libqt3-mt-ibase
 Architecture: i386 hurd-i386 kfreebsd-i386 knetbsd-i386 netbsd-i386
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-mt-ibase
+Replaces: libqt3c102-mt-ibase
 Description: InterBase/FireBird database driver for Qt3 (Threaded)
  This package contains the threaded InterBase/FireBird plugin 
  for Qt3. Install it if you intend to use or write Qt programs 
  that are to access an InterBase/FireBird DB.
  
-Package: libqt3c102-sqlite
+Package: libqt3-sqlite
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-sqlite
+Replaces: libqt3c102-sqlite
 Description: SQLite database driver for Qt3
  This package contains the SQLite plugin for Qt3. Install it if
  you intend to use or write Qt programs that are to access an
- SQLite DB and if you are absolutely sure that libqt3c102-mt-sqlite
+ SQLite DB and if you are absolutely sure that libqt3-mt-sqlite
  does not suit your needs. 
  .
  WARNING: The nonthreaded version of Qt3 is considered deprecated and
  may disappear anytime in the future. Please use the proper threaded
  version instead (Read README.Debian for instructions).
 
-Package: libqt3c102-mt-sqlite
+Package: libqt3-mt-sqlite
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libqt3c102-mt-sqlite
+Replaces: libqt3c102-mt-sqlite
 Description: SQLite database driver for Qt3 (Threaded)
  This package contains the threaded SQLite plugin for Qt3. Install 
  it if you intend to use or write Qt programs that are to access an
@@ -344,7 +355,7 @@
 Package: libqt3-i18n
 Architecture: all
 Section: libs
-Recommends: libqt3c102-mt
+Recommends: libqt3-mt
 Description: i18n files for Qt3 library
  This package contains the internationalization files for the Qt library.
  Qt applications that are internationalized will need to depend on this package

Copied: trunk/packages/qt-x11-free/debian/libqt3-ibase.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-ibase.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt-ibase.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt-ibase.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt-mysql.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt-mysql.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt-odbc.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt-odbc.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt-psql.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt-psql.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt-sqlite.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt-sqlite.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt.links (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt.links)

Copied: trunk/packages/qt-x11-free/debian/libqt3-mt.postrm (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mt.postrm)
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3c102-mt.postrm	2005-07-18 08:51:01 UTC (rev 1324)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt.postrm	2005-07-19 01:07:11 UTC (rev 1326)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/usr/share/doc/libqt3-mt/" ]; then
+    rm -rf /usr/share/doc/libqt3-mt/
+  fi
+fi
+
+#DEBHELPER#

Copied: trunk/packages/qt-x11-free/debian/libqt3-mysql.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-mysql.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-odbc.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-odbc.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-psql.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-psql.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3-sqlite.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102-sqlite.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3.install (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102.install)

Copied: trunk/packages/qt-x11-free/debian/libqt3.links (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102.links)

Copied: trunk/packages/qt-x11-free/debian/libqt3.postrm (from rev 1324, trunk/packages/qt-x11-free/debian/libqt3c102.postrm)
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3c102.postrm	2005-07-18 08:51:01 UTC (rev 1324)
+++ trunk/packages/qt-x11-free/debian/libqt3.postrm	2005-07-19 01:07:11 UTC (rev 1326)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/usr/share/doc/libqt3/" ]; then
+    rm -rf /usr/share/doc/libqt3/
+  fi
+fi
+
+#DEBHELPER#

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-ibase.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt-ibase.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt-mysql.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt-odbc.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt-psql.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt-sqlite.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt.links

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mt.postrm

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-mysql.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-odbc.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-psql.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102-sqlite.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102.install

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102.links

Deleted: trunk/packages/qt-x11-free/debian/libqt3c102.postrm

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-07-19 01:03:42 UTC (rev 1325)
+++ trunk/packages/qt-x11-free/debian/rules	2005-07-19 01:07:11 UTC (rev 1326)
@@ -19,7 +19,7 @@
 
 # build variables (directorys)
 DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libqt3c102
+P_LIBS = $(DEBIAN)/libqt3
 P_DOC = $(DEBIAN)/qt3-doc
 P_DEV = $(DEBIAN)/libqt3-dev
 P_APPSDEV = $(DEBIAN)/qt3-apps-dev
@@ -86,7 +86,7 @@
 
 ifneq ($(DEB_HOST_ARCH_CPU),i386)
 	CONFIGURE_OPTS += -no-sql-ibase
-	IBASE = -Nlibqt3c102-ibase -Nlibqt3c102-mt-ibase
+	IBASE = -Nlibqt3-ibase -Nlibqt3-mt-ibase
 else
 	IBASE =
 endif
@@ -433,7 +433,7 @@
 	dh_makeshlibs -a $(IBASE) -V
 	dh_installdeb -a $(IBASE)
 	dh_perl -a $(IBASE)
-	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3c102/usr/lib:`pwd`/debian/libqt3c102-mt/usr/lib
+	dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3/usr/lib:`pwd`/debian/libqt3-mt/usr/lib
        
 	# fix shlibdeps madness
 	for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done

More information about the Pkg-kde-commits mailing list