*** This bug is a duplicate of bug 609653 ***
https://bugs.launchpad.net/bugs/609653
** This bug has been marked a duplicate of bug 609653
Please merge ikiwiki 3.20100722(universe) from debian unstable(main)
--
Please merge ikiwiki(3.20091113ubuntu1) from debian testing
The diff still contains some cruft. When you run diffstat
ikiwiki_3.20091113ubuntu1.debdiff, you will see that there are some
backup (ending with ~) and .orig files.
When looking at the debian/changelog file, I see that you remove many
changelog entries from Debian. I merge from Debian should
I'm confused by this debdiff. It almost looks like it's backwards:
diff -Nru ikiwiki-3.20091113/CHANGELOG ikiwiki-3.14ubuntu1/CHANGELOG
--- ikiwiki-3.20091113/CHANGELOG 2009-11-14 02:52:03.0 +0100
+++ ikiwiki-3.14ubuntu1/CHANGELOG 2009-06-05 18:16:33.0 +0200
@@
Oh - also, if this /is/ a merge, though, it'd be helpful to see the
debdiff from the Debian version as well as from the Ubuntu version
--
Please merge ikiwiki(3.20091113ubuntu1) from debian testing
https://bugs.launchpad.net/bugs/499130
You received this bug notification because you are a member
Sorry, it's my fault. Soon i upload again.
--
Please merge ikiwiki(3.20091113ubuntu1) from debian testing
https://bugs.launchpad.net/bugs/499130
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
In the debian/control i corrected one error.
I replaced Merge from debian unstable with Merge from debian testing.
--
Please merge ikiwiki(3.20091113ubuntu1) from debian testing
https://bugs.launchpad.net/bugs/499130
You received this bug notification because you are a member of Ubuntu
Bugs,
Now is correct?
** Attachment added: ikiwiki_3.20091113ubuntu1.debdiff
http://launchpadlibrarian.net/37027382/ikiwiki_3.20091113ubuntu1.debdiff
--
Please merge ikiwiki(3.20091113ubuntu1) from debian testing
https://bugs.launchpad.net/bugs/499130
You received this bug notification because you
Not really, seems the package got via grab-merge.sh is somehow dirty.
try to restart from a clean debian package, and apply then the ubuntu patch.
thanks ;)
--
Please merge ikiwiki(3.20091113ubuntu1) from debian testing
https://bugs.launchpad.net/bugs/499130
You received this bug notification
In fact i thought that maybe grab-merge.sh had a problem.
I restarted from a clean debian package and finally i apply the ubuntu patch.
Now everything should be ok.
** Attachment added: ikiwiki_3.20091113ubuntu1.debdiff
http://launchpadlibrarian.net/37034535/ikiwiki_3.20091113ubuntu1.debdiff
