Ubuntu
xpdf package

Merge lp:~logan/ubuntu/raring/xpdf/debian-merge into lp:ubuntu/raring/xpdf

  1. Raring (13.04)
  2. debian-merge
  3. Merge into raring
Proposed by Logan Rosen
Status: Merged
Merged at revision: 32
Proposed branch: lp:~logan/ubuntu/raring/xpdf/debian-merge
Merge into: lp:ubuntu/raring/xpdf
Diff against target: 64 lines (+18/-5)
5 files modified
debian/.pc/.quilt_patches (+0/-1)
debian/.pc/.quilt_series (+0/-1)
debian/.pc/.version (+0/-1)
debian/changelog (+16/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/xpdf/debian-merge
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+135051@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'debian/.pc'
2=== removed file 'debian/.pc/.quilt_patches'
3--- debian/.pc/.quilt_patches 2011-10-29 17:16:18 +0000
4+++ debian/.pc/.quilt_patches 1970-01-01 00:00:00 +0000
5@@ -1,1 +0,0 @@
6-patches
7
8=== removed file 'debian/.pc/.quilt_series'
9--- debian/.pc/.quilt_series 2011-10-29 17:16:18 +0000
10+++ debian/.pc/.quilt_series 1970-01-01 00:00:00 +0000
11@@ -1,1 +0,0 @@
12-series
13
14=== removed file 'debian/.pc/.version'
15--- debian/.pc/.version 2011-10-29 17:16:18 +0000
16+++ debian/.pc/.version 1970-01-01 00:00:00 +0000
17@@ -1,1 +0,0 @@
18-2
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2012-09-12 16:33:31 +0000
22+++ debian/changelog 2012-11-20 05:38:20 +0000
23@@ -1,3 +1,19 @@
24+xpdf (3.03-10ubuntu1) raring; urgency=low
25+
26+ * Merge from Debian unstable. Remaining changes:
27+ - debian/rules: Don't use LDFLAGS to specify which libraries to link
28+ with but use LIBS instead.
29+ - Follow changes to libpoppler25 ABI.
30+
31+ -- Logan Rosen <logatronico@gmail.com> Tue, 20 Nov 2012 00:32:22 -0500
32+
33+xpdf (3.03-10) unstable; urgency=low
34+
35+ * Build-depend on libpoppler-private-dev (closes: #660992).
36+ * Update my email address.
37+
38+ -- Michael Gilbert <mgilbert@debian.org> Mon, 11 Jun 2012 21:40:47 -0400
39+
40 xpdf (3.03-9ubuntu5) quantal; urgency=low
41
42 * No-change rebuild for libpoppler27 -> libpoppler28 transition.
43
44=== modified file 'debian/control'
45--- debian/control 2012-05-17 10:54:46 +0000
46+++ debian/control 2012-11-20 05:38:20 +0000
47@@ -2,7 +2,7 @@
48 Section: text
49 Priority: optional
50 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
51-XSBC-Original-Maintainer: Michael Gilbert <michael.s.gilbert@gmail.com>
52+XSBC-Original-Maintainer: Michael Gilbert <mgilbert@debian.org>
53 Uploaders: Osamu Aoki <osamu@debian.org>
54 Standards-Version: 3.9.3
55 Build-Depends:
56@@ -10,7 +10,7 @@
57 pkg-config,
58 libx11-dev,
59 lesstif2-dev,
60- libpoppler-dev (>= 0.16),
61+ libpoppler-private-dev (>= 0.16),
62 Build-Conflicts:
63 binutils-gold,
64 DM-Upload-Allowed: yes

Subscribers

People subscribed via source and target branches

to all changes: