-CXXFLAGS = -g -Wall -Wno-narrowing
+CXXFLAGS = -g -Wall -Wno-error
You decide to remove -Wno-narrowing, following Debian Bug #667403 -Wno-
narrowing this change fixes FTBFS with gcc4.7. can you explain why you
remove it?
Anyway i cant patch debian version with your debdiff.
$ patch -p1 < ../debian-ubuntu.debdiff
patching file debian/rules
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- saving rejects to file debian/rules.rej
patching file debian/control
patching file debian/changelog
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 16.
2 out of 3 hunks FAILED -- saving rejects to file debian/changelog.rej
Following ubuntu merge wiki's process, you can use grab-merge tool from
ubuntu-dev-tools. many developers use it. Here is example grab-merge:
- grab-merge uisp
- cd uisp/uisp-20050207-4.2ubuntu1/
# start your work at here,
- ../merge-debuild
- cd ..
- debdiff uisp_20050207-4.2.dsc uisp_20050207-4ubuntu1.dsc >
debian-ubuntu.debdiff
- debdiff ubuntu-previous-changes.dsc uisp_20050207-4ubuntu1.dsc >
ubuntu-ubuntu.debdiff
- test and build it (you can use pbuilder/chroot or ppa)
then please upload both debdiff at here. You can contact me directly via
emails or irc if you still confused about uisp merge.
Thanks for your work!
** Changed in: uisp (Ubuntu)
Status: In Progress => Incomplete
** Changed in: uisp (Ubuntu)
Assignee: Mahyuddin Susanto (udienz) => (unassigned)
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1080868
Title:
Merge uisp 20050207-4.2ubuntu1 (universe) from Debian unstable (main)
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/uisp/+bug/1080868/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
