[med-svn] r17664 - trunk/packages/libquazip/trunk/debian

Eric Maeker ericmaeker-guest at moszumanska.debian.org
Sat Aug 9 18:19:18 UTC 2014


Author: ericmaeker-guest
Date: 2014-08-09 18:19:18 +0000 (Sat, 09 Aug 2014)
New Revision: 17664

Added:
   trunk/packages/libquazip/trunk/debian/libquazip-dev.install
   trunk/packages/libquazip/trunk/debian/libquazip-qt5-dev.install
Removed:
   trunk/packages/libquazip/trunk/debian/libquazip-qt5-1-dev.install
   trunk/packages/libquazip/trunk/debian/libquazip1-dev.install
Modified:
   trunk/packages/libquazip/trunk/debian/changelog
   trunk/packages/libquazip/trunk/debian/control
   trunk/packages/libquazip/trunk/debian/rules
Log:
libquazip: renaming libquazip{-qt5-}1-dev to libquazip{-qt5}-dev

Modified: trunk/packages/libquazip/trunk/debian/changelog
===================================================================
--- trunk/packages/libquazip/trunk/debian/changelog	2014-08-08 16:46:08 UTC (rev 17663)
+++ trunk/packages/libquazip/trunk/debian/changelog	2014-08-09 18:19:18 UTC (rev 17664)
@@ -3,9 +3,12 @@
   [ Eric Maeker ]
   * New upstream
   * debian/patches:
-    - Removed multiarch patch as it is now integrated in upstream
+    - Removed multiarch patch as it is now merged in upstream
+  * debian/control;debian/rules
+    - renaming package libquazip1-dev to libquazip-dev
+    - renaming package libquazip-qt5-1-dev to libquazip-qt5-dev
 
- -- Eric Maeker <eric.maeker at gmail.com>  Fri, 25 Jul 2014 11:26:37 +0200
+ -- Eric Maeker <eric.maeker at gmail.com>  Sat, 09 Aug 2014 19:18:16 +0200
 
 libquazip (0.6.2-2) unstable; urgency=low
 

Modified: trunk/packages/libquazip/trunk/debian/control
===================================================================
--- trunk/packages/libquazip/trunk/debian/control	2014-08-08 16:46:08 UTC (rev 17663)
+++ trunk/packages/libquazip/trunk/debian/control	2014-08-09 18:19:18 UTC (rev 17664)
@@ -39,10 +39,9 @@
  .
  QuaZIP is by default built using Qt4 libraries.
 
-Package: libquazip1-dev
-Replaces: libquazip0-dev
-Conflicts: libquazip0-dev, libquazip-dev
-Provides: libquazip-dev
+Package: libquazip-dev
+Replaces: libquazip0-dev, libquazip1-dev
+Conflicts: libquazip0-dev, libquazip1-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
@@ -65,9 +64,9 @@
  .
  QuaZIP is by default built using Qt4 libraries.
 
-Package: libquazip1-dbg
-Replaces: libquazip0-dbg
-Conflicts: libquazip0-dbg
+Package: libquazip-dbg
+Replaces: libquazip0-dbg, libquazip1-dbg
+Conflicts: libquazip0-dbg, libquazip1-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
@@ -109,7 +108,9 @@
  .
  QuaZIP built using Qt5 libraries.
 
-Package: libquazip-qt5-1-dev
+Package: libquazip-qt5-dev
+Replaces: libquazip-qt5-1-dev
+Conflicts: libquazip-qt5-1-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
@@ -117,7 +118,6 @@
          libquazip1-headers (= ${binary:Version}),
          ${misc:Depends},
          zlib1g-dev
-Conflicts: libquazip0-dev
 Description: C++ wrapper wrapper for ZIP/UNZIP (development files, Qt5 build)
  QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
  can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
@@ -133,7 +133,9 @@
  .
  QuaZIP built using Qt5 libraries.
 
-Package: libquazip-qt5-1-dbg
+Package: libquazip-qt5-dbg
+Replaces: libquazip-qt5-1-dbg
+Conflicts: libquazip-qt5-1-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug

Copied: trunk/packages/libquazip/trunk/debian/libquazip-dev.install (from rev 17663, trunk/packages/libquazip/trunk/debian/libquazip1-dev.install)
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip-dev.install	                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip-dev.install	2014-08-09 18:19:18 UTC (rev 17664)
@@ -0,0 +1,3 @@
+usr/lib/*/libquazip.so
+usr/lib/*/libquazip.a
+

Deleted: trunk/packages/libquazip/trunk/debian/libquazip-qt5-1-dev.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip-qt5-1-dev.install	2014-08-08 16:46:08 UTC (rev 17663)
+++ trunk/packages/libquazip/trunk/debian/libquazip-qt5-1-dev.install	2014-08-09 18:19:18 UTC (rev 17664)
@@ -1,2 +0,0 @@
-usr/lib/*/libquazip-qt5.so
-usr/lib/*/libquazip-qt5.a

Copied: trunk/packages/libquazip/trunk/debian/libquazip-qt5-dev.install (from rev 17663, trunk/packages/libquazip/trunk/debian/libquazip-qt5-1-dev.install)
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip-qt5-dev.install	                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip-qt5-dev.install	2014-08-09 18:19:18 UTC (rev 17664)
@@ -0,0 +1,2 @@
+usr/lib/*/libquazip-qt5.so
+usr/lib/*/libquazip-qt5.a

Deleted: trunk/packages/libquazip/trunk/debian/libquazip1-dev.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-dev.install	2014-08-08 16:46:08 UTC (rev 17663)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-dev.install	2014-08-09 18:19:18 UTC (rev 17664)
@@ -1,3 +0,0 @@
-usr/lib/*/libquazip.so
-usr/lib/*/libquazip.a
-

Modified: trunk/packages/libquazip/trunk/debian/rules
===================================================================
--- trunk/packages/libquazip/trunk/debian/rules	2014-08-08 16:46:08 UTC (rev 17663)
+++ trunk/packages/libquazip/trunk/debian/rules	2014-08-09 18:19:18 UTC (rev 17664)
@@ -85,25 +85,25 @@
 	
 	# Install Qt4 packages
 	dh_auto_install -B$(QT4_SO_PATH) -plibquazip1
-	dh_auto_install -B$(QT4_SO_PATH) -plibquazip1-dev
+	dh_auto_install -B$(QT4_SO_PATH) -plibquazip-dev
 
 	# Install Qt5 packages
 	dh_auto_install -B$(QT5_SO_PATH) -plibquazip-qt5-1
-	dh_auto_install -B$(QT5_SO_PATH) -plibquazip-qt5-1-dev
+	dh_auto_install -B$(QT5_SO_PATH) -plibquazip-qt5-dev
 
 override_dh_installchangelogs:
 	dh_installchangelogs -plibquazip1 NEWS upstream
 	dh_installchangelogs -plibquazip1-dev NEWS upstream
-	#dh_installchangelogs -plibquazip1-dbg NEWS upstream
+	#dh_installchangelogs -plibquazip-dbg NEWS upstream
 	dh_installchangelogs -plibquazip-qt5-1 NEWS upstream
-	dh_installchangelogs -plibquazip-qt5-1-dev NEWS upstream
-	#dh_installchangelogs -plibquazip-qt5-1-dbg NEWS upstream
+	dh_installchangelogs -plibquazip-qt5-dev NEWS upstream
+	#dh_installchangelogs -plibquazip-qt5-dbg NEWS upstream
 	#dh_installchangelogs -plibquazip1-headers NEWS upstream
 	dh_installchangelogs
 
 override_dh_strip:
-	dh_strip -plibquazip1 --dbg-package=libquazip1-dbg
-	dh_strip -plibquazip-qt5-1 --dbg-package=libquazip-qt5-1-dbg
+	dh_strip -plibquazip1 --dbg-package=libquazip-dbg
+	dh_strip -plibquazip-qt5-1 --dbg-package=libquazip-qt5-dbg
 
 override_dh_install:
 	dh_install --list-missing




More information about the debian-med-commit mailing list