Skip to content

Commit

Permalink
Merge pull request #205 from dshearer/maint-1.3-fix-debian-packaging
Browse files Browse the repository at this point in the history
Fix Debian packaging
  • Loading branch information
dshearer authored Aug 25, 2018
2 parents c872eab + c38013c commit c4984e3
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 629 deletions.
6 changes: 3 additions & 3 deletions packaging/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PLATFORMS = alpine_3.6 centos_6 centos_7 debian_9 ubuntu_14 ubuntu_16
PLATFORMS = alpine_3.6 centos_6 centos_7 debian_9

.PHONY : main
main :
Expand All @@ -23,7 +23,7 @@ clean-${platform} :

deepclean-${platform} :
$${MAKE} -j 1 -C ${platform} deepclean

make-vm-${platform} :
$${MAKE} -j 1 -C ${platform} .vm-is-running
endef
Expand All @@ -44,4 +44,4 @@ clean : $(patsubst %,clean-%,${PLATFORMS})
rm -rf results

.PHONY : deepclean
deepclean : $(patsubst %,deepclean-%,${PLATFORMS})
deepclean : $(patsubst %,deepclean-%,${PLATFORMS})
20 changes: 4 additions & 16 deletions packaging/debian_9/debian-pkg/changelog
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
jobber (1.3.3) UNRELEASED; urgency=low
jobber (1.3.3-1) UNRELEASED; urgency=low

* Release 1.3.3

-- C. Dylan Shearer <[email protected]> Sat, 25 Aug 2018 13:25:00 -0800

jobber (1.3.3-pr.2-1) UNRELEASED; urgency=low
jobber (1.3.2-1) UNRELEASED; urgency=low

* Release 1.3.3-pr.2
* Release 1.3.2

-- C. Dylan Shearer <[email protected]> Sat, 10 June 2018 10:42:00 -0800

jobber (1.3.3-pr.1-1) UNRELEASED; urgency=low

* Release 1.3.3-pr.1

-- C. Dylan Shearer <[email protected]> Sat, 28 May 2018 10:22:00 -0800

jobber (1.3.2-1) UNRELEASED; urgency=low

* Release 1.3.2

-- C. Dylan Shearer <[email protected]> Sat, 24 Feb 2018 12:40:00 -0800
-- C. Dylan Shearer <[email protected]> Sat, 24 Feb 2018 12:40:00 -0800

jobber (1.3.1-1) UNRELEASED; urgency=low

Expand Down
6 changes: 3 additions & 3 deletions packaging/debian_9/debian-pkg/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: jobber
Source: https://github.com/dshearer/jobber

Files: *
Copyright: 2014-2016 C. Dylan Shearer <[email protected]>
Copyright: 2014-2018 C. Dylan Shearer <[email protected]>
License: MIT

License: MIT
Expand All @@ -21,8 +21,8 @@ License: MIT
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
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.

# Please also look if there are files or directories which have a
Expand Down
1 change: 0 additions & 1 deletion packaging/tail.mk
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ clean-common :
deepclean : clean-common
-vagrant destroy -f
rm -f .vm-is-created
.PHONY : shallowclean

.PHONY : shallowclean
shallowclean :
Expand Down
54 changes: 0 additions & 54 deletions packaging/ubuntu_14/debian-pkg/changelog

This file was deleted.

1 change: 1 addition & 0 deletions packaging/ubuntu_14/debian-pkg/changelog
31 changes: 0 additions & 31 deletions packaging/ubuntu_14/debian-pkg/copyright

This file was deleted.

1 change: 1 addition & 0 deletions packaging/ubuntu_14/debian-pkg/copyright
164 changes: 0 additions & 164 deletions packaging/ubuntu_14/debian-pkg/jobber.init

This file was deleted.

1 change: 1 addition & 0 deletions packaging/ubuntu_14/debian-pkg/jobber.init
10 changes: 0 additions & 10 deletions packaging/ubuntu_14/debian-pkg/jobber.service

This file was deleted.

1 change: 1 addition & 0 deletions packaging/ubuntu_14/debian-pkg/jobber.service
Loading

0 comments on commit c4984e3

Please sign in to comment.