From f2440efe2af8e8958117bd59e61b974baae654eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= Date: Tue, 2 Sep 2014 14:27:35 +0800 Subject: [PATCH] Merge debian directory --- debian/changelog | 4 ++-- debian/control | 29 +++++++++++++++++++++++++---- debian/copyright | 18 +++++++++++++++++- debian/gbp.conf | 2 ++ debian/patches/cxxflags.patch | 14 ++++++++++++++ debian/patches/series | 1 + debian/pcmanfm-qt.install | 4 ++++ debian/rules | 29 ++++------------------------- debian/watch | 2 ++ 9 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 debian/gbp.conf create mode 100644 debian/patches/cxxflags.patch create mode 100644 debian/patches/series create mode 100644 debian/pcmanfm-qt.install create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index c744725..1af0ba8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -pcmanfm-qt (0.7.0-1) unstable; urgency=low +pcmanfm-qt (0.8.0-1) unstable; urgency=low - * Initial release (Closes: #nnnn) # No ITP #yet. To be assigned + * Initial release (Closes: #747605) -- Wen Liao Sun, 13 Jul 2014 14:18:59 +0800 diff --git a/debian/control b/debian/control index ae1a7de..34ddd7d 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,36 @@ Source: pcmanfm-qt Section: x11 Priority: optional Maintainer: Wen Liao -Build-Depends: debhelper (>= 9), cmake (>= 2.8.3), libqt4-dev (>= 4.6), - pkg-config, libfm-dev (>= 1.2.0), libx11-dev, libglib2.0-dev, libmenu-cache-dev +Build-Depends: + debhelper (>= 9), + cmake (>= 2.8.3), + libqt4-dev (>= 4.6), + pkg-config, + libfm-dev (>= 1.2.0), + libx11-dev, + libglib2.0-dev, + libmenu-cache-dev Standards-Version: 3.9.5 Homepage: https://github.com/lxde/pcmanfm-qt -Vcs-Git: https://github.com/lxde/pcmanfm-qt.git +Vcs-Git: git://github.com/lxde/pcmanfm-qt.git Vcs-Browser: https://github.com/lxde/pcmanfm-qt Package: pcmanfm-qt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: foreign +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Description: Qt port of the LXDE file manager PCManFM + Qt port of the LXDE file manager PCManFM. + +Package: pcmanfm-qt-dbg +Section: debug +Priority: extra +Multi-Arch: same +Architecture: any +Depends: + pcmanfm-qt (= ${binary:Version}), + ${misc:Depends} Description: Qt port of the LXDE file manager PCManFM Qt port of the LXDE file manager PCManFM. diff --git a/debian/copyright b/debian/copyright index 0fe4947..78a18d2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,10 +5,26 @@ Source: https://github.com/lxde/pcmanfm-qt Files: * Copyright: LXQt team: http://lxqt.org Hong Jen Yee (PCMan) -License: GPL-2 +License: LGPL-2.1+ Files: debian/* Copyright: 2014 Wen Liao +License: GPL-2+ + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + On Debian system, the complete text of GNU Lesser General Public License can + be found in "/usr/share/common-licenses/LGPL-2.1". + License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/patches/cxxflags.patch b/debian/patches/cxxflags.patch new file mode 100644 index 0000000..d8e9f3c --- /dev/null +++ b/debian/patches/cxxflags.patch @@ -0,0 +1,14 @@ +Description: Keep CMAKE_CXX_FLAGS value +--- +Forwarded: https://github.com/lxde/pcmanfm-qt/pull/92 +--- pcmanfm-qt-0.7.0.orig/CMakeLists.txt ++++ pcmanfm-qt-0.7.0/CMakeLists.txt +@@ -45,7 +45,7 @@ add_definitions( + + if (CMAKE_COMPILER_IS_GNUCXX) + # set visibility to hidden to hide symbols, unlesss they're exporeted manually in the code +- set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions") ++ set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions ${CMAKE_CXX_FLAGS}") + endif() + + # Eanble CMake auto-moc support for Qt diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a21784c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +cxxflags.patch diff --git a/debian/pcmanfm-qt.install b/debian/pcmanfm-qt.install new file mode 100644 index 0000000..cada254 --- /dev/null +++ b/debian/pcmanfm-qt.install @@ -0,0 +1,4 @@ +usr/bin/* +usr/include/* +usr/lib/* +usr/share/* diff --git a/debian/rules b/debian/rules index ce15cce..1f0cd8c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,32 +1,11 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#DH_VERBOSE = 1 - -# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +#DH_VERBOSE = 1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -# main packaging script based on dh7 syntax %: dh $@ -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- \ -# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - - - - +override_dh_strip: + dh_strip --dbg-package=pcmanfm-qt-dbg diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..84e9c40 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://github.com/lxde/pcmanfm-qt/releases .*/([\d\.]+).tar.gz