Merge lp:~noskcaj/ubuntu/saucy/ubuntu-sounds/deb9 into lp:ubuntu/saucy/ubuntu-sounds

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/saucy/ubuntu-sounds/deb9
Merge into: lp:ubuntu/saucy/ubuntu-sounds
Diff against target: 90 lines (+12/-42)
5 files modified
debian/changelog (+7/-0)
debian/compat (+1/-1)
debian/control (+1/-1)
debian/install (+1/-0)
debian/rules (+2/-40)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/saucy/ubuntu-sounds/deb9
Reviewer Review Type Date Requested Status
Micah Gersten Pending
Review via email: mp+179607@code.launchpad.net

This proposal supersedes a proposal from 2013-08-11.

Description of the change

Updated to debhelper 9

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote : Posted in a previous version of this proposal

This is missing installing the sounds in the proper directory.

review: Needs Fixing

Unmerged revisions

15. By Jackson Doak

Fixed so things get installed with new debian/rules format

14. By Jackson Doak

Updated to debhelper 9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-02 22:52:01 +0000
3+++ debian/changelog 2013-08-11 20:25:24 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-sounds (0.15) saucy; urgency=low
6+
7+ * Changed debhelper version from 5 to 9
8+ * Changed to short debian/rules layout
9+
10+ -- Jackson Doak <noskcaj@ubuntu.com> Sun, 11 Aug 2013 19:42:12 +1000
11+
12 ubuntu-sounds (0.14) raring; urgency=low
13
14 * debian/source/format: Indicate 3.0 (native) format.
15
16=== modified file 'debian/compat'
17--- debian/compat 2006-10-08 10:06:27 +0000
18+++ debian/compat 2013-08-11 20:25:24 +0000
19@@ -1,1 +1,1 @@
20-5
21+9
22
23=== modified file 'debian/control'
24--- debian/control 2013-02-02 22:52:01 +0000
25+++ debian/control 2013-08-11 20:25:24 +0000
26@@ -2,7 +2,7 @@
27 Section: gnome
28 Priority: optional
29 Maintainer: Ubuntu Artwork Team <ubuntu-art@lists.ubuntu.com>
30-Build-Depends: debhelper (>= 5), vorbis-tools
31+Build-Depends: debhelper (>= 9), vorbis-tools
32 Standards-Version: 3.9.4
33
34 Package: ubuntu-sounds
35
36=== added file 'debian/install'
37--- debian/install 1970-01-01 00:00:00 +0000
38+++ debian/install 2013-08-11 20:25:24 +0000
39@@ -0,0 +1,1 @@
40+/ubuntu /usr/share/sounds
41
42=== modified file 'debian/rules'
43--- debian/rules 2013-02-11 10:12:27 +0000
44+++ debian/rules 2013-08-11 20:25:24 +0000
45@@ -3,43 +3,5 @@
46 # Uncomment this to turn on verbose mode.
47 #export DH_VERBOSE=1
48
49-build: build-arch build-indep
50-build-arch: build-stamp
51-build-indep: build-stamp
52-
53-build-stamp:
54- dh_testdir
55- touch build-stamp
56-
57-clean:
58- dh_testdir
59- dh_testroot
60- rm -f build-stamp configure-stamp
61- dh_clean
62-
63-install: build
64- dh_testdir
65- dh_testroot
66- dh_clean -k
67- dh_installdirs
68- cp -r $(CURDIR)/ubuntu $(CURDIR)/debian/ubuntu-sounds/usr/share/sounds
69-
70-# Build architecture-independent files here.
71-binary-indep: build-indep install
72- dh_testdir
73- dh_testroot
74- dh_installchangelogs
75- dh_installdocs
76- dh_link
77- dh_compress
78- dh_fixperms
79- dh_installdeb
80- dh_gencontrol
81- dh_md5sums
82- dh_builddeb
83-
84-# Does nothing - no arch-dep packages
85-binary-arch:
86-
87-binary: binary-indep binary-arch
88-.PHONY: build clean binary-indep binary-arch binary install configure
89+%:
90+ dh $@

Subscribers

People subscribed via source and target branches

to all changes: