UGR Wallpapers

Merge lp:~soaringsky/ugr-wallpapers/798249 into lp:~pr0xybot/ugr-wallpapers/dev

  1. 798249
  2. Merge into dev
Proposed by JC Hulce
Status: Merged
Approved by: JC Hulce
Approved revision: 18
Merged at revision: 20
Proposed branch: lp:~soaringsky/ugr-wallpapers/798249
Merge into: lp:~pr0xybot/ugr-wallpapers/dev
Diff against target: 52 lines (+16/-8)
4 files modified
debian/bzr-builder.manifest (+0/-2)
debian/changelog (+13/-5)
debian/control (+1/-1)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~soaringsky/ugr-wallpapers/798249
Reviewer Review Type Date Requested Status
JC Hulce (community) diffconfirm Approve
Review via email: mp+70660@code.launchpad.net

Commit message

* Add debian/watch
* Bumped standards-version to 3.9.2 and release to Oneiric
* Cleaned up junk

Description of the change

Adds a debian/watch file to get ready for ubuntu, and updates things for Oneiric

This only needs a diffconfirm; these changes will not affect building

To post a comment you must log in.
Revision history for this message
JC Hulce (soaringsky) wrote :

diff is as expected

review: Approve (diffconfirm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/bzr-builder.manifest'
2--- debian/bzr-builder.manifest 2011-06-03 21:38:19 +0000
3+++ debian/bzr-builder.manifest 1970-01-01 00:00:00 +0000
4@@ -1,2 +0,0 @@
5-# bzr-builder format 0.3 deb-version 14-1~dev
6-lp:ugr-wallpapers revid:launchpad_translations_on_behalf_of_ubuntugnometeam-20110531055456-saswwcxirf7i94kq
7
8=== modified file 'debian/changelog'
9--- debian/changelog 2011-06-03 21:38:19 +0000
10+++ debian/changelog 2011-08-07 00:45:59 +0000
11@@ -1,8 +1,16 @@
12-ugr-wallpapers (14-1~dev~natty1) natty; urgency=low
13-
14- * Auto build.
15-
16- -- UGR Build Team <ugr-builds@lists.launchpad.net> Tue, 31 May 2011 06:05:19 +0000
17+ugr-wallpapers (0.2.1) oneiric; urgency=low
18+
19+ * Add debian/watch (LP: #798249)
20+ * Updated translations
21+
22+ -- JC Hulce <jc@teampr0xy.net> Sat, 06 Aug 2011 19:29:30 -0500
23+
24+ugr-wallpapers (0.2.0) oneiric; urgency=low
25+
26+ * Bumped standards-version to 3.9.2
27+ * cleaned up junk
28+
29+ -- JC Hulce <jc@teampr0xy.net> Wed, 15 Jun 2011 21:31:19 -0500
30
31 ugr-wallpapers (0.1.4) natty; urgency=low
32
33
34=== modified file 'debian/control'
35--- debian/control 2011-05-11 07:24:49 +0000
36+++ debian/control 2011-08-07 00:45:59 +0000
37@@ -8,7 +8,7 @@
38 Build-Depends: debhelper (>= 5), cdbs, python, python-central
39 Build-Depends-Indep: python-distutils-extra, xsltproc
40 XS-Python-Version: all
41-Standards-Version: 3.8.4
42+Standards-Version: 3.9.2
43
44 Package: ugr-wallpapers
45 Architecture: all
46
47=== added file 'debian/watch'
48--- debian/watch 1970-01-01 00:00:00 +0000
49+++ debian/watch 2011-08-07 00:45:59 +0000
50@@ -0,0 +1,2 @@
51+#version=3
52+# This project does not publish source tarballs - It was built to be turned into an ubuntu package

Subscribers

People subscribed via source and target branches

to all changes: