diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..0cfbf08 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..ea31a36 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,12 @@ +xdg-utils (1.0.2+cvs20100307-3) unstable; urgency=low + + xdg-email now honors the $MAILER variable when deciding which mail + user agent to use. Remember to wrap it in a terminal window if you're + using a text-based mailer. For example: + + MAILER="xterm -e mutt" + + You can also list multiple mailers separated by colons, in which case + xdg-email will try each one in order until one of them succeeds. + + -- Per Olofsson Mon, 25 Oct 2010 10:23:18 +0200 diff --git a/debian/changelog b/debian/changelog index 6d8d068..4048aa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -upstream-name (1.0-101pika1) pika; urgency=medium +xdg-utils (1.2.1-101pika1) pika; urgency=medium - * Initial release. (Closes: #nnnn) + * New upstream version - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 + -- Cosmo Sat, 06 Jul 2024 18:19:07 +0300 diff --git a/debian/control b/debian/control index 0bcd8e0..037fbc9 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,42 @@ -Source: upstream-name -Section: admin +Source: xdg-utils +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian freedesktop.org maintainers +Uploaders: + Per Olofsson , + Nicholas Guriev , +Section: utils Priority: optional -Maintainer: name -Standards-Version: 4.6.1 -Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.5.1 Rules-Requires-Root: no +Build-Depends: debhelper-compat (= 12) +Build-Depends-Indep: mawk | awk, w3m | links | lynx, xmlto +Vcs-Git: https://salsa.debian.org/freedesktop-team/xdg-utils.git +Vcs-Browser: https://salsa.debian.org/freedesktop-team/xdg-utils +Homepage: https://www.freedesktop.org/wiki/Software/xdg-utils/ -Package: pkgname1 -Architecture: linux-any -# Delete any of these lines if un-used -Depends: ${misc:Depends}, depends -Recommends: high priority optdepends -Conflicts: conflicts -Suggests: low priority optdepends -Breaks: also conflicts!? -Provides: provides -# -Description: pkgdesc +Package: xdg-utils +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Recommends: + libfile-mimeinfo-perl, + libnet-dbus-perl, + libx11-protocol-perl, + x11-utils, + x11-xserver-utils, +Description: desktop integration utilities from freedesktop.org + xdg-utils contains utilities for integrating applications with the + desktop environment, regardless of which desktop environment is used. + . + The following utilities are included: + . + * xdg-desktop-menu - Install desktop menu items + * xdg-desktop-icon - Install icons on the user's desktop + * xdg-email - Compose a new email in the user's preferred email client, + potentially with subject and other info filled in + * xdg-icon-resource - Install icon resources + * xdg-mime - Query and install MIME types and associations + * xdg-open - Open a URI in the user's preferred application that + handles the respective URI or file type + * xdg-screensaver - Enable, disable, or suspend the screensaver + * xdg-settings - Get or set the default web browser and URI handlers diff --git a/debian/copyright b/debian/copyright index e69de29..4c20d9a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -0,0 +1,46 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://gitlab.freedesktop.org/xdg/xdg-utils +Upstream-Name: xdg-utils + +Files: * +Copyright: 2006, Jeremy White + 2006, Kevin Krammer + 2009-2010, Fathi Boudra + 2009-2010, Rex Dieter +License: Expat + +Files: debian/* +Copyright: 2006-2015, Per Olofsson + 2017-2021, Nicholas Guriev +License: Expat + +Files: scripts/generate-help-script.awk +Copyright: 2006, Benedikt Meurer +License: Expat + +Files: scripts/xdg-screensaver.in +Copyright: 2006, Bryce Harrington +License: Expat + +Files: scripts/xdg-settings.in +Copyright: 2009, Google Inc. +License: Expat + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..12bb364 --- /dev/null +++ b/debian/docs @@ -0,0 +1,4 @@ +README.md +RELEASE_NOTES +ChangeLog +TODO diff --git a/debian/rules b/debian/rules index 64a084a..59b7c05 100755 --- a/debian/rules +++ b/debian/rules @@ -1,67 +1,36 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -## See debhelper(7) (uncomment to enable). -## Output every command that modifies files on the build system. -export DH_VERBOSE = 1 -export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch) +BUILT_FILES := scripts/xdg-*.in scripts/man/*.1 scripts/README -## === the chain of command === -## debuild runs a chain of dh functions in the following order: -## dh_testdir -## dh_clean -## dh_auto_clean -## dh_update_autotools_config -## dh_autoreconf -## dh_auto_configure -## dh_prep -## dh_build -## dh_auto_build -## dh_install -## dh_auto_install -## dh_installdocs -## dh_installchangelogs -## dh_perl -## dh_link -## dh_strip_nondeterminism -## dh_compress -## dh_fixperms -## dh_missing -## dh_dwz -## dh_strip -## dh_makeshlibs -## dh_shlibdeps -## dh_installdeb -## dh_gencontrol -## but you are most likely to only need to override the following: -## dh_clean -## dh_auto_configure -## dh_build -## dh_install - -## === End end of region === - -## === overriding dh functions === -## by default all dh functions will run a specific command based on the build system selected by "dh $@" -## if you have a makefile that does everything you need this is fine, -## but most likely you have no MakeFile and you want to add your own commands -## Note : overrides must be places above %: -## So here's a few examples: - -## overriding dh_clean to make it not delete rust vendor files: -#override_dh_clean: -# echo "disabled" - -## overriding dh_auto_configure to add custom configs: -#override_dh_auto_configure: -# $(srcdir)/configure -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -DBUILD_PLUGIN=OFF - -## overriding dh_install to install files to a package: -#override_dh_auto_configure: -# mkdir -p debian/pikman/usr/bin -# cp pikman debian/pikman/usr/bin/ - -## === End end of region === - -## This here will start the build: %: dh $@ + +override_dh_auto_build: + set -e; for i in $(BUILT_FILES); do \ + f=$${i%.in}; \ + if [ -e $$f ] && ! [ -e $$f.build-orig ]; then \ + mv $$f $$f.build-orig; \ + fi; \ + done + cd scripts && LC_ALL=C.UTF-8 make scripts man + +override_dh_auto_clean: + dh_auto_clean + set -e; for i in $(BUILT_FILES); do \ + f=$${i%.in}; \ + if [ -e $$f.build-orig ]; then \ + mv $$f.build-orig $$f; \ + fi; \ + done + rm -f scripts/html/index.html + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +# Use automated tests that do not require a user action. + make autotest +endif + +# Install the upstream release notes and rename the file. +override_dh_installdocs: + dh_installdocs + install -p RELEASE_NOTES debian/xdg-utils/usr/share/doc/xdg-utils/NEWS diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..e69de29 diff --git a/debian/source/patch-header b/debian/source/patch-header new file mode 100644 index 0000000..9fd8c73 --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,13 @@ +Description: Collected Debian patches for xdg-utils +Author: Nicholas Guriev + +The xdg-utils package is maintained in Git rather than maintaining +patches as separate files, and separating the patches doesn't seem to +be worth the effort. They are therefore all included in this single +Debian patch. + +For full commit history and separated commits, see the packaging Git +repository. + +--- + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..074c08c --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts="searchmode=plain" \ + https://gitlab.freedesktop.org/xdg/@PACKAGE@/tags?sort=updated_desc -/archive/v?\d[\d.]+/@PACKAGE@-@ANY_VERSION@\.tar\.gz diff --git a/debian/xdg-utils.alternatives b/debian/xdg-utils.alternatives new file mode 100644 index 0000000..c63b88a --- /dev/null +++ b/debian/xdg-utils.alternatives @@ -0,0 +1,6 @@ +Name: open +Link: /usr/bin/open +Alternative: /usr/bin/xdg-open +Dependents: + /usr/share/man/man1/open.1.gz open.1.gz /usr/share/man/man1/xdg-open.1.gz +Priority: 50 diff --git a/debian/xdg-utils.bug-presubj b/debian/xdg-utils.bug-presubj new file mode 100644 index 0000000..0a3b39e --- /dev/null +++ b/debian/xdg-utils.bug-presubj @@ -0,0 +1,8 @@ +Thank you for reporting a bug against xdg-utils. For us to be able to +debug your problem, it would be most helpful if you could run the +affected command using "sh -x" and include the output in your bug +report. For example: + + sh -x /usr/bin/xdg-open somefile.txt + +Note that you need to give the full path to the command. diff --git a/debian/xdg-utils.bug-script b/debian/xdg-utils.bug-script new file mode 100644 index 0000000..f7e30d3 --- /dev/null +++ b/debian/xdg-utils.bug-script @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +echo "Desktop environment: XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP" >&3 diff --git a/debian/xdg-utils.links b/debian/xdg-utils.links new file mode 100644 index 0000000..c87b9d2 --- /dev/null +++ b/debian/xdg-utils.links @@ -0,0 +1 @@ +/usr/bin/xdg-open /usr/bin/browse diff --git a/main.sh b/main.sh index d80ca48..dcb2830 100755 --- a/main.sh +++ b/main.sh @@ -6,15 +6,15 @@ set -e echo "$PIKA_BUILD_ARCH" > pika-build-arch -VERSION="1.0" +VERSION="1.2.1" # Clone Upstream -mkdir -p ./src-pkg-name -cp -rvf ./debian ./src-pkg-name/ -cd ./src-pkg-name/ +git clone --depth=1 https://gitlab.freedesktop.org/xdg/xdg-utils -b v"$VERSION" +cp -rvf ./debian ./xdg-utils +cd ./xdg-utils # Get build deps -LOGNAME=root dh_make --createorig -y -l -p src-pkg-name_"$VERSION" || echo "dh-make: Ignoring Last Error" +LOGNAME=root dh_make --createorig -y -l -p xdg-utils_"$VERSION" || echo "dh-make: Ignoring Last Error" apt-get build-dep ./ -y # Build package