Ubuntu
gnuradio package

Merge lp:~ubuntu-branches/ubuntu/precise/gnuradio/precise-201110200806 into lp:ubuntu/precise/gnuradio

  1. Precise (12.04)
  2. precise-201110200806
  3. Merge into precise
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/gnuradio/precise-201110200806
Merge into: lp:ubuntu/precise/gnuradio
Diff against target: 109 lines (+95/-0) (has conflicts)
1 file modified
debian/changelog (+95/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/gnuradio/precise-201110200806
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+79924@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/gnuradio reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/gnuradio/precise-201110200806. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

18. By Steve Langasek

releasing version 3.2.2.dfsg-1.1ubuntu1

17. By Steve Langasek

Pass SWIG=swig2.0 to configure, since the binary name has changed.

16. By Steve Langasek

Merge 3.2.2.dfsg-1.1 from Debian unstable

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 2011-10-18 08:06:13 +0000
3+++ debian/changelog 2011-10-20 08:12:18 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 gnuradio (3.2.2.dfsg-1.1ubuntu1) precise; urgency=low
7
8 * Merge from Debian unstable, remaining changes:
9@@ -89,6 +90,100 @@
10
11 -- Kamal Mostafa <kamal@whence.com> Sat, 13 Mar 2010 07:46:01 -0800
12
13+=======
14+gnuradio (3.2.2.dfsg-1.1ubuntu1) precise; urgency=low
15+
16+ * Merge from Debian unstable, remaining changes:
17+ - Rebuild with python 2.7 as the python default.
18+ - config/gr_fortran.m4: call LT_LANG(Fortran 77) instead of the
19+ lower-level autoconf macro directly
20+ - update config/pkg.m4 to the current version and re-autoconf
21+ - gnuradio-core/src/tests/Makefile.am, pmt/src/lib/Makefile.am,
22+ mblock/src/lib/Makefile.am, gr-usrp/apps/Makefile.am: explicitly link
23+ all programs against libs that they use
24+ - Build-depend on swig2.0 instead of on swig
25+ - config/gr_lib64.m4: explicitly null out gr_libdir_suffix
26+ * Dropped changes, superseded in Debian:
27+ - add binary package dep for libusrp0, libusrp2-0: adduser
28+ - debian/rules clean: remove pre-built Qt moc files
29+ - Apply upstream patch to fix build failure with GCC-4.5.
30+ * Pass SWIG=swig2.0 to configure, since the binary name has changed.
31+
32+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 18 Oct 2011 23:49:06 -0700
33+
34+gnuradio (3.2.2.dfsg-1.1) unstable; urgency=low
35+
36+ * Non-maintainer upload.
37+ * s/usrp2::usrp2/usrp2/, closes: #591939
38+ * Depend on adduser, closes: #566564, #566565, #574231, #574209
39+ * Remove old .moc files, closes: #573759
40+ * Remove conflict with python-wxgtk2.6, closes: #582486
41+ * Fix typo s/fro/for/, closes: #556572
42+ * Switch to doxygen-latex in Build-Depends, closes: #616252
43+ * Don't ship .la files, closes: #621171
44+
45+ -- Luk Claes <luk@debian.org> Mon, 27 Jun 2011 19:37:38 +0200
46+
47+gnuradio (3.2.2.dfsg-1ubuntu7) oneiric; urgency=low
48+
49+ * gnuradio-core/src/tests/Makefile.am, pmt/src/lib/Makefile.am,
50+ mblock/src/lib/Makefile.am, gr-usrp/apps/Makefile.am: explicitly link
51+ all programs that they use directly, instead of relying on indirect
52+ linkage. LP: #770925.
53+ * Build-depend on swig2.0 instead of on swig: swig 1.3 outputs C++ code
54+ that g++ 4.6 isn't happy with.
55+ * config/gr_lib64.m4: explicitly null out gr_libdir_suffix; this is always
56+ wrong for us, and the autodetection now fails because /lib64 has become
57+ a real directory due to some requirements regarding handling the
58+ co-existence of multiarch and biarch packages.
59+
60+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 27 Aug 2011 20:49:41 +0000
61+
62+gnuradio (3.2.2.dfsg-1ubuntu6) natty; urgency=low
63+
64+ * config/gr_fortran.m4: call LT_LANG(Fortran 77) instead of the
65+ lower-level autoconf macro directly; otherwise we get a double-invocation
66+ that causes recent versions of autoconf to wind up with wrong language
67+ selection.
68+ * update config/pkg.m4 to the current version and re-autoconf, fixing
69+ a build failure from trying to find libraries not needed at all for
70+ dynamic linking. LP: #749214.
71+
72+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 16 Apr 2011 12:49:11 -0700
73+
74+gnuradio (3.2.2.dfsg-1ubuntu5) natty; urgency=low
75+
76+ * Apply upstream patch to fix build failure with GCC-4.5. LP: #687464.
77+
78+ -- Matthias Klose <doko@ubuntu.com> Mon, 13 Dec 2010 15:31:45 +0100
79+
80+gnuradio (3.2.2.dfsg-1ubuntu4) natty; urgency=low
81+
82+ * Rebuild with python 2.7 as the python default.
83+
84+ -- Matthias Klose <doko@ubuntu.com> Wed, 08 Dec 2010 15:03:58 +0000
85+
86+gnuradio (3.2.2.dfsg-1ubuntu3) maverick; urgency=low
87+
88+ * No-change rebuild to pick up the new j-a-c-k shlibs
89+
90+ -- Luke Yelavich <themuso@ubuntu.com> Wed, 21 Jul 2010 12:55:39 +0200
91+
92+gnuradio (3.2.2.dfsg-1ubuntu2) maverick; urgency=low
93+
94+ * Rebuild for the libdirectfb-1.2-0 -> libdirectfb-1.2-9 transition.
95+
96+ -- Loïc Minier <loic.minier@ubuntu.com> Mon, 31 May 2010 13:52:51 +0200
97+
98+gnuradio (3.2.2.dfsg-1ubuntu1) lucid; urgency=low
99+
100+ * Fix build for Ubuntu lucid (LP: #260406)
101+ - add binary package dep for libusrp0, libusrp2-0: adduser
102+ - debian/rules clean: remove pre-built Qt moc files
103+
104+ -- Kamal Mostafa <kamal@whence.com> Sat, 13 Mar 2010 07:46:01 -0800
105+
106+>>>>>>> MERGE-SOURCE
107 gnuradio (3.2.2.dfsg-1) unstable; urgency=low
108
109 * new upstream version, includes gcc4.3 support, closes: #474801, #524387

Subscribers

People subscribed via source and target branches

to all changes: