Ubuntu
whois package

Merge lp:~ubuntu-branches/ubuntu/lucid/whois/lucid-201002122343 into lp:ubuntu/lucid/whois

  1. Lucid (10.04)
  2. lucid-201002122343
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/whois/lucid-201002122343
Merge into: lp:ubuntu/lucid/whois
Diff against target: 85 lines (+30/-0) (has conflicts)
5 files modified
config.h (+4/-0)
debian/changelog (+11/-0)
debian/mkpasswd.install (+2/-0)
debian/rules (+11/-0)
debian/whois.install (+2/-0)
Text conflict in config.h
Text conflict in debian/changelog
Conflict adding file debian/mkpasswd.install.  Moved existing file to debian/mkpasswd.install.moved.
Text conflict in debian/rules
Conflict adding file debian/whois.install.  Moved existing file to debian/whois.install.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/whois/lucid-201002122343
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/whois now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/whois/lucid-201002122343. A merge should be performed if necessary.

Reply

Unmerged revisions

11. By Chuck Short

Bump standards

10. By Chuck Short

Fix debian/changelog

9. By Chuck Short

debian/control, debian/mkpasswd.install, debian/whois.install,
debian/rules, config.h: Split out mkpasswd and mkwhois (LP: #284416)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.h'
2--- config.h 2010-01-04 15:00:58 +0000
3+++ config.h 2010-02-12 23:46:14 +0000
4@@ -1,5 +1,9 @@
5 /* Program version */
6+<<<<<<< TREE
7 #define VERSION "5.0.0ubuntu1"
8+=======
9+#define VERSION "4.7.36ubuntu2"
10+>>>>>>> MERGE-SOURCE
11
12 /* Configurable features */
13
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2010-01-04 15:00:58 +0000
17+++ debian/changelog 2010-02-12 23:46:14 +0000
18@@ -1,3 +1,4 @@
19+<<<<<<< TREE
20 whois (5.0.0ubuntu1) lucid; urgency=low
21
22 * Merge from debian testing. Remaining changes:
23@@ -47,6 +48,16 @@
24
25 -- Chuck Short <zulcss@ubuntu.com> Mon, 09 Nov 2009 14:12:15 -0500
26
27+=======
28+whois (4.7.36ubuntu2) lucid; urgency=low
29+
30+ * debian/control, debian/mkpasswd.install, debian/whois.install,
31+ debian/rules, config.h: Split out mkpasswd and mkwhois (LP: #284416)
32+ * debian/control: Bump Standards-Version to 3.8.3.
33+
34+ -- Chuck Short <zulcss@ubuntu.com> Mon, 09 Nov 2009 14:12:15 -0500
35+
36+>>>>>>> MERGE-SOURCE
37 whois (4.7.36ubuntu1) lucid; urgency=low
38
39 * Merge from debian unstable, remaining changes:
40
41=== added file 'debian/mkpasswd.install'
42--- debian/mkpasswd.install 1970-01-01 00:00:00 +0000
43+++ debian/mkpasswd.install 2010-02-12 23:46:14 +0000
44@@ -0,0 +1,2 @@
45+/usr/bin/mkpasswd
46+/usr/share/man/man1/mkpasswd.1.gz
47
48=== renamed file 'debian/mkpasswd.install' => 'debian/mkpasswd.install.moved'
49=== modified file 'debian/rules'
50--- debian/rules 2010-01-04 15:00:58 +0000
51+++ debian/rules 2010-02-12 23:46:14 +0000
52@@ -28,6 +28,7 @@
53 # sanity check
54 egrep -q '^#define VERSION "$(VERSION)"$$' config.h
55
56+<<<<<<< TREE
57 mkdir -p $W/usr/bin
58 mkdir -p $D/usr/bin
59
60@@ -35,6 +36,16 @@
61 install mkpasswd $W/usr/bin
62 cd po && $(MAKE) install BASEDIR=$D && $(MAKE) install BASEDIR=$W
63 dh_installman -i -a
64+=======
65+ #mkdir -p $W/usr/bin
66+ #mkdir -p $D/usr/bin
67+
68+ dh_installdirsi -i -a usr/bin
69+ install whois $D/usr/bin/
70+ install mkpasswd $W/usr/bin
71+ cd po && $(MAKE) install BASEDIR=$D && $(MAKE) install BASEDIR=$W
72+ dh_installman -i -a
73+>>>>>>> MERGE-SOURCE
74 dh_installdocs README
75 dh_installchangelogs -i -a
76 dh_strip -i -a
77
78=== added file 'debian/whois.install'
79--- debian/whois.install 1970-01-01 00:00:00 +0000
80+++ debian/whois.install 2010-02-12 23:46:14 +0000
81@@ -0,0 +1,2 @@
82+/usr/bin/whois
83+/usr/share/man/man1/whois.1.gz
84
85=== renamed file 'debian/whois.install' => 'debian/whois.install.moved'

Subscribers

People subscribed via source and target branches

to all changes: