Andreas Tille pushed to branch master at Debian Med / libquazip

Commits:
141ce644 by Andreas Tille at 2018-07-01T20:25:16+02:00
Switch to d-shlibs

- - - - -


6 changed files:

- debian/control
- − debian/libquazip-dev.install
- − debian/libquazip1.install
- − debian/libquazip5-1.install
- − debian/libquazip5-dev.install
- debian/rules


Changes:

=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Eric Maeker <[email protected]>,
 Section: libs
 Priority: optional
 Build-Depends: debhelper (>= 11~),
+               d-shlibs,
                libqt4-dev,
                cmake,
                qtbase5-dev,
@@ -22,6 +23,7 @@ Homepage: https://github.com/stachenov/quazip
 Package: libquazip1
 Architecture: any
 Multi-Arch: same
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: libquazip-doc
@@ -71,6 +73,7 @@ Description: C++ wrapper for ZIP/UNZIP (development files, 
Qt4 build)
 Package: libquazip5-1
 Architecture: any
 Multi-Arch: same
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: libquazip-doc


=====================================
debian/libquazip-dev.install deleted
=====================================
--- a/debian/libquazip-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libquazip.so
-usr/lib/*/libquazip.a
-usr/share/cmake-*/Modules/FindQuaZip.cmake usr/share/quazip/


=====================================
debian/libquazip1.install deleted
=====================================
--- a/debian/libquazip1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libquazip.so.*


=====================================
debian/libquazip5-1.install deleted
=====================================
--- a/debian/libquazip5-1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libquazip5.so.*


=====================================
debian/libquazip5-dev.install deleted
=====================================
--- a/debian/libquazip5-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libquazip5.so
-usr/lib/*/libquazip5.a
-usr/share/cmake-*/Modules/FindQuaZip5.cmake /usr/share/quazip


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -52,11 +52,23 @@ override_dh_auto_clean:
        rm -Rf NEWS
 
 override_dh_auto_install:
-       # Install Qt4 packages
-       dh_auto_install -B$(QT4_PATH)
-
+       dh_auto_install  -B$(QT4_PATH)
+       dh_auto_install  -B$(QT5_PATH)
        # Install Qt5 packages
-       dh_auto_install -B$(QT5_PATH)
+       d-shlibmove --commit \
+                   --multiarch \
+                   --devunversioned \
+                   --exclude-la \
+                   --movedev 
debian/tmp/usr/share/cmake*/Modules/FindQuaZip5.cmake usr/share/quazip/ \
+                   debian/tmp/usr/lib/*/libquazip5.so
+       # Install Qt4 packages
+       cp -a FindQuaZip.cmake /tmp
+       d-shlibmove --commit \
+                   --multiarch \
+                   --devunversioned \
+                   --exclude-la \
+                   --movedev 
debian/tmp/usr/share/cmake*/Modules/FindQuaZip.cmake usr/share/quazip/ \
+                    debian/tmp/usr/lib/*/libquazip.so
 
 override_dh_installchangelogs:
        dh_installchangelogs -k NEWS



View it on GitLab: 
https://salsa.debian.org/med-team/libquazip/commit/141ce6446ee0ebb041db4ac27dcf73eb2be47c60

-- 
View it on GitLab: 
https://salsa.debian.org/med-team/libquazip/commit/141ce6446ee0ebb041db4ac27dcf73eb2be47c60
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to