Ubuntu
squid3 package

Merge lp:~yolanda.robla/ubuntu/saucy/squid3/dep-8-tests into lp:ubuntu/saucy/squid3

  1. Saucy (13.10)
  2. dep-8-tests
  3. Merge into saucy
Proposed by Yolanda Robla
Status: Merged
Merged at revision: 45
Proposed branch: lp:~yolanda.robla/ubuntu/saucy/squid3/dep-8-tests
Merge into: lp:ubuntu/saucy/squid3
Diff against target: 38 lines (+14/-1) (has conflicts)
2 files modified
debian/changelog (+14/-0)
debian/rules (+0/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~yolanda.robla/ubuntu/saucy/squid3/dep-8-tests
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+165867@code.launchpad.net

Description of the change

Autopkgtests

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

thanks!

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 2013-05-27 09:25:15 +0000
3+++ debian/changelog 2013-05-27 12:15:39 +0000
4@@ -1,8 +1,22 @@
5+squid3 (3.1.20-1ubuntu5) saucy; urgency=low
6+
7+ * debian/rules: fix FTBFS, removed --with-cppunit-basedir flag
8+
9+ -- Yolanda Robla <yolanda.robla@canonical.com> Mon, 27 May 2013 14:09:10 +0200
10+
11 squid3 (3.1.20-1ubuntu4) saucy; urgency=low
12
13+<<<<<<< TREE
14 * debian/tests: Add autopkgtest.
15+=======
16+ * debian/tests: autopkgtests
17+>>>>>>> MERGE-SOURCE
18
19+<<<<<<< TREE
20 -- Yolanda <yolanda.robla@canonical.com> Mon, 27 May 2013 11:24:35 +0200
21+=======
22+ -- Yolanda Robla <yolanda.robla@canonical.com> Fri, 24 May 2013 12:51:53 +0200
23+>>>>>>> MERGE-SOURCE
24
25 squid3 (3.1.20-1ubuntu3) raring-proposed; urgency=low
26
27
28=== modified file 'debian/rules'
29--- debian/rules 2012-06-22 14:18:00 +0000
30+++ debian/rules 2013-05-27 12:15:39 +0000
31@@ -19,7 +19,6 @@
32 DEB_CONFIGURE_EXTRA_FLAGS := --datadir=/usr/share/squid3 \
33 --sysconfdir=/etc/squid3 \
34 --mandir=/usr/share/man \
35- --with-cppunit-basedir=/usr \
36 --enable-inline \
37 --enable-async-io=8 \
38 --enable-storeio="ufs,aufs,diskd" \

Subscribers

People subscribed via source and target branches

to all changes: