|
|
54.
|
|
|
A very useful package to have installed when doing merges (or any Ubuntu packaging) is <application>devscripts</application>. If you do not have that already installed, install it before proceeding.
|
|
|
|
|
Ett väldigt användbart paket att ha installerat när du mergar (eller utför någon form av paketering i Ubuntu) är <application>devscripts</application>. Om du inte har det installerat redan, se till installera det innan du fortsätter.
|
|
Translated and reviewed by
Linnea Björk Timm
|
|
|
|
Located in
C/ubuntu.xml:241(para)
|
|
|
55.
|
|
|
By looking at the <phrase>Ubuntu</phrase> changelog you should be able to see which differences to expect between the Ubuntu package and the Debian package from which it was derived. For xcdroast, the <phrase>Ubuntu</phrase> changelog can be found at <ulink url="http://changelogs.ubuntu.com/changelogs/pool/universe/x/xcdroast/xcdroast_0.98+0alpha15-1.1ubuntu1/changelog"> changelogs.ubuntu.com</ulink>. It says that a .desktop file was fixed and properly installed to close a bug reported in <ulink url="https://launchpad.net/malone/bugs/2698">Malone</ulink>.
|
|
|
|
|
Genom att kolla på ändringsloggen för <phrase>Ubuntu</phrase> bör du kunna se vilka skillnader du bör se mellan Ubuntupaketet och Debianpaketet det är baserat på. För xcdroast går ändringsloggen för <phrase>Ubuntu</phrase> att hitta på <ulink url="http://changelogs.ubuntu.com/changelogs/pool/universe/x/xcdroast/xcdroast_0.98+0alpha15-1.1ubuntu1/changelog"> changelogs.ubuntu.com</ulink>. Där står det att en .desktop-fil fixades och installerades korrekt för att stänga en bugg i <ulink url="https://launchpad.net/malone/bugs/2698">Malone</ulink>.
|
|
Translated and reviewed by
Linnea Björk Timm
|
|
|
|
Located in
C/ubuntu.xml:245(para)
|
|
|
56.
|
|
|
Now inspect the actual changes in the source packages:
|
|
|
|
|
Inspektera nu de faktiska skillnaderna i källpakten:
|
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:254(para)
|
|
|
57.
|
|
|
debdiff xcdroast_0.98+0alpha15-1.1.dsc xcdroast_0.98+0alpha15-1.1ubuntu1.dsc | \
[tab]ubuntu.debdiff | less ubuntu.debdiff |
|
|
[tab] represents a tab character.
Please write it exactly the same way, [tab], in your
translation.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
debdiff xcdroast_0.98+0alpha15-1.1.dsc xcdroast_0.98+0alpha15-1.1ubuntu1.dsc | \
[tab]ubuntu.debdiff | less ubuntu.debdiff |
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:255(screen)
|
|
|
58.
|
|
|
The lines that start with - have been removed from the Debian package, and those that start with + have been added to the <phrase>Ubuntu</phrase> package.
|
|
|
|
|
Alla rader som börjar med - har tagits bort från Debianpaketet, och de som börjar med + har lagts till i <phrase>Ubuntu</phrase>-paketet.
|
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:259(para)
|
|
|
59.
|
|
|
The following is what we see:
|
|
|
|
|
Det här är vad vi ser:
|
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:261(para)
|
|
|
60.
|
|
|
In debian/rules install is being used instead of cp to install the xcdroast icon. Also, there is a new line installing the .desktop file.
|
|
|
|
|
I debian/rules används install istället för cp för att installera xcdroast-ikonen. Det finns även en ny rad som installerar .desktop-filen.
|
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:264(para)
|
|
|
61.
|
|
|
In debian/changelog the changes made are added to the changelog entry.
|
|
|
|
|
I debian/changelog består ändringarna av den tillagda ändringsloggsposten.
|
|
Translated and reviewed by
Linnea Björk Timm
|
|
|
|
Located in
C/ubuntu.xml:268(para)
|
|
|
62.
|
|
|
In debian/dirs usr/share/applications has been added for the install lines above to work properly.
|
|
|
|
|
I debian/dirs har usr/share/applications lagts till för att install-raderna ovan ska fungera som de ska.
|
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:271(para)
|
|
|
63.
|
|
|
xcdroast.desktop is added
|
|
|
|
|
xcdroast.desktop lägs till
|
|
Translated and reviewed by
Robin Sonefors
|
|
|
|
Located in
C/ubuntu.xml:275(para)
|
