From 53ecca0580ed299072837751898a68ead92288c2 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 14 Feb 2015 18:15:11 +0100 Subject: [PATCH] new release fixed debian $foo drop patches add source options --- .gitignore | 1 + debian/changelog | 14 +------------ debian/control | 27 +++++++++++++++++-------- debian/copyright | 4 ++-- debian/lintian-overrides | 2 +- debian/patches/lxqt-about.desktop.patch | 18 ----------------- debian/patches/series | 1 - debian/rules | 2 -- debian/source/options | 2 ++ 9 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 debian/patches/lxqt-about.desktop.patch delete mode 100644 debian/patches/series create mode 100644 debian/source/options diff --git a/.gitignore b/.gitignore index dd73316..c7de544 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ lxqt-panel/panel/lxqt-panel CMakeLists.txt.user* /build nbproject/ +/test diff --git a/debian/changelog b/debian/changelog index e2a305d..93d1199 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,4 @@ -lxqt-about (0.8.0-1) unstable; urgency=medium - - * Imported Upstream version 0.8.0 - * Min Qt version 5.3.2 - * Minliblxqt-qt5-0-dev version 0.8.0 - * bump standards to 3.9.6 - * patch desktop file with registered categories - * override warning about missed man-page, as lxqt-about will never have - a manpage - - -- Alf Gaida Fri, 17 Oct 2014 23:09:28 +0200 - -lxqt-about (0.7.96-1) unstable; urgency=medium +lxqt-about (0.9.0-1) experimental; urgency=low * Initial release (Closes: #747600, #765768) diff --git a/debian/control b/debian/control index 374b9ed..2a44512 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,16 @@ Source: lxqt-about Section: x11 Priority: optional -Maintainer: Alf Gaida +Maintainer: Debian LXQt Maintainers +Uploaders: + Alf Gaida Build-Depends: - cmake, + cmake (>= 3.0.2), debhelper (>= 9), libx11-dev, pkg-config, - liblxqt-qt5-0-dev (>= 0.8.0), + libkf5windowsystem-dev (>= 5.5.0), + liblxqt0-dev (>= 0.9.0), libqt5x11extras5-dev (>= 5.3.2), libqt5xdg-dev (>= 1.0.0), qttools5-dev (>= 5.3.2), @@ -17,12 +20,10 @@ Homepage: https://github.com/lxde/lxqt-about #Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-about.git #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-about.git;a=summary -Package: lxqt-about-qt5 +Package: lxqt-about Architecture: any -Breaks: - lxqt-about, -Replaces: - lxqt-about, +Breaks: lxqt-about-qt5 (<< 0.9.0) +Replaces: lxqt-about-qt5 (<< 0.9.0) Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -30,3 +31,13 @@ Description: About screen for LXQt The about screen for LXQt . This package contain the LXQt about screen. + +# ---- to be removed in 2016 ---- + +Package: lxqt-about-qt5 +Depends: lxqt-about, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-about transitional package + Empty package to facilitate upgrades, can be safely removed. diff --git a/debian/copyright b/debian/copyright index d3fa780..5cd1f96 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,13 +3,13 @@ Upstream-Name: lxqt-about Source: https://github.com/lxde/lxqt-about Files: * -Copyright: 2012-2014 LXQt team +Copyright: 2012-2015 LXQt team 2010-2012 Razor team 2010-2014 Petr Vanek License: GPL-2.0+ and LGPL-2.1+ Files: debian/* -Copyright: 2014 Alf Gaida +Copyright: 2014-2015 Alf Gaida License: LGPL-2.1+ License: GPL-2.0+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 2297a72..4f13f90 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,2 +1,2 @@ # lxqt-about will never have a man-page -lxqt-about-qt5: binary-without-manpage usr/bin/lxqt-about +lxqt-about: binary-without-manpage usr/bin/lxqt-about diff --git a/debian/patches/lxqt-about.desktop.patch b/debian/patches/lxqt-about.desktop.patch deleted file mode 100644 index 6c271a6..0000000 --- a/debian/patches/lxqt-about.desktop.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Categories and OnlyShowIn fixed -Author: Alf Gaida - ---- -Last-Update: 2014-10-17 - ---- lxqt-about-0.8.0.orig/resources/lxqt-about.desktop.in -+++ lxqt-about-0.8.0/resources/lxqt-about.desktop.in -@@ -5,7 +5,7 @@ GenericName=About LXQt - Comment=Learn more about LXQt - Exec=lxqt-about - Icon=help-about --Categories=Help;LXQt --OnlyShowIn=LXQt;LXDE; -+Categories=Settings;Documentation;Qt; -+OnlyShowIn=LXQt; - - #TRANSLATIONS_DIR=translations diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1d2ea63..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -lxqt-about.desktop.patch diff --git a/debian/rules b/debian/rules index 450e50d..8aef4ba 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 -export USE_QT5=1 %: diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..be5dabe --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +tar-ignore=.gitignore +