Import Debian changes 2.24-ok1

dctrl-tools (2.24-ok1) yangtze; urgency=low

  * Build for openKylin.
This commit is contained in:
openKylinBot 2022-04-25 22:03:04 +08:00
parent e82a1b9949
commit ec16705fac
15 changed files with 324 additions and 0 deletions

68
debian/NEWS vendored Normal file
View File

@ -0,0 +1,68 @@
dctrl-tools (2.7) experimental; urgency=low
The grep-dctrl package has now been renamed to dctrl-tools. The
reason is simple: there is now more than one tool in the package.
The new tool is sort-dctrl, and it does what you might think. See
the manual page for more information.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 9 Jun 2005 00:40:09 +0300
grep-dctrl (2.6.6) unstable; urgency=low
Version number comparisons are now supported. This subsumes the
earlier support for numeric comparison, since the version comparison
routine handles it as a special case.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Wed, 8 Jun 2005 19:26:56 +0300
grep-dctrl (2.6.1) experimental; urgency=low
This version introduces a new program, sync-available, whose function
is to sync the dpkg's available database with apt's database (sort of
dselect update without dselect).
-- Antti-Juhani Kaijanaho <ajk@debian.org> Sun, 11 Jul 2004 20:11:08 +0300
grep-dctrl (2.3) experimental; urgency=low
Numeric comparisons are now supported.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Sun, 18 Jan 2004 00:46:59 +0200
grep-dctrl (2.2) experimental; urgency=low
Grep-dctrl now supports using the output of a specified
command as the default input. As a result, a
grep-aptavail command has been introduced; it uses APT's
available database like grep-available uses dselect's
available database.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Fri, 16 Jan 2004 03:08:58 +0200
grep-dctrl (2.0) unstable; urgency=low
This entry describes changes since the last version in stable, 1.9,
released in July 2001.
Grep-dctrl has been completely rewritten. It is now faster than
before, in some cases even an order of magnitude faster, and it is now
much easier to add new features.
Speaking of new features, the major addition since 1.9 is the ability
to use the full descriptive power of propositional calculus to
combining searches. Basically, putting --and between two old-style
searches combines them with AND, and --or does the same with OR.
There is also a --not. See the grep-dctrl(1) manual page for more
information.
The option -c now is synonymous with --count.
There is a new -d switch that selects for display the _short description_
(the first line of the "Description" field).
Grep-dctrl now adheres to the same exit value conventions as grep(1).
It also supports GNU grep's -q and --silent options.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Wed, 7 Jan 2004 02:08:30 +0200

49
debian/NEWS.superseded vendored Normal file
View File

@ -0,0 +1,49 @@
grep-dctrl (1.104) unstable; urgency=low
One of the documented regressions have been removed in this version:
multiple field names in -F and multiple -F options in one atom are
again supported.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Sat, 3 Jan 2004 20:09:06 +0200
grep-dctrl (1.103) unstable; urgency=low
The annoying banner which was added in version 1.100 and which asked
for testing has been removed. The banner logic used the dotfile
~/.grep-dctrl-banner-shown, which can now be safely removed from all
home directories. The banner logic only ever existed in unstable; it
was never in any version of grep-dctrl that was released with Debian
stable.
Grep-dctrl now adheres to the same exit value conventions as grep(1).
It also supports grep's -q option.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 1 Jan 2004 20:44:10 +0200
grep-dctrl (1.100) unstable; urgency=low
This version was a total rewrite of grep-dctrl. This added several
new features, made it run generally faster and, of course, added some
bugs and regressions.
The big new feature is support for boolean queries. The new feature
allows combining searches arbitrarily using propositional connectives
(and, or and not). The command line syntax has been extended to
support this feature, but all old invocations work the same (modulo
bugs and regressions). See the manual page for more information.
There are also several known regressions (presented here in order
of severity):
- The -Ffoo,bar,baz feature that allows searching in multiple fields
is not supported. However, this is not that bad, as the same effect
can be obtained by using the new boolean query syntax (ie. instead of
saying -FPackage,Description foo, say -FPackage foo -o -FDescription
foo).
- There is no longer any internationalization support and hence no
translations of messages.
This version added an annoying banner asking for testing. It has been
later removed.
-- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 1 Jan 2004 20:37:52 +0200

5
debian/changelog vendored Normal file
View File

@ -0,0 +1,5 @@
dctrl-tools (2.24-ok1) yangtze; urgency=low
* Build for openKylin.
-- openKylinBot <openKylinBot@openkylin.com> Mon, 25 Apr 2022 22:03:04 +0800

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
10

39
debian/control vendored Normal file
View File

@ -0,0 +1,39 @@
Source: dctrl-tools
Section: utils
Priority: optional
Maintainer: Rhonda D'Vine <rhonda@debian.org>
Standards-Version: 4.2.1
Build-Depends: gettext (>= 0.11-0), debhelper (>= 10~), po4a (>= 0.40), libc-bin (>= 2.13)
Homepage: https://github.com/ajkaijanaho/dctrl-tools
Vcs-Git: https://salsa.debian.org/debian/dctrl-tools.git -b debian
Vcs-Browser: https://salsa.debian.org/debian/dctrl-tools
Package: dctrl-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: apt, debtags
Conflicts: grep-dctrl
Replaces: grep-dctrl
Provides: grep-dctrl
Multi-Arch: foreign
Description: Command-line tools to process Debian package information
Debian package information is generally stored in files having a
special file format, dubbed the Debian control file format (the dctrl
format), a special case of the record jar file format. These tools
operate on any files conforming in a general sense to that format and
are therefore widely applicable whenever those formats are in play.
.
Included are:
.
grep-dctrl - Grep dctrl-format files
grep-available - Grep the DPKG available database
grep-status - Grep the DPKG status database
grep-aptavail - Grep the APT available database
grep-debtags - Grep the Debtags package database
.
sort-dctrl - Sort dctrl-format files
.
tbl-dctrl - Tabulate dctrl-format files
.
sync-available - Sync the dpkg available database with
the apt database

64
debian/copyright vendored Normal file
View File

@ -0,0 +1,64 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
2009, 2010, 2011, 2012
Antti-Juhani Kaijanaho
License: GPL-2+
Files: lib/fnutil.c
Copyright:
Copyright (c) 1994 Lars Wirzenius. All rights reserved.
Copyright (C) 2004 Antti-Juhani Kaijanaho. All rights reserved.
License: BSD-2-clause
Files: lib/version.h lib/version.c
Copyright: Copyright © 2005 Antti-Juhani Kaijanaho
Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
License: GPL-2+
License: GPL-2+
This program 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 program 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; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
.
In Debian systems, the GNU GPL version 2 is available at
/usr/share/common-licenses/GPL-2 .
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
.
2. Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

8
debian/dctrl-tools.postinst vendored Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
set -e
dpkg-maintscript-helper rm_conffile \
/etc/grep-dctrl.rc 2.20.1 dctrl-tools -- "$@"
#DEBHELPER#

8
debian/dctrl-tools.postrm vendored Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
set -e
dpkg-maintscript-helper rm_conffile \
/etc/grep-dctrl.rc 2.20.1 dctrl-tools -- "$@"
#DEBHELPER#

8
debian/dctrl-tools.preinst vendored Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
set -e
dpkg-maintscript-helper rm_conffile \
/etc/grep-dctrl.rc 2.20.1 dctrl-tools -- "$@"
#DEBHELPER#

View File

@ -0,0 +1,24 @@
Author: Rhonda D'Vine <rhonda@debian.org>
Description: Remove --force option from po4a calls
The --force option forced a regenerate of the pot files on every call,
hindering the reproducible buildability of the package
Index: VCS/GNUmakefile
===================================================================
--- VCS.orig/GNUmakefile 2015-12-03 17:18:38.980045908 +0100
+++ VCS/GNUmakefile 2016-01-20 13:22:32.795072663 +0100
@@ -173,12 +173,12 @@
# create (or update) dctrl-tools-man.pot
man/po4a/po/dctrl-tools-man.pot :
touch man/po4a/po/dctrl-tools-man.pot
- $(PO4A) --force --no-translations $(PO4A_CONFIG)
+ $(PO4A) --no-translations $(PO4A_CONFIG)
# build translated manpages in man/translated/$lang/
po4a :
touch man/po4a/po/dctrl-tools-man.pot
- $(PO4A) --force --no-backups $(PO4A_CONFIG)
+ $(PO4A) --no-backups $(PO4A_CONFIG)
# handle the "%.1 : %.1.cp" rule if and only if the grep-dctrl.1.cp file exists
translated-man : po4a

23
debian/patches/reproducible_build.patch vendored Normal file
View File

@ -0,0 +1,23 @@
Author: Reiner Herrmann <reiner@reiner-h.de>
Description: Sort object files for deterministic linking order
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -31,7 +31,7 @@
PO4A_CONFIG = man/po4a/po4a.cfg
libsrc = $(wildcard lib/*.c)
-libobj = $(libsrc:.c=.o)
+libobj = $(sort $(libsrc:.c=.o))
src = $(libsrc) \
$(wildcard grep-dctrl/*.c) \
@@ -39,7 +39,7 @@
$(wildcard tbl-dctrl/*.c) \
$(wildcard join-dctrl/*.c)
-obj = $(src:.c=.o)
+obj = $(sort $(src:.c=.o))
exe = grep-dctrl/grep-dctrl \
sort-dctrl/sort-dctrl \

2
debian/patches/series vendored Normal file
View File

@ -0,0 +1,2 @@
GNUmakefile_remove---force-from-po4a-call
reproducible_build.patch

19
debian/rules vendored Executable file
View File

@ -0,0 +1,19 @@
#!/usr/bin/make -f
# Written by Antti-Juhani Kaijanaho <ajk@debian.org>.
# You may treat this file as if it were in the public domain.
%:
dh $@
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
cross :=
else
cross := CC=$(DEB_HOST_GNU_TYPE)-gcc
endif
override_dh_auto_build:
dh_auto_build -- prefix=/usr sysconfdir=/etc $(cross)
override_dh_auto_install:
dh_auto_install -- prefix=/usr sysconfdir=/etc

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

5
debian/watch vendored Normal file
View File

@ -0,0 +1,5 @@
# Compulsory line, this is a version 3 file
version=3
# <Webpage URL> <string match>
https://github.com/ajkaijanaho/dctrl-tools/releases /ajkaijanaho/dctrl-tools/archive/(.*)\.tar\.gz