[med-svn] [libquazip] 01/01: Remove deactivated patches
Andreas Tille
tille at debian.org
Mon Jan 4 07:53:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libquazip.
commit b81e2f3b1ac69d2e892f53d5bb23c4fb8a3dafba
Author: Andreas Tille <tille at debian.org>
Date: Mon Jan 4 08:53:10 2016 +0100
Remove deactivated patches
---
debian/changelog | 1 +
debian/patches/change_suffix.patch | 35 -----------------------------
debian/patches/multiarch_version.patch | 19 ----------------
debian/patches/no-test-build.patch | 15 -------------
debian/patches/quazip-qt5-target-name.patch | 20 -----------------
debian/patches/qztest-link-to-qt5.patch | 23 -------------------
debian/patches/series | 6 -----
7 files changed, 1 insertion(+), 118 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1fb99a1..2c9b67a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libquazip (0.7.1-1) UNRELEASED; urgency=medium
* do not Build-Depend from metapackage qt5-default
* DEP5 fixes
* Move packaging to Git
+ * Remove deactivated patches
[Stefan Ahlers]
* Using CMake instead of qmake
diff --git a/debian/patches/change_suffix.patch b/debian/patches/change_suffix.patch
deleted file mode 100644
index e36e7bb..0000000
--- a/debian/patches/change_suffix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Fri, 01 Jan 2016 23:40:15 +0100
-Bug-Debian: https://bugs.debian.org/805087
-Description: Enable changing suffix
- Patch was obtained from upstream SVN
- http://sourceforge.net/p/quazip/code/257/
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,4 +51,4 @@ set(LIB_DESTINATION "${CMAKE_INSTALL_PRE
-
- add_subdirectory(quazip)
-
--install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules)
-+install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules)
---- a/FindQuaZip.cmake
-+++ b/FindQuaZip.cmake
-@@ -30,7 +30,7 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB
- )
- FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
- HINTS /usr/include /usr/local/include
-- PATH_SUFFIXES quazip
-+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
- )
- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
- ENDIF (WIN32)
---- a/quazip/CMakeLists.txt
-+++ b/quazip/CMakeLists.txt
-@@ -19,5 +19,5 @@ set_target_properties(quazip PROPERTIES
- # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
- target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES})
-
--install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip)
-+install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
- install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
diff --git a/debian/patches/multiarch_version.patch b/debian/patches/multiarch_version.patch
deleted file mode 100644
index 3def910..0000000
--- a/debian/patches/multiarch_version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Eric Maeker <eric.maeker at gmail.com>
-Description: Correctly define manages lib path (for multi-arch config)
- libquazip does not manage Debian compatible multi-arch path.
-Last-Update: 2014-06-12
-Forwarded: yes
-
-Index: quazip-0.6.2/quazip/quazip.pro
-===================================================================
---- quazip-0.6.2.orig/quazip/quazip.pro 2014-06-12 15:01:20.787420838 +0000
-+++ quazip-0.6.2/quazip/quazip.pro 2014-06-12 15:01:35.635420696 +0000
-@@ -12,7 +12,7 @@
- unix:!symbian {
- headers.path=$$PREFIX/include/quazip
- headers.files=$$HEADERS
-- target.path=$$PREFIX/lib
-+ target.path=$$PREFIX/lib/$${LIB_ARCH}
- INSTALLS += headers target
-
- OBJECTS_DIR=.obj
diff --git a/debian/patches/no-test-build.patch b/debian/patches/no-test-build.patch
deleted file mode 100755
index a456166..0000000
--- a/debian/patches/no-test-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Eric Maeker <eric.maeker at gmail.com>
-Description: Do not build testing apps
- libquazip comes with unit-tests we do not need in the package.
-Last-Update: 2014-06-12
-Forwarded: no
-
-Index: quazip-0.6.2/qztest/qztest.pro
-===================================================================
---- quazip-0.6.2.orig/qztest/qztest.pro 2014-07-16 02:01:40.851420646 +0000
-+++ quazip-0.6.2/qztest/qztest.pro 2014-07-16 02:01:40.847420646 +0000
-@@ -1,3 +1,3 @@
- TEMPLATE=subdirs
--SUBDIRS=quazip qztest
-+SUBDIRS=quazip #qztest
- qztest.depends = quazip
diff --git a/debian/patches/quazip-qt5-target-name.patch b/debian/patches/quazip-qt5-target-name.patch
deleted file mode 100644
index 549a793..0000000
--- a/debian/patches/quazip-qt5-target-name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Eric Maeker <eric.maeker at gmail.com>
-Description: Correctly define lib name
- libquazip does not manage -qt5 in target.
-Last-Update: 2014-07-16
-Forwarded: no
-
---- a/quazip/quazip.pro
-+++ b/quazip/quazip.pro
-@@ -34,6 +34,11 @@ CONFIG(staticlib): DEFINES += QUAZIP_STA
- include(quazip.pri)
-
- unix:!symbian {
-+ isEqual(QT_MAJOR_VERSION, 5){
-+ TARGET=quazip-qt5
-+ }else{
-+ TARGET=quazip
-+ }
- headers.path=$$PREFIX/include/quazip
- headers.files=$$HEADERS
- target.path=$$PREFIX/lib/$${LIB_ARCH}
diff --git a/debian/patches/qztest-link-to-qt5.patch b/debian/patches/qztest-link-to-qt5.patch
deleted file mode 100644
index 8ca47cb..0000000
--- a/debian/patches/qztest-link-to-qt5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Eric Maeker <eric.maeker at gmail.com>
-Description: Correctly define lib name
- libquazip does not manage -qt5 in target.
-Last-Update: 2014-07-16
-Forwarded: yes
-
---- a/qztest/qztest.pro
-+++ b/qztest/qztest.pro
-@@ -40,7 +40,13 @@ MOC_DIR = .moc
-
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazip
--else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip
-+else:unix{
-+ isEqual(QT_MAJOR_VERSION, 5){
-+ LIBS += -L$$OUT_PWD/../quazip/ -lquazip-qt5
-+ }else{
-+ LIBS += -L$$OUT_PWD/../quazip/ -lquazip
-+ }
-+}
-
- INCLUDEPATH += $$PWD/..
- DEPENDPATH += $$PWD/../quazip
diff --git a/debian/patches/series b/debian/patches/series
index d293241..fa85aa5 100755
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
-#no-test-build.patch
-#qztest-link-to-qt5.patch
-#multiarch_version.patch
-#quazip-qt5-target-name.patch
logo-breach.patch
-
-#change_suffix.patch
cmake-fix.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libquazip.git
More information about the debian-med-commit
mailing list