Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
23fc7ee7
Commit
23fc7ee7
authored
May 28, 2015
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow patch files names having a dash next to the four digits (i.e., 1234-<patchname>.<suffix>).
parent
a27a8aae
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
changelog
debian/changelog
+2
-0
roll-tarballs.sh
debian/roll-tarballs.sh
+2
-2
No files found.
debian/changelog
View file @
23fc7ee7
...
...
@@ -182,6 +182,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
* debian/roll-tarball.sh:
+ Make sure *.keyboard, debian/**, nx-libs.spec, .pc/** don't end up
in tarball (special focuse on the nx-libs-lite tarball).
+ Allow patch files names having a dash next to the four digits (i.e.,
1234-<patchname>.<suffix>).
* debian/COPYING.full+lite:
+ Replace content with GPL-2 license text, because that is the overall
(i.e., strictest) license we have to deal with in nx-libs.
...
...
debian/roll-tarballs.sh
View file @
23fc7ee7
...
...
@@ -82,7 +82,7 @@ mkdir -p "doc/applied-patches"
# prepare patches for lite and full tarball
if
[
"x
$MODE
"
=
"xfull"
]
;
then
cat
"debian/patches/series"
|
sort
|
grep
-v
'^#'
| egrep
"([0-9]+
_
.*
\.
(full|full
\+
lite)
\.
patch)"
|
while
read
file
cat
"debian/patches/series"
|
sort
|
grep
-v
'^#'
| egrep
"([0-9]+
(_|-)
.*
\.
(full|full
\+
lite)
\.
patch)"
|
while
read
file
do
cp
-v
"debian/patches/
$file
"
"doc/applied-patches/"
echo
"
${
file
##*/
}
"
>>
"doc/applied-patches/series"
...
...
@@ -96,7 +96,7 @@ else
rm
-Rf
"nxcompshad"
*
rm
-Rf
"nxcompext"
*
rm
-Rf
"nx-X11"
*
cat
"debian/patches/series"
|
sort
|
grep
-v
'^#'
| egrep
"([0-9]+
_
.*
\.
full
\+
lite
\.
patch)"
|
while
read
file
cat
"debian/patches/series"
|
sort
|
grep
-v
'^#'
| egrep
"([0-9]+
(_|-)
.*
\.
full
\+
lite
\.
patch)"
|
while
read
file
do
cp
-v
"debian/patches/
$file
"
"doc/applied-patches/"
echo
"
${
file
##*/
}
"
>>
"doc/applied-patches/series"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment