Merge lp:~logan/ubuntu/raring/backstep/0.3-0ubuntu5 into lp:ubuntu/raring/backstep

Proposed by Logan Rosen
Status: Merged
Merged at revision: 6
Proposed branch: lp:~logan/ubuntu/raring/backstep/0.3-0ubuntu5
Merge into: lp:ubuntu/raring/backstep
Diff against target: 62 lines (+16/-3)
5 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
debian/copyright (+1/-1)
debian/rules (+3/-1)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/backstep/0.3-0ubuntu5
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+147203@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

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 2010-12-29 13:13:53 +0000
3+++ debian/changelog 2013-02-07 18:43:22 +0000
4@@ -1,3 +1,12 @@
5+backstep (0.3-0ubuntu5) raring; urgency=low
6+
7+ * debian/watch: Add.
8+ * debian/rules: Add Build-Arch and Build-Indep targets.
9+ * debian/copyright: Update symlink license.
10+ * debian/control: Bump Standards-Version to 3.9.4.
11+
12+ -- Logan Rosen <logatronico@gmail.com> Thu, 07 Feb 2013 13:09:15 -0500
13+
14 backstep (0.3-0ubuntu4) natty; urgency=low
15
16 * debian/control:
17
18=== modified file 'debian/control'
19--- debian/control 2010-12-29 13:13:53 +0000
20+++ debian/control 2013-02-07 18:43:22 +0000
21@@ -4,7 +4,7 @@
22 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
23 XSBC-Original-Maintainer: Mario Limonciello <superm1@gmail.com>
24 Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev, libxpm-dev, x11proto-composite-dev
25-Standards-Version: 3.9.1
26+Standards-Version: 3.9.4
27 Homepage: http://backstep.sourceforge.net/
28
29 Package: backstep
30
31=== modified file 'debian/copyright'
32--- debian/copyright 2006-09-27 00:02:01 +0000
33+++ debian/copyright 2013-02-07 18:43:22 +0000
34@@ -22,5 +22,5 @@
35 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
36
37 On Debian systems, a copy of the GPL can be found in
38- /usr/share/common-licenses/GPL.
39+ /usr/share/common-licenses/GPL-2.
40
41
42=== modified file 'debian/rules'
43--- debian/rules 2010-12-29 13:13:53 +0000
44+++ debian/rules 2013-02-07 18:43:22 +0000
45@@ -21,7 +21,9 @@
46 endif
47 RENDER_CFLAGS="-I/usr/include" RENDER_LIBS="-L/usr/lib -lXcomposite -lXdamage -lXrender" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
48
49-build: build-stamp
50+build: build-arch build-indep
51+build-arch: build-stamp
52+build-indep: build-stamp
53
54 build-stamp: config.status
55 dh_testdir
56
57=== added file 'debian/watch'
58--- debian/watch 1970-01-01 00:00:00 +0000
59+++ debian/watch 2013-02-07 18:43:22 +0000
60@@ -0,0 +1,2 @@
61+version=3
62+http://sf.net/backstep/backstep-(.+).tar.bz2

Subscribers

People subscribed via source and target branches

to all changes: