Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
obs
open-build-service-debian
Commits
7e49a1eb
Commit
7e49a1eb
authored
Mar 22, 2019
by
Héctor Orón Martínez
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'publish-ddeb-files' into 'collabora/master'
Publish Ubuntu ddeb files to the repos See merge request
!6
parents
509d637d
85e7662b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
debian/changelog
debian/changelog
+2
-1
debian/patches/collabora/publish-ddeb-files.patch
debian/patches/collabora/publish-ddeb-files.patch
+15
-0
debian/patches/series
debian/patches/series
+1
-0
No files found.
debian/changelog
View file @
7e49a1eb
...
...
@@ -2,8 +2,9 @@ open-build-service (2.7.4-3co2) UNRELEASED; urgency=medium
* Add patch to publish Debian upstream tarball signature to the
repositories
* Add patch to publish Ubuntu ddeb files to the repositories
-- Lucas Kanashiro <lucas.kanashiro@collabora.com>
Wed
, 2
0
Mar 2019 1
0:31:43
-0300
-- Lucas Kanashiro <lucas.kanashiro@collabora.com>
Thu
, 2
1
Mar 2019 1
5:20:54
-0300
open-build-service (2.7.4-3co1) stretch; urgency=medium
...
...
debian/patches/collabora/publish-ddeb-files.patch
0 → 100644
View file @
7e49a1eb
Description: Publish Ubuntu ddeb files to the repositories
Author: Lucas Kanashiro <lucas.kanashiro@collabora.com>
Last-Updated: 2019-03-21
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -1507,7 +1507,7 @@
sub publish {
if ($bin =~ /^.+-[^-]+-[^-]+\.([a-zA-Z][^\/\.\-]*)\.d?rpm$/) {
$p = "$1/$bin";
$p = $1 eq 'src' || $1 eq 'nosrc' ? "SRPMS/$bin" : "RPMS/$bin" if $repotype{'resarchhack'};
- } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u+deb$/) {
+ } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.[ud]?deb$/) {
$p = "$arch/$bin";
} elsif ($bin =~ /\.exe$/) {
$p = "$bin";
debian/patches/series
View file @
7e49a1eb
...
...
@@ -35,3 +35,4 @@ collabora/backend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch
collabora/backend-Support-https-urls-for-package-downloads.patch
collabora/BSConfig-Make-every-architecture-its-own-relsync-pool.patch
collabora/BSConfig-Read-a-BSConfig.local.pm-if-it-exists.patch
collabora/publish-ddeb-files.patch
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