Lubuntu/qterminal-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'debian/experimental' into debian/sid

Browse Source
This commit is contained in:
Alf Gaida 2017-12-05 17:31:40 +01:00
commit 25b040b6c4
7 changed files with 68 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
debian/changelog vendored
View File

@ -1,3 +1,22 @@
qterminal (0.8.0-2) experimental; urgency=medium
* Patched appdata and metainfo-path again
-- Alf Gaida <agaida@siduction.org> Sun, 05 Nov 2017 03:00:28 +0100
qterminal (0.8.0-1) experimental; urgency=medium
* Cherry-picking upstream version 0.8.0.
* Switched to experimental
* Bumped Standards to 4.1.1
* Bumped libqtermwidget5-0-dev to >= 0.8.0
* Added dependency libutf8proc-dev
* Bumped lxqt-build-tools to >= 0.4.0
* Fixed copyright
* Dropped appdata-patch, applied upstream
-- Alf Gaida <agaida@siduction.org> Mon, 23 Oct 2017 01:47:22 +0200
qterminal (0.7.1-3) unstable; urgency=medium
* Bumped Standards to 4.1.0 - no changes needed

11
debian/control vendored
View File

@ -7,15 +7,16 @@ Section: x11
Priority: optional
Build-Depends: debhelper (>= 10),
libkf5windowsystem-dev,
libqtermwidget5-0-dev,
libqtermwidget5-0-dev (>= 0.8.0),
libqt5svg5-dev,
libqt5x11extras5-dev,
libutf8proc-dev,
libx11-dev,
lxqt-build-tools,
lxqt-build-tools (>= 0.4.0),
qtbase5-private-dev
Standards-Version: 4.1.0
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/qterminal.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/qterminal.git -b debian/sid
Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/qterminal.git/?h=debian/experimental
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/qterminal.git -b debian/experimental
Homepage: https://github.com/lxde/qterminal
Package: qterminal

1
debian/copyright vendored
View File

@ -4,6 +4,7 @@ Source: https://github.com/lxde/qterminal.git
Files: *
Copyright: 2010-2016 Petr Vanek <petr@scribus.info>
2016-2017 LXQt Team
License: GPL-2+
Files: src/config.h

2
debian/gbp.conf vendored
View File

@ -1,5 +1,5 @@
[DEFAULT]
debian-branch = debian/sid
debian-branch = debian/experimental
upstream-branch = upstream/latest
pristine-tar = True

40
debian/patches/appdata-metainfo.patch vendored Normal file
View File

@ -0,0 +1,40 @@
Description: Fixed appdata and path
* should be pushed to upstream soon
Author: Alf Gaida <agaida@siduction.org>
Last-Update: 2017-11-05
--- qterminal-0.8.0.orig/CMakeLists.txt
+++ qterminal-0.8.0/CMakeLists.txt
@@ -205,7 +205,7 @@ install(FILES
install(FILES
qterminal.appdata.xml
- DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
)
if(NOT APPLEBUNDLE)
--- qterminal-0.8.0.orig/qterminal.appdata.xml
+++ qterminal-0.8.0/qterminal.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">qterminal.desktop</id>
+<component type="desktop">
+ <id>qterminal.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2</project_license>
<name>QTerminal</name>
@@ -39,5 +39,10 @@
<caption>Find bar and highlighted match.</caption>
</screenshot>
</screenshots>
+
+ <developer_name>LXQt Team</developer_name>
<url type="homepage">https://github.com/lxde/qterminal</url>
-</application>
+ <url type="bugtracker">https://github.com/qterminal/issues</url>
+ <url type="help">https://github.com/lxde/lxqt/wiki</url>
+ <url type="translate">http://github.com/lxde/lxqt-l10n</url>
+</component>

31
debian/patches/fix-appdata-format.patch vendored
View File

@ -1,31 +0,0 @@
Description: Fixes appdata format
* application -> component
Author: Alf Gaida <agaida@siduction.org>
Last-Update: 2017-08-13
--- a/qterminal.appdata.xml
+++ b/qterminal.appdata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application>
+<component>
<id type="desktop">qterminal.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2</project_license>
@@ -40,4 +40,4 @@
</screenshot>
</screenshots>
<url type="homepage">https://github.com/lxde/qterminal</url>
-</application>
+</component>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,7 @@
install(FILES
qterminal.appdata.xml
- DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
)
if(NOT APPLEBUNDLE)

2
debian/patches/series vendored
View File

@ -1 +1 @@
fix-appdata-format.patch
appdata-metainfo.patch