1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
|
The Debian packaging of debmake is maintained in git, using the merging
workflow described in dgit-maint-merge(7). There isn't a patch queue that can
be represented as a quilt series.
Please see https://salsa.debian.org/debian/debmake
--- debmake-4.4.0.orig/setup.cfg
+++ debmake-4.4.0/setup.cfg
@@ -54,6 +54,7 @@ console_scripts =
src/extra0desc_long/dev
src/extra0desc_long/doc
src/extra0desc_long/lib
+ src/extra0desc_long/nodejs
src/extra0desc_long/perl
src/extra0desc_long/python
src/extra0desc_long/python3
@@ -75,6 +76,7 @@ console_scripts =
src/extra0override/pythons
share/debmake/extra1 =
src/extra1/README.Debian
+ src/extra1/salsa-ci.yml
src/extra1/watch
share/debmake/extra1patches = src/extra1patches/series
share/debmake/extra1source = src/extra1source/format
@@ -116,6 +118,7 @@ console_scripts =
src/extra3/compat.ex
src/extra3/manpage.1.ex
src/extra3/manpage.asciidoc.ex
+ src/extra3/manpage.md.ex
src/extra3/manpage.sgml.ex
src/extra3/manpage.xml.ex
src/extra3/package.bug-control.ex
@@ -156,4 +159,3 @@ console_scripts =
src/desc/python3.short
src/desc/specin.long
src/desc/specin.short
-
--- debmake-4.4.0.orig/src/debmake/__init__.py
+++ debmake-4.4.0/src/debmake/__init__.py
@@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
# Basic package information
#######################################################################
-__debian_policy__ = "4.5.1" # debian policy version
+__debian_policy__ = "4.6.1" # debian policy version
__debian_compat__ = "13" # debian/control Build-Depends: debhelper-compat (= 13)
__programname__ = "debmake"
__version__ = "4.4.0"
--- debmake-4.4.0.orig/src/debmake/__main__.py
+++ debmake-4.4.0/src/debmake/__main__.py
@@ -289,7 +289,7 @@ def main():
if subprocess.call(command, shell=True) != 0:
print("E: failed to run dpkg-depcheck.", file=sys.stderr)
exit(1)
- command = 'LANG=C ; sed -e "1d" < ../{0}.depcheck.log | sort >../{0}.build-dep.log'.format(
+ command = r'LANG=C ; sed -e "1d" < ../{0}.depcheck.log | sort >../{0}.build-dep.log'.format(
para["package"]
)
print("I: $ {}".format(command), file=sys.stderr)
@@ -301,9 +301,9 @@ def main():
command = (
"LANG=C; find debian/"
+ bpackage
- + ' -type f 2>&1 | sed -e "s/^debian\/'
+ + r' -type f 2>&1 | sed -e "s/^debian\/'
+ bpackage
- + '\///" | sort >../{0}.install.log'.format(para["package"])
+ + r'\///" | sort >../{0}.install.log'.format(para["package"])
)
print("I: $ {}".format(command), file=sys.stderr)
if subprocess.call(command, shell=True) != 0:
@@ -312,7 +312,7 @@ def main():
)
exit(1)
elif len(para["debs"]) > 1:
- command = 'LANG=C; find debian/tmp -type f 2>&1 | sed -e "s/^debian\/tmp\///" | sort >../{0}.install.log'.format(
+ command = r'LANG=C; find debian/tmp -type f 2>&1 | sed -e "s/^debian\/tmp\///" | sort >../{0}.install.log'.format(
para["package"]
)
print("I: $ {}".format(command), file=sys.stderr)
--- debmake-4.4.0.orig/src/debmake/analyze.py
+++ debmake-4.4.0/src/debmake/analyze.py
@@ -436,7 +436,7 @@ def analyze(para):
elif os.path.isfile("package.json"):
para["build_type"] = "nodejs"
para["dh_with"].update({"nodejs"})
- para["build_depends"].update({"pkg-js-tools"})
+ para["build_depends"].update({"dh-nodejs"})
# Java
elif os.path.isfile("build.xml"):
para["build_type"] = "Java ant"
--- debmake-4.4.0.orig/src/debmake/debian.py
+++ debmake-4.4.0/src/debmake/debian.py
@@ -200,16 +200,12 @@ def debian(para):
)
confdir = para["base_share_path"] + "/extra1tests/"
debmake.sed.sed(
- confdir, "debian/source/", substlist, package, tutorial=para["tutorial"]
+ confdir, "debian/tests/", substlist, package, tutorial=para["tutorial"]
)
confdir = para["base_share_path"] + "/extra1upstream/"
debmake.sed.sed(
confdir, "debian/upstream/", substlist, package, tutorial=para["tutorial"]
)
- confdir = para["base_share_path"] + "/extra1tests/"
- debmake.sed.sed(
- confdir, "debian/tests/", substlist, package, tutorial=para["tutorial"]
- )
if not para["native"]:
confdir = para["base_share_path"] + "/extra1patches/"
debmake.sed.sed(
--- debmake-4.4.0.orig/src/debmake/sanity.py
+++ debmake-4.4.0/src/debmake/sanity.py
@@ -49,7 +49,7 @@ def sanity(para):
if os.path.isfile("/usr/bin/wget"):
command = "/usr/bin/wget " + url
elif os.path.isfile("/usr/bin/curl"):
- command = "/usr/bin/curl " + url
+ command = "/usr/bin/curl -O " + url
else:
print("E: please install wget or curl.", file=sys.stderr)
exit(1)
--- debmake-4.4.0.orig/src/extra0export/compiler
+++ debmake-4.4.0/src/extra0export/compiler
@@ -4,7 +4,7 @@
### 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
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1
###
### With debhelper version 9 or newer, the dh command exports
### all buildflags. So there is no need to include the
--- /dev/null
+++ debmake-4.4.0/src/extra1/salsa-ci.yml
@@ -0,0 +1,10 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "CI/CD configuration file" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
--- debmake-4.4.0.orig/src/extra1tests/control
+++ debmake-4.4.0/src/extra1tests/control
@@ -2,5 +2,8 @@
# DEP-8: autopkgtest - automatic as-installed package testing
# Please check * https://dep-team.pages.debian.net/deps/dep8/
# * /usr/share/doc/autopkgtest
+#
+# !!! Please make sure to edit this to a valid test, otherwise build will fails
+#
#Tests: testcode.sh
#Restrictions: allow-stderr, breaks-testbed, needs-internet, needs-root
--- /dev/null
+++ debmake-4.4.0/src/extra3/manpage.md.ex
@@ -0,0 +1,127 @@
+% @UCPACKAGE@(SECTION) | User Commands
+%
+% "@SHORTDATE@"
+
+[comment]: # The lines above form a Pandoc metadata block. They must be
+[comment]: # the first ones in the file.
+[comment]: # See https://pandoc.org/MANUAL.html#metadata-blocks for details.
+
+[comment]: # pandoc -s -f markdown -t man package.md -o package.1
+[comment]: #
+[comment]: # A manual page package.1 will be generated. You may view the
+[comment]: # manual page with: nroff -man package.1 | less. A typical entry
+[comment]: # in a Makefile or Makefile.am is:
+[comment]: #
+[comment]: # package.1: package.md
+[comment]: # pandoc --standalone --from=markdown --to=man $< --output=$@
+[comment]: #
+[comment]: # The pandoc binary is found in the pandoc package. Please remember
+[comment]: # that if you create the nroff version in one of the debian/rules
+[comment]: # file targets, such as build, you will need to include pandoc in
+[comment]: # your Build-Depends control field.
+
+[comment]: # lowdown is a low dependency, lightweight alternative to
+[comment]: # pandoc as a markdown to manpage translator. Use with:
+[comment]: #
+[comment]: # package.1: package.md
+[comment]: # lowdown -s -Tman -o $@ $<
+[comment]: #
+[comment]: # And add lowdown to the Build-Depends control field.
+
+[comment]: # Remove the lines starting with '[comment]:' in this file in order
+[comment]: # to avoid warning messages.
+
+# NAME
+
+@PACKAGE@ - short summary
+
+# SYNOPSIS
+
+**@PACKAGE@** **-e** _this_ [**\-\-example=that**] [{**-e** | **\-\-example**} _this_]
+ [{**-e** | **\-\-example**} {_this_ | _that_}]
+
+**@PACKAGE@** [{**-h** | *\-\-help**} | {**-v** | **\-\-version**}]
+
+# DESCRIPTION
+
+**@PACKAGE@** is a program that...
+
+# OPTIONS
+
+The program follows the usual GNU command line syntax, with long options
+starting with two dashes ('-'). A summary of options is included below.
+
+**-e** _this_, **\-\-example=**_that_
+: Does this and that.
+
+**-h**, **\-\-help**
+: Show summary of options.
+
+**-v**, **\-\-version**
+: Show version of program.
+
+# FILES
+
+/etc/foo.conf
+: The system-wide configuration file to control the behaviour of
+ @PACKAGE@. See **foo.conf**(5) for further details.
+
+${HOME}/.foo.conf
+: The per-user configuration file to control the behaviour of
+ @PACKAGE@. See **foo.conf**(5) for further details.
+
+# ENVIRONMENT
+
+**FOO_CONF**
+: If used, the defined file is used as configuration file (see also
+ the section called “FILES”).
+
+# DIAGNOSTICS
+
+The following diagnostics may be issued on stderr:
+
+Bad configuration file. Exiting.
+: The configuration file seems to contain a broken configuration
+ line. Use the **\-\-verbose** option, to get more info.
+
+**@PACKAGE@** provides some return codes, that can be used in scripts:
+
+ Code Diagnostic
+ 0 Program exited successfully.
+ 1 The configuration file seems to be broken.
+
+# BUGS
+
+The program is currently limited to only work with the foobar library.
+
+The upstream BTS can be found at http://bugzilla.foo.tld.
+
+# SEE ALSO
+
+**bar**(1), **baz**(1), **foo.conf**(5)
+
+The programs are documented fully by The Rise and Fall of a Fooish Bar
+available via the **info**(1) system.
+
+# AUTHOR
+
+@FULLNAME@ <@EMAIL@>
+: Wrote this manpage for the Debian system.
+
+# COPYRIGHT
+
+Copyright © @YEAR@ @FULLNAME@
+
+This manual page was written for the Debian system (and may be used by
+others).
+
+Permission is granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 or (at your option)
+any later version published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL.
+
+[comment]: # Local Variables:
+[comment]: # mode: markdown
+[comment]: # End:
--- debmake-4.4.0.orig/src/extra4/LGPL-2.1+
+++ debmake-4.4.0/src/extra4/LGPL-2.1+
@@ -11,7 +11,7 @@ License: LGPL-2.1+
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ version 2.1 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
|
