It appears that in version 1:1.0pre4-3, Debian has applied all of the changes that were present in Ubuntu. This means that there is no need to merge the package, we can simply sync it. Here is the changelog for 1:1.0pre4-3:
cedet (1:1.0pre4-3) unstable; urgency=low * debian/control: - Remove dpatch Build-Depends. - Add VCS-Browser and VCS-Git fields. - Bump Standards-Version to 3.7.3. - Bump dependencies so that we force the new semantic package to build properly (Closes: #412015). * debian/copyright: - Add copyright notices to silence lintian. * debian/eieio.examples: - Remove linemark.el. * debian/*.emacsen-(install|remove): - Use /usr/share/info rather than /usr/info. * debian/*-install.el: - List explicit paths to add to the load path while compiling, and prohibit Debian's normal load files from starting. This should prevent problems like loading a new version of the semantic package without first loading the packages that it depends on. It should help to future-proof us against bug reports to this effect. It will also provide a slight speed boost during compilation, and prohibits 3rd-party packages from messing up our build (Closes: #484667, #440893). * debian/patches: - Manage this using git. * debian/rules: - Remove use of dpatch in favor of a simple patch invocations. - Add "genpatches" command for the maintainer to call to generate the contents of debian/patches. - Fix lintian warning about binary-arch. - Don't remove linemark.el from /usr/share/emacs/site-lisp/eieio, at request of Étienne BERSAC. * debian/semantic.emacsen-install: - Don't compile semantic-example.el, since emacs-snapshot has issues with it. -- Michael W. Olson (GNU address) <[EMAIL PROTECTED]> Wed, 02 Jul 2008 22:41:16 -0700 ** Changed in: cedet (Ubuntu) Importance: Undecided => Wishlist Assignee: (unassigned) => Bhavani Shankar (bhavi) Status: Confirmed => Incomplete -- Please merge cedet-1.0pre4(universe) from debian unstable https://bugs.launchpad.net/bugs/255743 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs