diff --git a/build.sh b/build.sh deleted file mode 100755 index 753ec99491325c7495b18bf35135a677f4c24758..0000000000000000000000000000000000000000 --- a/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -cd `dirname $0` - -# 编译 -echo "开始编译" -mkdir -p build -qmake src/one-tomato.pro -spec linux-g++ CONFIG+=qtquickcompiler -o build/ -cd build/ -make -j8 -cd .. -echo "编译完成" -echo "-------------------" -echo "更新翻译" -lrelease ./translations/*.ts - -#打包 -echo "构建软件包" -mv build/one-tomato dabao/extract/opt/apps/top.yzzi.tomato/files/ -cp translations/*.qm dabao/extract/opt/apps/top.yzzi.tomato/files/translations/ -rm -rf build -sh dabao/dabao.sh -mkdir -p outdeb -mv dabao/build/* outdeb/ -rm -rf dabao/build diff --git a/dabao/dabao.sh b/dabao/dabao.sh deleted file mode 100644 index a45e928bd0503e58b47d280d2a060f2054202dfb..0000000000000000000000000000000000000000 --- a/dabao/dabao.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -cd `dirname $0` -mkdir -p build -find extract/opt -type f -print0 |xargs -0 md5sum >md5sums -mv md5sums extract/DEBIAN/md5sums -dpkg-deb -b extract/ build/ diff --git a/dabao/extract/DEBIAN/control b/dabao/extract/DEBIAN/control deleted file mode 100644 index 6255b191000598c613e0cba3c9e3b68cf4444378..0000000000000000000000000000000000000000 --- a/dabao/extract/DEBIAN/control +++ /dev/null @@ -1,12 +0,0 @@ -Package: top.yzzi.tomato -Version: 1.0.5 -Architecture: amd64 -Maintainer: 一只科技菌 -Installed-Size: 56 -Depends: -Section: unknown -Priority: extra -Homepage: https://blog.yzzi.top -Description: - 可爱的番茄钟 - 主页: https://blog.yzzi.top diff --git a/dabao/extract/DEBIAN/md5sums b/dabao/extract/DEBIAN/md5sums deleted file mode 100644 index 189217c9fd1714e3d99d8ce73e987c445d58b697..0000000000000000000000000000000000000000 --- a/dabao/extract/DEBIAN/md5sums +++ /dev/null @@ -1,6 +0,0 @@ -8613dffe6811441b459c27bfa2c2f419 extract/opt/apps/top.yzzi.tomato/entries/applications/top.yzzi.tomato.desktop -7166285b603c0b163e07be5586ea9719 extract/opt/apps/top.yzzi.tomato/entries/icons/hicolor/512x512/apps/OneTomato.png -8b73954c58e1df8437e2560007e364c6 extract/opt/apps/top.yzzi.tomato/entries/icons/top.yzzi.tomato.svg -f934fbed78deabb016fcf70281dae5a8 extract/opt/apps/top.yzzi.tomato/files/one-tomato -675f855ab7d19dc673dd2d6d144d1164 extract/opt/apps/top.yzzi.tomato/files/translations/one-tomato_zh_CN.qm -6aa9cf85416a636ed9175602c5f99272 extract/opt/apps/top.yzzi.tomato/info diff --git a/dabao/extract/opt/apps/top.yzzi.tomato/entries/applications/top.yzzi.tomato.desktop b/dabao/extract/opt/apps/top.yzzi.tomato/entries/applications/top.yzzi.tomato.desktop deleted file mode 100644 index 4aeb8bd47f9121d4bb6d9d04369bb311b7bf30fb..0000000000000000000000000000000000000000 --- a/dabao/extract/opt/apps/top.yzzi.tomato/entries/applications/top.yzzi.tomato.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Categories=Office; -Comment=OneTomato -Comment[zh_CN]=一只番茄 -Comment[zh_TW]=壹只柑仔蜜 -Exec=/opt/apps/top.yzzi.tomato/files/one-tomato -Icon=top.yzzi.tomato -Name=OneTomato -Name[zh_CN]=一只番茄 -Name[zh_TW]=壹只柑仔蜜 -StartupNotify=true -StartupWMClass=OneCuteR -Terminal=false -Type=Application -Version=1.0.4 -X-Deepin-Vendor=user-custom diff --git a/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/hicolor/512x512/apps/OneTomato.png b/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/hicolor/512x512/apps/OneTomato.png deleted file mode 100644 index 4f2a7b4be56479f73514665f7b2b4fc5e3341e0e..0000000000000000000000000000000000000000 Binary files a/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/hicolor/512x512/apps/OneTomato.png and /dev/null differ diff --git a/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/top.yzzi.tomato.svg b/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/top.yzzi.tomato.svg deleted file mode 100644 index 59e36597023a50ae647b37a34e1af3a100d7fc99..0000000000000000000000000000000000000000 --- a/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/top.yzzi.tomato.svg +++ /dev/null @@ -1,445 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dabao/extract/opt/apps/top.yzzi.tomato/files/one-tomato b/dabao/extract/opt/apps/top.yzzi.tomato/files/one-tomato deleted file mode 100755 index 16f3e87a97d08acb7d653310dac97e50b8591d56..0000000000000000000000000000000000000000 Binary files a/dabao/extract/opt/apps/top.yzzi.tomato/files/one-tomato and /dev/null differ diff --git a/dabao/extract/opt/apps/top.yzzi.tomato/files/translations/one-tomato_zh_CN.qm b/dabao/extract/opt/apps/top.yzzi.tomato/files/translations/one-tomato_zh_CN.qm deleted file mode 100644 index fac77d498792bae56d03ab330ae5086dd1a9a53d..0000000000000000000000000000000000000000 Binary files a/dabao/extract/opt/apps/top.yzzi.tomato/files/translations/one-tomato_zh_CN.qm and /dev/null differ diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000000000000000000000000000000000000..e5085304da5c6148d4bfd5150d881a239d0fffe0 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +com.gitee.deepin-opensource.one-tomato (1.0.0-1) unstable; urgency=medium + + * repackage scripts fix. + + -- ”daya” <”zhaozhen@uniontech.com”> Wed, 19 Aug 2020 23:08:35 +0800 diff --git a/debian/com.gitee.deepin-opensource.one-tomato.desktop b/debian/com.gitee.deepin-opensource.one-tomato.desktop new file mode 100644 index 0000000000000000000000000000000000000000..9a66eef6a43cac215047635ff56b5442486dc55e --- /dev/null +++ b/debian/com.gitee.deepin-opensource.one-tomato.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Categories=Audio;AudioVideo;Qt; +Comment=Play your music collection +Exec=/opt/apps/com.gitee.deepin-opensource.one-tomato/files/one-tomato +Icon=com.gitee.deepin-opensource.one-tomato +Name=番茄钟 +Type=Application diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000000000000000000000000000000000000..b4de3947675361a7770d29b8982c407b0ec6b2a0 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000000000000000000000000000000000000..c61898c6bb52a59c636db7cb794632aa12c68b82 --- /dev/null +++ b/debian/control @@ -0,0 +1,14 @@ +Source: com.gitee.deepin-opensource.one-tomato +Section: utils +Priority: optional +Maintainer: ”daya” <”zhaozhen@uniontech.com”> +Build-Depends: debhelper (>= 11), qt5-qmake, qttools5-dev-tools, libdtkwidget-dev +Standards-Version: 4.1.3 +Homepage: https://gitee.com/deepin-opensource/one-tomato +#Vcs-Browser: https://salsa.debian.org/debian/org.gitee.deepin-opensource.one-tomato +#Vcs-Git: https://salsa.debian.org/debian/org.gitee.deepin-opensource.one-tomato.git + +Package: com.gitee.deepin-opensource.one-tomato +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: 番茄管理法小闹钟 diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000000000000000000000000000000000000..9b63422a809f5efa2314d9b0deb7b260eb2407b6 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: org.gitee.deepin-opensource.one-tomato +Source: + +Files: * +Copyright: + +License: + + + . + + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2020 ”daya” <”zhaozhen@uniontech.com”> +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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid picking licenses with terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/dabao/extract/opt/apps/top.yzzi.tomato/info b/debian/one-tomato.info similarity index 66% rename from dabao/extract/opt/apps/top.yzzi.tomato/info rename to debian/one-tomato.info index 8a8ef57d088d76e7f5f818d759768051347cb620..312c858dbd965dc776f5c76efe73cb81db5dff12 100644 --- a/dabao/extract/opt/apps/top.yzzi.tomato/info +++ b/debian/one-tomato.info @@ -1,8 +1,8 @@ { - "appid": "top.yzzi.tomato", - "name": "OneTomato", - "version": "1.0.5", - "arch": ["amd64"], + "appid": "com.gitee.deepin-opensource.one-tomato", + "name": "one tomato", + "version": "1.0.0", + "arch": ["amd64", "arm64", "mips64"], "permissions": { "autostart": false, "notification": false, diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000000000000000000000000000000000000..b46e9cdc2856ca3bfc0db94622283193b0a5b5d8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,51 @@ +#!/usr/bin/make -f +#防止系统存在多个QT版本请看下引用qt编译环境错误，定义使用的QT版本 +export QT_SELECT := qt5 +#export DH_VERBOSE = 1 + + +# 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 $@ +#dh_auto_configure是自动执行autogen的脚本，qt使用qmake，需要覆盖并重写 +override_dh_auto_configure: + mkdir -p build + qmake $(CURDIR)/src/one-tomato.pro -spec \ + linux-g++ CONFIG+=qtquickcompiler -o build/ +#dh_auto_build默认使用make -j$(JOBS)，本例因为makefile目录不在源码根目录，因此覆盖并重写 +override_dh_auto_build: + make -C $(CURDIR)/build -j$(JOBS) + lrelease $(CURDIR)/translations/*.ts + +override_dh_auto_test: + +override_dh_auto_install: + mkdir -p $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/files/translations + mkdir -p $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/entries/icons/hicolor/scalable/apps/ + mkdir -p $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/entries/applications + cp $(CURDIR)/debian/one-tomato.info $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/info + cp $(CURDIR)/build/one-tomato $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/files/ + cp $(CURDIR)/translations/*.qm $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/files/translations/ + cp $(CURDIR)/assets/icon/top.yzzi.tomato.svg $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/entries/icons/hicolor/scalable/apps/com.gitee.deepin-opensource.one-tomato.svg + cp $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato.desktop $(CURDIR)/debian/com.gitee.deepin-opensource.one-tomato/opt/apps/com.gitee.deepin-opensource.one-tomato/entries/applications/ + +override_dh_installdocs: + +override_dh_installchangelogs: + +override_dh_makeshlibs: + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/outdeb/top.yzzi.tomato_1.0.5_amd64.deb b/outdeb/top.yzzi.tomato_1.0.5_amd64.deb deleted file mode 100644 index 3e19313161eb6f09987e15215f84dbdd80fe2bb3..0000000000000000000000000000000000000000 Binary files a/outdeb/top.yzzi.tomato_1.0.5_amd64.deb and /dev/null differ diff --git a/translations/one-tomato_zh_CN.qm b/translations/one-tomato_zh_CN.qm deleted file mode 100644 index fac77d498792bae56d03ab330ae5086dd1a9a53d..0000000000000000000000000000000000000000 Binary files a/translations/one-tomato_zh_CN.qm and /dev/null differ