--- /srv/reproducible-results/rbuild-debian/r-b-build.0dnrIIdC/b1/git-dpm_0.10.0-1.1_armhf.changes +++ /srv/reproducible-results/rbuild-debian/r-b-build.0dnrIIdC/b2/git-dpm_0.10.0-1.1_armhf.changes ├── Files │ @@ -1,2 +1,2 @@ │ │ - 4b826543eeb447014fa7698146c9461c 356104 vcs optional git-dpm_0.10.0-1.1_all.deb │ + 34e3d549b5d4789fb483e8e1c7a2027a 356060 vcs optional git-dpm_0.10.0-1.1_all.deb ├── git-dpm_0.10.0-1.1_all.deb │ ├── file list │ │ @@ -1,3 +1,3 @@ │ │ -rw-r--r-- 0 0 0 4 2021-01-03 12:42:28.000000 debian-binary │ │ -rw-r--r-- 0 0 0 1400 2021-01-03 12:42:28.000000 control.tar.xz │ │ --rw-r--r-- 0 0 0 354512 2021-01-03 12:42:28.000000 data.tar.xz │ │ +-rw-r--r-- 0 0 0 354468 2021-01-03 12:42:28.000000 data.tar.xz │ ├── control.tar.xz │ │ ├── control.tar │ │ │ ├── ./md5sums │ │ │ │ ├── ./md5sums │ │ │ │ │┄ Files differ │ ├── data.tar.xz │ │ ├── data.tar │ │ │ ├── file list │ │ │ │ @@ -28,13 +28,13 @@ │ │ │ │ -rw-r--r-- 0 root (0) root (0) 12535 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/image-rebased.png │ │ │ │ -rw-r--r-- 0 root (0) root (0) 11914 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/image-rebaserecorded.png │ │ │ │ -rw-r--r-- 0 root (0) root (0) 10382 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/image-tag.png │ │ │ │ -rw-r--r-- 0 root (0) root (0) 9759 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/image-updated.png │ │ │ │ -rw-r--r-- 0 root (0) root (0) 10934 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/image-upstreamrecorded.png │ │ │ │ -rw-r--r-- 0 root (0) root (0) 8025 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/index.html │ │ │ │ -rw-r--r-- 0 root (0) root (0) 65557 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/manpage.html │ │ │ │ --rw-r--r-- 0 root (0) root (0) 79259 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/manpage.pdf │ │ │ │ +-rw-r--r-- 0 root (0) root (0) 79267 2021-01-03 12:42:28.000000 ./usr/share/doc/git-dpm/manpage.pdf │ │ │ │ drwxr-xr-x 0 root (0) root (0) 0 2021-01-03 12:42:28.000000 ./usr/share/doc-base/ │ │ │ │ -rw-r--r-- 0 root (0) root (0) 216 2019-02-03 12:33:53.000000 ./usr/share/doc-base/git-dpm.git-dpm │ │ │ │ drwxr-xr-x 0 root (0) root (0) 0 2021-01-03 12:42:28.000000 ./usr/share/man/ │ │ │ │ drwxr-xr-x 0 root (0) root (0) 0 2021-01-03 12:42:28.000000 ./usr/share/man/man1/ │ │ │ │ -rw-r--r-- 0 root (0) root (0) 13743 2021-01-03 12:42:28.000000 ./usr/share/man/man1/git-dpm.1.gz │ │ │ ├── ./usr/share/doc/git-dpm/manpage.pdf │ │ │ │ ├── dumppdf -at {} │ │ │ │ │ @@ -90,15 +90,15 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm [(GIT)74.0076(-DPM)]TJ /R11828152 10 Tf 41.2598 0 Td 158.23 Tw (\(1\) GIT)Tj 188.13 0 Td (-DPM)Tj /R11500264 10 Tf 185.71 0 Td [(GIT)74.0088(-DPM)]TJ /R11828152 10 Tf 41.2598 0 Td (\(1\))Tj -0.219 Tc /R12164640 10.95 Tf -456.34 -36 Td (NA)Tj 0 Tc 15.593 0 Td (ME)Tj /R11828152 10 Tf 20.407 -12 Td 0 Tw (git-dpm - Debian packages in git manager)Tj /R12164640 10.95 Tf -36 -16.8 Td (SYNOPSIS)Tj /R12164640 10 Tf 36 -12 Td (git-dpm --help)Tj 24 TL (git-dpm)' /R11828152 10 Tf 36.3898 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td (options)Tj /R11828152 10 Tf 31.95 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td (command)Tj /R11828152 10 Tf 41.3801 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td [(per-command-options and -ar)37.0068(guments)]TJ /R11828152 10 Tf 156 0 Td (])Tj /R12164640 10.95 Tf -319.21 -16.8 Td (DESCRIPTION)Tj /R11828152 10 Tf 36 -12 Td [(Git-dpm is a tool to handle a Debian source package in a git repository)64.9854(.)]TJ 5.838 Tw (Each project contains three branches, a Debian branch \()' /R12164640 10 Tf 269.684 0 Td (master)Tj /R11828152 10 Tf 29.4301 0 Td (/)Tj /R11500264 10 Tf 2.78008 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\), a patched branch)Tj -338.404 -12 Td (\()Tj /R12164640 10 Tf 3.33008 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (/)Tj /R12164640 10 Tf 2.78008 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 3.466 Tc /R11828152 10 Tf 36.5098 0 Td (\)a)Tj 0 Tc 11.2359 0 Td 0.966 Tw (nd an upstream branch \()Tj /R12164640 10 Tf 100.504 0 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 40.3699 0 Td (/)Tj /R12164640 10 Tf 2.78008 0 Td [(upstr)18(eam-)]TJ /R11500264 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ 3.466 Tc /R11828152 10 Tf 36.5098 0 Td (\)a)Tj 0 Tc 11.2359 0 Td (nd)Tj /R12164640 10 Tf 13.4672 0 Td (git-dpm)Tj /R11828152 10 Tf 37.357 0 Td (helps)Tj -410.889 -12 Td 0 Tw (you store the information in there so you ha)Tj -0.15 Tc 174.78 0 Td 0.3 Tw (ve y)Tj 0 Tc 16.7898 0 Td 0 Tw [(our changes e)14.9927(xportable as quilt series.)]TJ -191.57 -24 Td 0.491 Tw (Git-dpm will guess the other tw)Tj 2.991 Tc 129.295 0 Td (ob)Tj 0 Tc 12.991 0 Td (ranches based on the branch it sees.)Tj 150.896 0 Td 0.49 Tw (\(Most commands act based on the)Tj -293.182 -12 Td 0.54 Tw (current HEAD, i.e. what branch you ha)Tj -0.15 Tc 159.94 0 Td 0.84 Tw (ve c)Tj 0 Tc 16.7699 0 Td 0.54 Tw [(urrently check)10.0073(ed out, though some as e.g.)]TJ /R12164640 10 Tf 172.54 0 Td (status)Tj /R11828152 10 Tf 28.0398 0 Td (allo)Tj 14.75 0 Td (ws an op-)Tj -392.039 -12 Td 0.29 Tw [(tional ar)17.9846(gument instead\).)-528.984(So for e)15.0146(xample, if you are in branch)]TJ /R12164640 10 Tf 254.48 0 Td (master)Tj 2.79 Tc /R11828152 10 Tf 29.4301 0 Td (,g)Tj 0 Tc 10.2898 0 Td (it-dpm assumes the corresponding)Tj -294.2 -12 Td 1.305 Tw (upstream branch is called)Tj /R12164640 10 Tf 109.64 0 Td [(upstr)18(eam)]TJ 6.305 Tc /R11828152 10 Tf 40.3699 0 Td (.I)Tj 3.805 Tc 12.1352 0 Td (fy)Tj 0 Tc 12.1352 0 Td (ou are in branch)Tj /R12164640 10 Tf 72.4199 0 Td [(upstr)18(eam-something)]TJ 3.805 Tc /R11828152 10 Tf 87.5898 0 Td [(,i)380.483(ta)]TJ 0 Tc 20.1102 0 Td (ssumes the Debian)Tj -354.4 -12 Td 0 Tw (branch is called)Tj /R12164640 10 Tf 65.2602 0 Td (something)Tj /R11828152 10 Tf 43.8898 0 Td (.)Tj -109.15 -24 Td 0.36 Tw (Note that most commands may switch to another branch automatically)Tj 2.86 Tc 285.06 0 Td (,p)Tj 0 Tc 10.3602 0 Td (artly because it is easier to imple-)Tj -295.42 -12 Td 0 Tw [(ment that w)10.0073(ay and hopefully so one does not need to switch branches manually so often.)]TJ /R12164640 10.95 Tf -36 -28.8 Td (SHOR)Tj 2.738 Tc 30.5941 0 Td (TE)Tj 0 Tc 17.3453 0 Td (XPLAN)Tj -1.04 Tc 37.493 0 Td (AT)Tj 0 Tc 14.1695 0 Td (ION OF THE BRANCHES)Tj /R11828152 10 Tf -63.602 -12 Td (the upstream branch \()Tj /R12164640 10 Tf 86.9199 0 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 40.3699 0 Td (|)Tj /R12164640 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R11500264 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\))Tj -173.5 -12 Td 0.135 Tw (This branch contains the upstream sources.)Tj 178 0 Td 0.136 Tw (Its contents need to be equal enough to the contents in)Tj -178 -12 Td 0 Tw (your upstream tarball.)Tj -36 -28.8 Td (the patched branch \()Tj /R12164640 10 Tf 81.3602 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\))Tj -154.98 -12 Td 0.076 Tw (This branch contains your patches to the upstream source.)Tj 237.584 0 Td (Ev)Tj 10.9602 0 Td 0.075 Tw (ery commit will be stored as a single)Tj -248.544 -12 Td 0 Tw (patch in the resulting package.)Tj 0.211 Tw (Most of the time it will not e)' 116.057 0 Td 0.212 Tw [(xist as a branch kno)24.9878(wn to)]TJ /R12164640 10 Tf 105.452 0 Td (git)Tj 2.712 Tc /R11828152 10 Tf 11.1102 0 Td (,b)Tj 0 Tc 10.0121 0 Td (ut only as some point in the history of)Tj -242.631 -12 Td 0.1 Tw (the Debian branch and possibly as tag for published v)Tj 215.44 0 Td (ersions.)Tj /R12164640 10 Tf 35.9289 0 Td (Git-dpm)Tj /R11828152 10 Tf 39.2691 0 Td 0.099 Tw (will create it when needed)Tj -290.638 -12 Td 0 Tw (and remo)Tj -0.15 Tc 37.3398 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td 0 Tw (he branch when no longer needed.)Tj -0.8 Tc -51.9098 -36 Td 1.735 Tw (To h)Tj 0 Tc 17.9449 0 Td 0.135 Tw (elp git generate a linear patch series, this should ideal be a linear chain of commits, whose de-)Tj -17.9449 -12 Td 0 Tw (scription are helpful for other people.)Tj T*[(As this branch is re)14.9854(gularly rebased, you should not publish it.)]TJ -36 -28.8 Td (the Debian branch \()Tj /R12164640 10 Tf 79.1398 0 Td (master)Tj /R11828152 10 Tf 29.4301 0 Td (|)Tj /R11500264 10 Tf 2 0 Td [(whate)15.0146(ver)]TJ /R12164640 10 Tf 36.5098 0 Td (\))Tj /R11828152 10 Tf -111.08 -12 Td (This is the primary branch.)Tj (This branch contains the)' /R12164640 10 Tf 100.54 0 Td (debian/)Tj /R11828152 10 Tf 34.1801 0 Td [(directory and has the patched branch mer)18.0078(ged in.)]TJ -134.72 -24 Td [(Ev)14.9841(ery change not in)]TJ /R12164640 10 Tf 82.6102 0 Td (debian/)Tj /R11828152 10 Tf 31.6801 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (.git)Tj /R11500264 10 Tf 13.6102 0 Td (*)Tj /R11828152 10 Tf 7.5 0 Td (or deleting Œles must be done in the patched branch.)Tj /R12164640 10.95 Tf -212.4 -28.8 Td (EXAMPLES)Tj /R11828152 10 Tf 36 -12 Td [(Let's start with some e)15(xamples:)]TJ -36 -67.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (1)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm [(GIT)74.0076(-DPM)]TJ /R35954040 10 Tf 41.2598 0 Td 158.23 Tw (\(1\) GIT)Tj 188.13 0 Td (-DPM)Tj /R35626152 10 Tf 185.71 0 Td [(GIT)74.0088(-DPM)]TJ /R35954040 10 Tf 41.2598 0 Td (\(1\))Tj -0.219 Tc /R36290528 10.95 Tf -456.34 -36 Td (NA)Tj 0 Tc 15.593 0 Td (ME)Tj /R35954040 10 Tf 20.407 -12 Td 0 Tw (git-dpm - Debian packages in git manager)Tj /R36290528 10.95 Tf -36 -16.8 Td (SYNOPSIS)Tj /R36290528 10 Tf 36 -12 Td (git-dpm --help)Tj 24 TL (git-dpm)' /R35954040 10 Tf 36.3898 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td (options)Tj /R35954040 10 Tf 31.95 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td (command)Tj /R35954040 10 Tf 41.3801 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td [(per-command-options and -ar)37.0068(guments)]TJ /R35954040 10 Tf 156 0 Td (])Tj /R36290528 10.95 Tf -319.21 -16.8 Td (DESCRIPTION)Tj /R35954040 10 Tf 36 -12 Td [(Git-dpm is a tool to handle a Debian source package in a git repository)64.9854(.)]TJ 5.838 Tw (Each project contains three branches, a Debian branch \()' /R36290528 10 Tf 269.684 0 Td (master)Tj /R35954040 10 Tf 29.4301 0 Td (/)Tj /R35626152 10 Tf 2.78008 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\), a patched branch)Tj -338.404 -12 Td (\()Tj /R36290528 10 Tf 3.33008 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (/)Tj /R36290528 10 Tf 2.78008 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 3.466 Tc /R35954040 10 Tf 36.5098 0 Td (\)a)Tj 0 Tc 11.2359 0 Td 0.966 Tw (nd an upstream branch \()Tj /R36290528 10 Tf 100.504 0 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 40.3699 0 Td (/)Tj /R36290528 10 Tf 2.78008 0 Td [(upstr)18(eam-)]TJ /R35626152 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ 3.466 Tc /R35954040 10 Tf 36.5098 0 Td (\)a)Tj 0 Tc 11.2359 0 Td (nd)Tj /R36290528 10 Tf 13.4672 0 Td (git-dpm)Tj /R35954040 10 Tf 37.357 0 Td (helps)Tj -410.889 -12 Td 0 Tw (you store the information in there so you ha)Tj -0.15 Tc 174.78 0 Td 0.3 Tw (ve y)Tj 0 Tc 16.7898 0 Td 0 Tw [(our changes e)14.9927(xportable as quilt series.)]TJ -191.57 -24 Td 0.491 Tw (Git-dpm will guess the other tw)Tj 2.991 Tc 129.295 0 Td (ob)Tj 0 Tc 12.991 0 Td (ranches based on the branch it sees.)Tj 150.896 0 Td 0.49 Tw (\(Most commands act based on the)Tj -293.182 -12 Td 0.54 Tw (current HEAD, i.e. what branch you ha)Tj -0.15 Tc 159.94 0 Td 0.84 Tw (ve c)Tj 0 Tc 16.7699 0 Td 0.54 Tw [(urrently check)10.0073(ed out, though some as e.g.)]TJ /R36290528 10 Tf 172.54 0 Td (status)Tj /R35954040 10 Tf 28.0398 0 Td (allo)Tj 14.75 0 Td (ws an op-)Tj -392.039 -12 Td 0.29 Tw [(tional ar)17.9846(gument instead\).)-528.984(So for e)15.0146(xample, if you are in branch)]TJ /R36290528 10 Tf 254.48 0 Td (master)Tj 2.79 Tc /R35954040 10 Tf 29.4301 0 Td (,g)Tj 0 Tc 10.2898 0 Td (it-dpm assumes the corresponding)Tj -294.2 -12 Td 1.305 Tw (upstream branch is called)Tj /R36290528 10 Tf 109.64 0 Td [(upstr)18(eam)]TJ 6.305 Tc /R35954040 10 Tf 40.3699 0 Td (.I)Tj 3.805 Tc 12.1352 0 Td (fy)Tj 0 Tc 12.1352 0 Td (ou are in branch)Tj /R36290528 10 Tf 72.4199 0 Td [(upstr)18(eam-something)]TJ 3.805 Tc /R35954040 10 Tf 87.5898 0 Td [(,i)380.483(ta)]TJ 0 Tc 20.1102 0 Td (ssumes the Debian)Tj -354.4 -12 Td 0 Tw (branch is called)Tj /R36290528 10 Tf 65.2602 0 Td (something)Tj /R35954040 10 Tf 43.8898 0 Td (.)Tj -109.15 -24 Td 0.36 Tw (Note that most commands may switch to another branch automatically)Tj 2.86 Tc 285.06 0 Td (,p)Tj 0 Tc 10.3602 0 Td (artly because it is easier to imple-)Tj -295.42 -12 Td 0 Tw [(ment that w)10.0073(ay and hopefully so one does not need to switch branches manually so often.)]TJ /R36290528 10.95 Tf -36 -28.8 Td (SHOR)Tj 2.738 Tc 30.5941 0 Td (TE)Tj 0 Tc 17.3453 0 Td (XPLAN)Tj -1.04 Tc 37.493 0 Td (AT)Tj 0 Tc 14.1695 0 Td (ION OF THE BRANCHES)Tj /R35954040 10 Tf -63.602 -12 Td (the upstream branch \()Tj /R36290528 10 Tf 86.9199 0 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 40.3699 0 Td (|)Tj /R36290528 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R35626152 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\))Tj -173.5 -12 Td 0.135 Tw (This branch contains the upstream sources.)Tj 178 0 Td 0.136 Tw (Its contents need to be equal enough to the contents in)Tj -178 -12 Td 0 Tw (your upstream tarball.)Tj -36 -28.8 Td (the patched branch \()Tj /R36290528 10 Tf 81.3602 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\))Tj -154.98 -12 Td 0.076 Tw (This branch contains your patches to the upstream source.)Tj 237.584 0 Td (Ev)Tj 10.9602 0 Td 0.075 Tw (ery commit will be stored as a single)Tj -248.544 -12 Td 0 Tw (patch in the resulting package.)Tj 0.211 Tw (Most of the time it will not e)' 116.057 0 Td 0.212 Tw [(xist as a branch kno)24.9878(wn to)]TJ /R36290528 10 Tf 105.452 0 Td (git)Tj 2.712 Tc /R35954040 10 Tf 11.1102 0 Td (,b)Tj 0 Tc 10.0121 0 Td (ut only as some point in the history of)Tj -242.631 -12 Td 0.1 Tw (the Debian branch and possibly as tag for published v)Tj 215.44 0 Td (ersions.)Tj /R36290528 10 Tf 35.9289 0 Td (Git-dpm)Tj /R35954040 10 Tf 39.2691 0 Td 0.099 Tw (will create it when needed)Tj -290.638 -12 Td 0 Tw (and remo)Tj -0.15 Tc 37.3398 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td 0 Tw (he branch when no longer needed.)Tj -0.8 Tc -51.9098 -36 Td 1.735 Tw (To h)Tj 0 Tc 17.9449 0 Td 0.135 Tw (elp git generate a linear patch series, this should ideal be a linear chain of commits, whose de-)Tj -17.9449 -12 Td 0 Tw (scription are helpful for other people.)Tj T*[(As this branch is re)14.9854(gularly rebased, you should not publish it.)]TJ -36 -28.8 Td (the Debian branch \()Tj /R36290528 10 Tf 79.1398 0 Td (master)Tj /R35954040 10 Tf 29.4301 0 Td (|)Tj /R35626152 10 Tf 2 0 Td [(whate)15.0146(ver)]TJ /R36290528 10 Tf 36.5098 0 Td (\))Tj /R35954040 10 Tf -111.08 -12 Td (This is the primary branch.)Tj (This branch contains the)' /R36290528 10 Tf 100.54 0 Td (debian/)Tj /R35954040 10 Tf 34.1801 0 Td [(directory and has the patched branch mer)18.0078(ged in.)]TJ -134.72 -24 Td [(Ev)14.9841(ery change not in)]TJ /R36290528 10 Tf 82.6102 0 Td (debian/)Tj /R35954040 10 Tf 31.6801 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (.git)Tj /R35626152 10 Tf 13.6102 0 Td (*)Tj /R35954040 10 Tf 7.5 0 Td (or deleting Œles must be done in the patched branch.)Tj /R36290528 10.95 Tf -212.4 -28.8 Td (EXAMPLES)Tj /R35954040 10 Tf 36 -12 Td [(Let's start with some e)15(xamples:)]TJ -36 -67.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (1)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2329 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ @@ -634,19 +634,19 @@ │ │ │ │ │ FontFile3 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -683,29 +683,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -420.34 -36 Td 0 Tw (Checking out a project)Tj 36 -12 Td (First get the master branch:)Tj /R12164640 10 Tf 2.5 -12 Td (git clone)Tj /R11500264 10 Tf 38.3301 0 Td (URL)Tj /R11828152 10 Tf -40.8301 -24 Td (Then create upstream branch and see if the .orig.tar is ready:)Tj /R12164640 10 Tf 2.5 -12 Td [(git-dpm pr)17.9846(epar)17.9834(e)]TJ /R11828152 10 Tf -2.5 -24 Td (Create the patched branch and check it out:)Tj /R12164640 10 Tf 2.5 -12 Td [(git-dpm check)14.9927(out-patched)]TJ /R11828152 10 Tf -2.5 -24 Td (Do some changes, apply some patches, commit them..)Tj /R11500264 10 Tf 2.5 -12 Td (...)Tj /R12164640 10 Tf 12 TL (git commit)' /R11828152 10 Tf -2.5 -24 Td 0.455 Tw [(If your modiŒcation Œx)15(es a pre)]TJ 126.025 0 Td 0.454 Tw (vious change \(and that is not the last commit, otherwise you could)Tj -126.025 -12 Td (ha)Tj -0.15 Tc 9.23984 0 Td 0.3 Tw (ve u)Tj 0 Tc 16.7898 0 Td 0 Tw [(sed --amend\), you might w)10.0146(ant to squash those tw)]TJ 2.5 Tc 196.17 0 Td (oc)Tj 0 Tc 11.9398 0 Td (ommits into one, so use:)Tj /R12164640 10 Tf -231.639 -12 Td [(git r)18.0078(ebase -i upstr)18.0151(eam)]TJ /R11828152 10 Tf -2.5 -24 Td 0.198 Tw (Then you w)Tj 48.066 0 Td 0.199 Tw (ant to get those changes into the Debian branch and the ne)Tj 2.699 Tc 234.949 0 Td (wp)Tj 0 Tc 14.9191 0 Td (atch Œles created \(which)Tj -297.934 -12 Td 0.428 Tw (you can do using)Tj /R12164640 10 Tf 72.2621 0 Td (git-dpm update-patches)Tj /R11828152 10 Tf 101.818 0 Td 0.427 Tw [(\), b)19.9976(ut you most lik)9.99023(ely w)9.98047(ant to also document what you)]TJ -174.08 -12 Td 0 Tw (did in the changelog, so all in one step:)Tj /R12164640 10 Tf 2.5 -12 Td (git-dpm dch -- -i)Tj /R11828152 10 Tf -2.5 -24 Td (Perhaps change something in the Debian packaging:)Tj /R11500264 10 Tf 2.5 -12 Td (...)Tj /R12164640 10 Tf (git commit -a)' /R11828152 10 Tf -2.5 -24 Td (Then push the whole thing back:)Tj /R12164640 10 Tf 2.5 -12 Td (git push)Tj /R11828152 10 Tf -38.5 -28.8 Td (Switching to a ne)Tj 2.5 Tc 69.4699 0 Td (wu)Tj 0 Tc 14.7199 0 Td [(pstream v)14.9854(ersion)]TJ -48.1898 -12 Td 0.682 Tw (Get a ne)Tj 3.182 Tc 34.434 0 Td (w.)Tj 0 Tc 12.902 0 Td [(orig.tar Œle.)-568.191(Either upgrade your upstream branch to the contents of that Œle and call)]TJ /R12164640 10 Tf -47.3359 -12 Td 0 Tw [(git-dpm r)18(ecord-new-upstr)17.9834(eam ../)]TJ /R11500264 10 Tf 139.06 0 Td [(ne)15.0146(w-stuf)18.0078(f)]TJ /R12164640 10 Tf 36.3398 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ /R11828152 10 Tf 48.2797 0 Td (or tell git-dpm to import and record it:)Tj /R12164640 10 Tf -221.18 -12 Td [(git-dpm import-new-upstr)17.9834(eam --r)18.0151(ebase ../)]TJ /R11500264 10 Tf 177.11 0 Td [(ne)15.0146(w-stuf)18.0078(f)]TJ /R12164640 10 Tf 36.3398 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ /R11828152 10 Tf -215.95 -24 Td 0.423 Tw (This will rebase the patched branch to the ne)Tj 2.922 Tc 181.984 0 Td (wu)Tj 0 Tc 15.1422 0 Td 0.422 Tw (pstream branch, perhaps you will need to resolv)Tj 194.434 0 Td (e)Tj -391.56 -12 Td 0 Tw (some conicts:)Tj /R11500264 10 Tf 2.5 -12 Td (vim ...)Tj /R12164640 10 Tf (git add)' -0.37 Tc /R11500264 10 Tf 32.2301 0 Td (re)Tj 0 Tc 7.96016 0 Td (solved Œles)Tj /R12164640 10 Tf -40.1902 -12 Td [(git r)18.0078(ebase --continue)]TJ /R11828152 10 Tf -2.5 -24 Td (After rebase is run \(with some luck e)Tj -0.15 Tc 147.77 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.993(nt)]TJ 0 Tc 20.5602 0 Td (he Œrst try\):)Tj /R12164640 10 Tf -175.12 -12 Td (git-dpm dch -- -v)Tj /R11500264 10 Tf 74.4398 0 Td [(ne)15.0146(wupstr)36.9849(eam)]TJ /R12164640 10 Tf 52.8102 0 Td [(-1 "new upstr)18(eam v)10.0073(ersion")]TJ -1.1 Tc /R11828152 10 Tf -129.75 -24 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (uc)Tj 0 Tc 11.9398 0 Td (ould ha)Tj -0.15 Tc 29.5199 0 Td 0.3 Tw (ve a)Tj 0 Tc 16.2301 0 Td 0 Tw (lso done the last step in three by:)Tj /R12164640 10 Tf -66.3098 -12 Td (git-dpm update-patches)Tj (dch -- -v)' /R11500264 10 Tf 38.05 0 Td [(ne)15.0159(wupstr)36.9849(eam)]TJ /R12164640 10 Tf 52.8102 0 Td [(-1 "new upstr)18(eam v)10.0073(ersion")]TJ -90.8602 -12 Td (git commit --amend -a)Tj /R11828152 10 Tf -2.5 -24 Td (Do other debian/ changes:)Tj /R11500264 10 Tf 2.5 -12 Td (...)Tj /R12164640 10 Tf (git commit -a)' /R11828152 10 Tf -2.5 -24 Td (Then push the whole thing back:)Tj -72 -43.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (2)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -420.34 -36 Td 0 Tw (Checking out a project)Tj 36 -12 Td (First get the master branch:)Tj /R36290528 10 Tf 2.5 -12 Td (git clone)Tj /R35626152 10 Tf 38.3301 0 Td (URL)Tj /R35954040 10 Tf -40.8301 -24 Td (Then create upstream branch and see if the .orig.tar is ready:)Tj /R36290528 10 Tf 2.5 -12 Td [(git-dpm pr)17.9846(epar)17.9834(e)]TJ /R35954040 10 Tf -2.5 -24 Td (Create the patched branch and check it out:)Tj /R36290528 10 Tf 2.5 -12 Td [(git-dpm check)14.9927(out-patched)]TJ /R35954040 10 Tf -2.5 -24 Td (Do some changes, apply some patches, commit them..)Tj /R35626152 10 Tf 2.5 -12 Td (...)Tj /R36290528 10 Tf 12 TL (git commit)' /R35954040 10 Tf -2.5 -24 Td 0.455 Tw [(If your modiŒcation Œx)15(es a pre)]TJ 126.025 0 Td 0.454 Tw (vious change \(and that is not the last commit, otherwise you could)Tj -126.025 -12 Td (ha)Tj -0.15 Tc 9.23984 0 Td 0.3 Tw (ve u)Tj 0 Tc 16.7898 0 Td 0 Tw [(sed --amend\), you might w)10.0146(ant to squash those tw)]TJ 2.5 Tc 196.17 0 Td (oc)Tj 0 Tc 11.9398 0 Td (ommits into one, so use:)Tj /R36290528 10 Tf -231.639 -12 Td [(git r)18.0078(ebase -i upstr)18.0151(eam)]TJ /R35954040 10 Tf -2.5 -24 Td 0.198 Tw (Then you w)Tj 48.066 0 Td 0.199 Tw (ant to get those changes into the Debian branch and the ne)Tj 2.699 Tc 234.949 0 Td (wp)Tj 0 Tc 14.9191 0 Td (atch Œles created \(which)Tj -297.934 -12 Td 0.428 Tw (you can do using)Tj /R36290528 10 Tf 72.2621 0 Td (git-dpm update-patches)Tj /R35954040 10 Tf 101.818 0 Td 0.427 Tw [(\), b)19.9976(ut you most lik)9.99023(ely w)9.98047(ant to also document what you)]TJ -174.08 -12 Td 0 Tw (did in the changelog, so all in one step:)Tj /R36290528 10 Tf 2.5 -12 Td (git-dpm dch -- -i)Tj /R35954040 10 Tf -2.5 -24 Td (Perhaps change something in the Debian packaging:)Tj /R35626152 10 Tf 2.5 -12 Td (...)Tj /R36290528 10 Tf (git commit -a)' /R35954040 10 Tf -2.5 -24 Td (Then push the whole thing back:)Tj /R36290528 10 Tf 2.5 -12 Td (git push)Tj /R35954040 10 Tf -38.5 -28.8 Td (Switching to a ne)Tj 2.5 Tc 69.4699 0 Td (wu)Tj 0 Tc 14.7199 0 Td [(pstream v)14.9854(ersion)]TJ -48.1898 -12 Td 0.682 Tw (Get a ne)Tj 3.182 Tc 34.434 0 Td (w.)Tj 0 Tc 12.902 0 Td [(orig.tar Œle.)-568.191(Either upgrade your upstream branch to the contents of that Œle and call)]TJ /R36290528 10 Tf -47.3359 -12 Td 0 Tw [(git-dpm r)18(ecord-new-upstr)17.9834(eam ../)]TJ /R35626152 10 Tf 139.06 0 Td [(ne)15.0146(w-stuf)18.0078(f)]TJ /R36290528 10 Tf 36.3398 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ /R35954040 10 Tf 48.2797 0 Td (or tell git-dpm to import and record it:)Tj /R36290528 10 Tf -221.18 -12 Td [(git-dpm import-new-upstr)17.9834(eam --r)18.0151(ebase ../)]TJ /R35626152 10 Tf 177.11 0 Td [(ne)15.0146(w-stuf)18.0078(f)]TJ /R36290528 10 Tf 36.3398 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ /R35954040 10 Tf -215.95 -24 Td 0.423 Tw (This will rebase the patched branch to the ne)Tj 2.922 Tc 181.984 0 Td (wu)Tj 0 Tc 15.1422 0 Td 0.422 Tw (pstream branch, perhaps you will need to resolv)Tj 194.434 0 Td (e)Tj -391.56 -12 Td 0 Tw (some conicts:)Tj /R35626152 10 Tf 2.5 -12 Td (vim ...)Tj /R36290528 10 Tf (git add)' -0.37 Tc /R35626152 10 Tf 32.2301 0 Td (re)Tj 0 Tc 7.96016 0 Td (solved Œles)Tj /R36290528 10 Tf -40.1902 -12 Td [(git r)18.0078(ebase --continue)]TJ /R35954040 10 Tf -2.5 -24 Td (After rebase is run \(with some luck e)Tj -0.15 Tc 147.77 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.993(nt)]TJ 0 Tc 20.5602 0 Td (he Œrst try\):)Tj /R36290528 10 Tf -175.12 -12 Td (git-dpm dch -- -v)Tj /R35626152 10 Tf 74.4398 0 Td [(ne)15.0146(wupstr)36.9849(eam)]TJ /R36290528 10 Tf 52.8102 0 Td [(-1 "new upstr)18(eam v)10.0073(ersion")]TJ -1.1 Tc /R35954040 10 Tf -129.75 -24 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (uc)Tj 0 Tc 11.9398 0 Td (ould ha)Tj -0.15 Tc 29.5199 0 Td 0.3 Tw (ve a)Tj 0 Tc 16.2301 0 Td 0 Tw (lso done the last step in three by:)Tj /R36290528 10 Tf -66.3098 -12 Td (git-dpm update-patches)Tj (dch -- -v)' /R35626152 10 Tf 38.05 0 Td [(ne)15.0159(wupstr)36.9849(eam)]TJ /R36290528 10 Tf 52.8102 0 Td [(-1 "new upstr)18(eam v)10.0073(ersion")]TJ -90.8602 -12 Td (git commit --amend -a)Tj /R35954040 10 Tf -2.5 -24 Td (Do other debian/ changes:)Tj /R35626152 10 Tf 2.5 -12 Td (...)Tj /R36290528 10 Tf (git commit -a)' /R35954040 10 Tf -2.5 -24 Td (Then push the whole thing back:)Tj -72 -43.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (2)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 1639 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -744,20 +744,20 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -381.84 -36 Td 0 Tw (git push)Tj /R11828152 10 Tf -38.5 -28.8 Td (Creating a ne)Tj 2.5 Tc 53.0699 0 Td (wp)Tj 0 Tc 14.7199 0 Td (roject)Tj -31.7898 -12 Td (Create an)Tj /R12164640 10 Tf 40.5398 0 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 42.8699 0 Td (\(or)Tj /R12164640 10 Tf 14.1602 0 Td [(upstr)18(eam-)]TJ /R11500264 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ 2.5 Tc /R11828152 10 Tf 36.5098 0 Td (\)b)Tj 0 Tc 10.8301 0 Td (ranch containing the contents of your orig.tar Œle:)Tj /R12164640 10 Tf -186.11 -12 Td (tar -xvf)Tj -0.2 Tc /R11500264 10 Tf 34.4301 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj ET Q /R21 gs 4 w 1 J 1 j 0 G 2140.25 7026.25 m 2190.25 7026.25 l S q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 219.05 705.09 Tm (0)Tj /R12164640 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ -77.55 -12 Td (cd)Tj -0.2 Tc /R11500264 10 Tf 12.5 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R12164640 10 Tf 24.4398 0 Td (-)Tj /R11500264 10 Tf 3.33008 0 Td (0)Tj /R12164640 10 Tf -48.95 -12 Td (git init)Tj 12 TL (git add .)' (git commit -m "import)' -0.2 Tc /R11500264 10 Tf 99.9699 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R12164640 10 Tf 24.4398 0 Td (_)Tj /R11500264 10 Tf 5 0 Td (0)Tj /R12164640 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz")]TJ -143.09 -12 Td [(git check)15(out -b upstr)17.9932(eam-unstable)]TJ -1.1 Tc /R11828152 10 Tf -2.5 -24 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (um)Tj 0 Tc 15.2801 0 Td [(ight w)9.99268(ant to use pristine tar to store your tar:)]TJ /R12164640 10 Tf -23.9 -12 Td (pristine-tar commit ../)Tj -0.2 Tc /R11500264 10 Tf 93.8699 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R12164640 10 Tf 24.4398 0 Td (_)Tj /R11500264 10 Tf 5 0 Td (0)Tj /R12164640 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz upstr)18.0151(eam-unstable)]TJ /R11828152 10 Tf -139.49 -24 Td (Then let git-dpm kno)Tj 2.5 Tc 84.4699 0 Td (ww)Tj 0 Tc 16.9398 0 Td (hat tarball your upstream branch belongs to:)Tj /R12164640 10 Tf -98.9098 -12 Td (git-dpm init ../)Tj -0.2 Tc /R11500264 10 Tf 61.1199 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R12164640 10 Tf 24.4398 0 Td (_)Tj /R11500264 10 Tf 5 0 Td (0)Tj /R12164640 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ /R11828152 10 Tf -106.74 -24 Td 0.656 Tw (Note that since you were in)Tj /R12164640 10 Tf 116.137 0 Td [(upstr)18(eam-unstable)]TJ /R11828152 10 Tf 82.977 0 Td 0.657 Tw [(in this e)15.0024(xample, in the last e)]TJ 115.582 0 Td (xample)Tj /R12164640 10 Tf 32.5969 0 Td (git-dpm)Tj /R11828152 10 Tf 37.0469 0 Td (as-)Tj -384.34 -12 Td 0.968 Tw [(sumed you w)9.99878(ant your Debian branch called)]TJ /R12164640 10 Tf 183.025 0 Td (unstable)Tj /R11828152 10 Tf 39.5871 0 Td 0.967 Tw (and not)Tj /R12164640 10 Tf 34.1539 0 Td (master)Tj 3.467 Tc /R11828152 10 Tf 29.4301 0 Td [(,s)346.699(oa)]TJ 0 Tc 22.7641 0 Td (fter the command re-)Tj -308.96 -12 Td 0 Tw [(turned you are in the ne)25(wly created)]TJ /R12164640 10 Tf 143.32 0 Td (unstable)Tj /R11828152 10 Tf 38.6199 0 Td (branch.)Tj -181.94 -24 Td (Do the rest of the packaging:)Tj /R11500264 10 Tf 2.5 -12 Td (vim)Tj /R12164640 10 Tf 16.9398 0 Td [(debian/contr)18.0078(ol debian/rules)]TJ -16.9398 -12 Td [(dch --cr)18.0078(eate --package)]TJ -0.2 Tc /R11500264 10 Tf 97.2898 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R12164640 10 Tf 26.9398 0 Td (-v)Tj /R11500264 10 Tf 10.8301 0 Td (0)Tj /R12164640 10 Tf 5 0 Td (-1)Tj -148.74 -12 Td [(git add debian/contr)18(ol debian/rules debian/changelog)]TJ (git commit -m "initial packaging")' /R11828152 10 Tf -2.5 -24 Td (Then add some patches:)Tj /R12164640 10 Tf 2.5 -12 Td [(git-dpm check)14.9927(out-patched)]TJ /R11500264 10 Tf (vim ...)' /R12164640 10 Tf (git commit -a)' (git-dpm dch ")' /R11500264 10 Tf 60 0 Td (Œx ... \(Closes: num\))Tj /R12164640 10 Tf 78.3199 0 Td (")Tj /R11828152 10 Tf -140.82 -24 Td (The)Tj /R12164640 10 Tf 18.707 0 Td 0.657 Tw (git-dpm check)Tj 61.3371 0 Td (out-patched)Tj /R11828152 10 Tf 54.2672 0 Td (created a temporary branch)Tj /R12164640 10 Tf 114.249 0 Td (patched-unstable)Tj /R11828152 10 Tf 76.498 0 Td 0.658 Tw (\(as you were in a)Tj -325.058 -12 Td 1.276 Tw (branch called)Tj /R12164640 10 Tf 58.6422 0 Td (unstable)Tj 3.776 Tc /R11828152 10 Tf 36.1199 0 Td [(.I)377.615(fy)]TJ 0 Tc 21.7117 0 Td (ou had called it with HEAD being a branch)Tj /R12164640 10 Tf 187.283 0 Td (master)Tj 3.775 Tc /R11828152 10 Tf 29.4301 0 Td [(,i)377.49(tw)]TJ 0 Tc 22.7301 0 Td 1.275 Tw (ould ha)Tj -0.15 Tc 30.7949 0 Td (ve)Tj 0 Tc -386.712 -12 Td (been)Tj /R12164640 10 Tf 23.6398 0 Td (patched)Tj 4.76 Tc /R11828152 10 Tf 33.8898 0 Td (\)t)Tj 4.761 Tc 10.8699 0 Td (ow)Tj 0 Tc 16.9809 0 Td 2.261 Tw [(hich you added commits.)-726.113(Then the)]TJ /R12164640 10 Tf 156.886 0 Td (git-dpm update-patches)Tj /R11828152 10 Tf 108.412 0 Td (implied by)Tj /R12164640 10 Tf -350.679 -12 Td 0.586 Tw (git-dpm dch)Tj /R11828152 10 Tf 55.6219 0 Td (mer)Tj 15.3699 0 Td (ged those changes into)Tj /R12164640 10 Tf 95.6629 0 Td (unstable)Tj 3.085 Tc /R11828152 10 Tf 36.1199 0 Td (,d)Tj 0 Tc 10.5852 0 Td 0.585 Tw (eleted the temporary branch and created ne)Tj 175.42 0 Td (w)Tj /R12164640 10 Tf -388.78 -12 Td (debian/patches/)Tj /R11828152 10 Tf 69.1801 0 Td (Œles.)Tj -69.1801 -24 Td 0 Tw [(Then b)20(uild your package:)]TJ /R12164640 10 Tf 2.5 -12 Td (git-dpm status &&)Tj 2.5 -12 Td [(dpkg-b)20.0073(uildpackage -rfak)10.0146(er)18(oot -us -uc -I".git*")]TJ /R11828152 10 Tf -5 -24 Td (No)Tj 2.614 Tc 11.9699 0 Td (wt)Tj 0 Tc 12.6141 0 Td (ak)Tj 2.614 Tc 9.33984 0 Td (eal)Tj 0 Tc 16.8879 0 Td 0.115 Tw [(ook what happened, perhaps you w)9.99268(ant to add some Œles to)]TJ /R12164640 10 Tf 237.245 0 Td [(.gitignor)17.9834(e)]TJ /R11828152 10 Tf 43.2652 0 Td (\(in the)Tj /R12164640 10 Tf 28.5602 0 Td (unstable)Tj /R11828152 10 Tf -359.882 -12 Td 0 Tw (branch\), or remo)Tj -0.15 Tc 66.7699 0 Td 0.3 Tw (ve s)Tj 0 Tc 15.6801 0 Td 0 Tw (ome Œles from the)Tj /R12164640 10 Tf 75.55 0 Td (unstable)Tj /R11828152 10 Tf 38.6199 0 Td (branch because your clean rule remo)Tj -0.15 Tc 146.74 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (st)Tj 0 Tc 9.16992 0 Td (hem.)Tj -361.82 -24 Td (Continue the last fe)Tj 2.5 Tc 77.8 0 Td (ws)Tj 0 Tc 13.6102 0 Td [(teps until the package is Œnished.)-500(Then push your package:)]TJ /R12164640 10 Tf -88.9102 -12 Td (git-dpm tag)Tj (git push --tags)' /R11500264 10 Tf 63.0602 0 Td (tar)Tj -0.1 Tc 11.3 0 Td (ge)Tj 0 Tc 9.33984 0 Td (t)Tj /R12164640 10 Tf 5.28008 0 Td (unstable:unstable pristine-tar:pristine-tar)Tj /R11828152 10 Tf -127.48 -28.8 Td [(Remo)15.0159(ving e)15.0073(xisting patches)]TJ 36 -12 Td (First get the master branch:)Tj /R12164640 10 Tf 2.5 -12 Td (git clone)Tj /R11500264 10 Tf 38.3301 0 Td (URL)Tj /R11828152 10 Tf -112.83 -50.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (3)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -381.84 -36 Td 0 Tw (git push)Tj /R35954040 10 Tf -38.5 -28.8 Td (Creating a ne)Tj 2.5 Tc 53.0699 0 Td (wp)Tj 0 Tc 14.7199 0 Td (roject)Tj -31.7898 -12 Td (Create an)Tj /R36290528 10 Tf 40.5398 0 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 42.8699 0 Td (\(or)Tj /R36290528 10 Tf 14.1602 0 Td [(upstr)18(eam-)]TJ /R35626152 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ 2.5 Tc /R35954040 10 Tf 36.5098 0 Td (\)b)Tj 0 Tc 10.8301 0 Td (ranch containing the contents of your orig.tar Œle:)Tj /R36290528 10 Tf -186.11 -12 Td (tar -xvf)Tj -0.2 Tc /R35626152 10 Tf 34.4301 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj ET Q /R21 gs 4 w 1 J 1 j 0 G 2140.25 7026.25 m 2190.25 7026.25 l S q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 219.05 705.09 Tm (0)Tj /R36290528 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ -77.55 -12 Td (cd)Tj -0.2 Tc /R35626152 10 Tf 12.5 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R36290528 10 Tf 24.4398 0 Td (-)Tj /R35626152 10 Tf 3.33008 0 Td (0)Tj /R36290528 10 Tf -48.95 -12 Td (git init)Tj 12 TL (git add .)' (git commit -m "import)' -0.2 Tc /R35626152 10 Tf 99.9699 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R36290528 10 Tf 24.4398 0 Td (_)Tj /R35626152 10 Tf 5 0 Td (0)Tj /R36290528 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz")]TJ -143.09 -12 Td [(git check)15(out -b upstr)17.9932(eam-unstable)]TJ -1.1 Tc /R35954040 10 Tf -2.5 -24 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (um)Tj 0 Tc 15.2801 0 Td [(ight w)9.99268(ant to use pristine tar to store your tar:)]TJ /R36290528 10 Tf -23.9 -12 Td (pristine-tar commit ../)Tj -0.2 Tc /R35626152 10 Tf 93.8699 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R36290528 10 Tf 24.4398 0 Td (_)Tj /R35626152 10 Tf 5 0 Td (0)Tj /R36290528 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz upstr)18.0151(eam-unstable)]TJ /R35954040 10 Tf -139.49 -24 Td (Then let git-dpm kno)Tj 2.5 Tc 84.4699 0 Td (ww)Tj 0 Tc 16.9398 0 Td (hat tarball your upstream branch belongs to:)Tj /R36290528 10 Tf -98.9098 -12 Td (git-dpm init ../)Tj -0.2 Tc /R35626152 10 Tf 61.1199 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R36290528 10 Tf 24.4398 0 Td (_)Tj /R35626152 10 Tf 5 0 Td (0)Tj /R36290528 10 Tf 5 0 Td [(.orig)15.0073(.tar)100(.gz)]TJ /R35954040 10 Tf -106.74 -24 Td 0.656 Tw (Note that since you were in)Tj /R36290528 10 Tf 116.137 0 Td [(upstr)18(eam-unstable)]TJ /R35954040 10 Tf 82.977 0 Td 0.657 Tw [(in this e)15.0024(xample, in the last e)]TJ 115.582 0 Td (xample)Tj /R36290528 10 Tf 32.5969 0 Td (git-dpm)Tj /R35954040 10 Tf 37.0469 0 Td (as-)Tj -384.34 -12 Td 0.968 Tw [(sumed you w)9.99878(ant your Debian branch called)]TJ /R36290528 10 Tf 183.025 0 Td (unstable)Tj /R35954040 10 Tf 39.5871 0 Td 0.967 Tw (and not)Tj /R36290528 10 Tf 34.1539 0 Td (master)Tj 3.467 Tc /R35954040 10 Tf 29.4301 0 Td [(,s)346.699(oa)]TJ 0 Tc 22.7641 0 Td (fter the command re-)Tj -308.96 -12 Td 0 Tw [(turned you are in the ne)25(wly created)]TJ /R36290528 10 Tf 143.32 0 Td (unstable)Tj /R35954040 10 Tf 38.6199 0 Td (branch.)Tj -181.94 -24 Td (Do the rest of the packaging:)Tj /R35626152 10 Tf 2.5 -12 Td (vim)Tj /R36290528 10 Tf 16.9398 0 Td [(debian/contr)18.0078(ol debian/rules)]TJ -16.9398 -12 Td [(dch --cr)18.0078(eate --package)]TJ -0.2 Tc /R35626152 10 Tf 97.2898 0 Td (ex)Tj 0 Tc 8.68008 0 Td (ample)Tj /R36290528 10 Tf 26.9398 0 Td (-v)Tj /R35626152 10 Tf 10.8301 0 Td (0)Tj /R36290528 10 Tf 5 0 Td (-1)Tj -148.74 -12 Td [(git add debian/contr)18(ol debian/rules debian/changelog)]TJ (git commit -m "initial packaging")' /R35954040 10 Tf -2.5 -24 Td (Then add some patches:)Tj /R36290528 10 Tf 2.5 -12 Td [(git-dpm check)14.9927(out-patched)]TJ /R35626152 10 Tf (vim ...)' /R36290528 10 Tf (git commit -a)' (git-dpm dch ")' /R35626152 10 Tf 60 0 Td (Œx ... \(Closes: num\))Tj /R36290528 10 Tf 78.3199 0 Td (")Tj /R35954040 10 Tf -140.82 -24 Td (The)Tj /R36290528 10 Tf 18.707 0 Td 0.657 Tw (git-dpm check)Tj 61.3371 0 Td (out-patched)Tj /R35954040 10 Tf 54.2672 0 Td (created a temporary branch)Tj /R36290528 10 Tf 114.249 0 Td (patched-unstable)Tj /R35954040 10 Tf 76.498 0 Td 0.658 Tw (\(as you were in a)Tj -325.058 -12 Td 1.276 Tw (branch called)Tj /R36290528 10 Tf 58.6422 0 Td (unstable)Tj 3.776 Tc /R35954040 10 Tf 36.1199 0 Td [(.I)377.615(fy)]TJ 0 Tc 21.7117 0 Td (ou had called it with HEAD being a branch)Tj /R36290528 10 Tf 187.283 0 Td (master)Tj 3.775 Tc /R35954040 10 Tf 29.4301 0 Td [(,i)377.49(tw)]TJ 0 Tc 22.7301 0 Td 1.275 Tw (ould ha)Tj -0.15 Tc 30.7949 0 Td (ve)Tj 0 Tc -386.712 -12 Td (been)Tj /R36290528 10 Tf 23.6398 0 Td (patched)Tj 4.76 Tc /R35954040 10 Tf 33.8898 0 Td (\)t)Tj 4.761 Tc 10.8699 0 Td (ow)Tj 0 Tc 16.9809 0 Td 2.261 Tw [(hich you added commits.)-726.113(Then the)]TJ /R36290528 10 Tf 156.886 0 Td (git-dpm update-patches)Tj /R35954040 10 Tf 108.412 0 Td (implied by)Tj /R36290528 10 Tf -350.679 -12 Td 0.586 Tw (git-dpm dch)Tj /R35954040 10 Tf 55.6219 0 Td (mer)Tj 15.3699 0 Td (ged those changes into)Tj /R36290528 10 Tf 95.6629 0 Td (unstable)Tj 3.085 Tc /R35954040 10 Tf 36.1199 0 Td (,d)Tj 0 Tc 10.5852 0 Td 0.585 Tw (eleted the temporary branch and created ne)Tj 175.42 0 Td (w)Tj /R36290528 10 Tf -388.78 -12 Td (debian/patches/)Tj /R35954040 10 Tf 69.1801 0 Td (Œles.)Tj -69.1801 -24 Td 0 Tw [(Then b)20(uild your package:)]TJ /R36290528 10 Tf 2.5 -12 Td (git-dpm status &&)Tj 2.5 -12 Td [(dpkg-b)20.0073(uildpackage -rfak)10.0146(er)18(oot -us -uc -I".git*")]TJ /R35954040 10 Tf -5 -24 Td (No)Tj 2.614 Tc 11.9699 0 Td (wt)Tj 0 Tc 12.6141 0 Td (ak)Tj 2.614 Tc 9.33984 0 Td (eal)Tj 0 Tc 16.8879 0 Td 0.115 Tw [(ook what happened, perhaps you w)9.99268(ant to add some Œles to)]TJ /R36290528 10 Tf 237.245 0 Td [(.gitignor)17.9834(e)]TJ /R35954040 10 Tf 43.2652 0 Td (\(in the)Tj /R36290528 10 Tf 28.5602 0 Td (unstable)Tj /R35954040 10 Tf -359.882 -12 Td 0 Tw (branch\), or remo)Tj -0.15 Tc 66.7699 0 Td 0.3 Tw (ve s)Tj 0 Tc 15.6801 0 Td 0 Tw (ome Œles from the)Tj /R36290528 10 Tf 75.55 0 Td (unstable)Tj /R35954040 10 Tf 38.6199 0 Td (branch because your clean rule remo)Tj -0.15 Tc 146.74 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (st)Tj 0 Tc 9.16992 0 Td (hem.)Tj -361.82 -24 Td (Continue the last fe)Tj 2.5 Tc 77.8 0 Td (ws)Tj 0 Tc 13.6102 0 Td [(teps until the package is Œnished.)-500(Then push your package:)]TJ /R36290528 10 Tf -88.9102 -12 Td (git-dpm tag)Tj (git push --tags)' /R35626152 10 Tf 63.0602 0 Td (tar)Tj -0.1 Tc 11.3 0 Td (ge)Tj 0 Tc 9.33984 0 Td (t)Tj /R36290528 10 Tf 5.28008 0 Td (unstable:unstable pristine-tar:pristine-tar)Tj /R35954040 10 Tf -127.48 -28.8 Td [(Remo)15.0159(ving e)15.0073(xisting patches)]TJ 36 -12 Td (First get the master branch:)Tj /R36290528 10 Tf 2.5 -12 Td (git clone)Tj /R35626152 10 Tf 38.3301 0 Td (URL)Tj /R35954040 10 Tf -112.83 -50.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (3)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2279 │ │ │ │ │ +2280 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ ExtGState │ │ │ │ │ SA │ │ │ │ │ @@ -770,19 +770,19 @@ │ │ │ │ │ R0 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -819,29 +819,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 0 Tw (Create the patched branch and check it out:)Tj /R12164640 10 Tf 2.5 -12 Td [(git-dpm check)14.9927(out-patched)]TJ /R11828152 10 Tf -2.5 -24 Td (Get a list of commits since the last upstream release:)Tj /R12164640 10 Tf 212.75 0 Td [(git r)18.0078(ebase -i upstr)18.0176(eam-unstable)]TJ /R11828152 10 Tf -212.75 -24 Td 0.656 Tw (This will open your def)Tj 96.4039 0 Td 0.655 Tw [(ault editor with a list of commits.)-565.493(Edit the list to remo)]TJ -0.15 Tc 224.565 0 Td 0.955 Tw (ve u)Tj 0 Tc 17.4449 0 Td 0.655 Tw (ndesired com-)Tj -338.414 -12 Td (mits.)Tj /R11500264 10 Tf 2.5 -12 Td (...)Tj /R12164640 10 Tf 12 TL 0 Tw (git commit)' /R11828152 10 Tf -2.5 -24 Td 0.411 Tw (Then you w)Tj 48.4922 0 Td 0.412 Tw (ant to get those changes into the Debian branch and the old patch Œles deleted \(which)Tj -48.4922 -12 Td 0.428 Tw (you can do using)Tj /R12164640 10 Tf 72.2621 0 Td (git-dpm update-patches)Tj /R11828152 10 Tf 101.818 0 Td 0.427 Tw [(\), b)19.9976(ut you most lik)9.99023(ely w)9.98047(ant to also document what you)]TJ -174.08 -12 Td 0 Tw (did in the changelog, so all in one step:)Tj /R12164640 10 Tf 2.5 -12 Td (git-dpm dch -- -i)Tj /R11828152 10 Tf -2.5 -24 Td (Perhaps change something in the Debian packaging:)Tj /R11500264 10 Tf 2.5 -12 Td (...)Tj /R12164640 10 Tf (git commit -a)' /R11828152 10 Tf -2.5 -24 Td (Then push the whole thing back:)Tj /R12164640 10 Tf 2.5 -12 Td (git push)Tj /R12164640 10.95 Tf -74.5 -28.8 Td [(GLOB)30.0538(AL OPTIONS)]TJ /R12164640 10 Tf 36 -12 Td [(--deb)20.0073(ug)]TJ /R11828152 10 Tf 36 -12 Td (Gi)Tj -0.15 Tc 9.75 0 Td 0.824 Tw (ve ve)Tj 0 Tc 21.6039 0 Td 0.524 Tw [(rbose output what git-dpm is doing.)-552.383(Mostly only useful for deb)]TJ 259.48 0 Td 0.525 Tw (ugging or when preparing)Tj -290.834 -12 Td 0 Tw [(an b)20.0159(ug report.)]TJ /R12164640 10 Tf -36 -28.8 Td [(--deb)20.0073(ug-git-calls)]TJ /R11828152 10 Tf 36 -12 Td (Output git in)Tj -0.2 Tc 50.7199 0 Td (vo)Tj 0 Tc 9.8 0 Td (cations to stderr)Tj 5 Tc 63.3301 0 Td (.\()Tj -0.15 Tc 10.8301 0 Td (Fo)Tj 2.5 Tc 10.4102 0 Td (rm)Tj 0 Tc 13.6102 0 Td [(ore complicated deb)20.0146(ugging cases\).)]TJ /R12164640 10 Tf -194.7 -28.8 Td [(--allo)10.0073(w-changes-in-debian-branch)]TJ /R11828152 10 Tf 36 -12 Td 0.13 Tw [(Ignore upstream changes in your Debian branch.)-513.008(This will either discard them if mer)17.998(ge-patched is)]TJ 0 Tw T*[(called by come command or them being ignored else)24.9927(where.)]TJ /R12164640 10.95 Tf -72 -28.8 Td (COMMANDS)Tj /R12164640 10 Tf 36 -12 Td (init)Tj /R11828152 10 Tf 16.95 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj /R11828152 10 Tf 29.45 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td (tarŒle)Tj /R11828152 10 Tf 26.3898 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td [(upstr)37.0166(eam-commit)]TJ /R11828152 10 Tf 72.1199 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td [(pr)37.0068(eapplied-commit)]TJ /R11828152 10 Tf 78.2301 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td [(patc)15.0073(hed-commit)]TJ /R11828152 10 Tf 64.2801 0 Td (]]])Tj -270.57 -12 Td (Create a ne)Tj 2.5 Tc 44.7301 0 Td (wp)Tj 0 Tc 14.7199 0 Td (roject.)Tj -59.45 -24 Td [(The Œrst ar)18(gument is an upstream tarball.)]TJ -1.1 Tc 24 TL (Yo)' 2.752 Tc 11.1199 0 Td (ua)Tj 0 Tc 12.1922 0 Td 0.253 Tw (lso need to ha)Tj -0.15 Tc 55.8289 0 Td 0.553 Tw (ve t)Tj 0 Tc 14.823 0 Td 0.253 Tw (he contents of that Œle and the Œles gi)Tj -0.15 Tc 151.764 0 Td (ve)Tj 2.753 Tc 9.28984 0 Td (nw)Tj 0 Tc 14.973 0 Td (ith --component unpackaged as)Tj -269.991 -12 Td 0.893 Tw (some branch or commit in your git repository \(or similar enough so)Tj /R12164640 10 Tf 282.915 0 Td [(dpkg-sour)18.0078(ce)]TJ /R11828152 10 Tf 55.9918 0 Td 0.892 Tw (will not kno)Tj 49.8738 0 Td (w)Tj -388.78 -12 Td 0.706 Tw (the dif)Tj 26.2859 0 Td 3.207 Tw (ference\). This)Tj 61.9441 0 Td 0.707 Tw (will be stored in the upstream branch \(called)Tj /R12164640 10 Tf 186.176 0 Td [(upstr)17.998(eam)]TJ /R11828152 10 Tf 43.577 0 Td (or)Tj /R12164640 10 Tf 11.5371 0 Td [(upstr)17.998(eam-)]TJ /R11500264 10 Tf 43.7 0 Td (what-)Tj -0.15 Tc -373.22 -12 Td (ev)Tj 0 Tc 8.73008 0 Td (er)Tj /R11828152 10 Tf 8.33008 0 Td 3.105 Tw (\). If)Tj 21.2 0 Td 0.605 Tw (the second ar)Tj 53.7898 0 Td 0.604 Tw [(gument is non-e)14.9951(xisting or empty)]TJ 3.104 Tc 131.616 0 Td (,t)Tj 0 Tc 8.38398 0 Td [(hat branch must already e)15(xist, otherwise)]TJ -232.05 -12 Td 1.218 Tw [(that branch will be initialized with what that second ar)18.0054(gument. \(It's your responsibility that the)]TJ 12 TL 0.499 Tw (contents match. git-dpm does not kno)' 2.999 Tc 152.795 0 Td (ww)Tj 0 Tc 17.4391 0 Td (hat your clean rule does, so cannot check \(and does not)Tj -0.25 Tc -170.234 -12 Td -2.15 Tw (ev e)Tj 2.5 Tc 13.4801 0 Td (nt)Tj 0 Tc 10.2801 0 Td 0 Tw [(ry to w)9.99268(arn yet\)\).)]TJ -1.1 Tc -23.7602 -24 Td (Yo)Tj 3.196 Tc 11.1199 0 Td (uc)Tj 0 Tc 12.6359 0 Td 0.696 Tw (an already ha)Tj -0.15 Tc 54.502 0 Td 0.996 Tw (ve a)Tj 3.196 Tc 16.9262 0 Td (nD)Tj 0 Tc 15.416 0 Td 0.696 Tw (ebian branch \(called)Tj /R12164640 10 Tf 85.668 0 Td (master)Tj /R11828152 10 Tf 32.6262 0 Td (or)Tj /R12164640 10 Tf 11.527 0 Td (whate)Tj -0.1 Tc 25.4 0 Td (ve)Tj 0 Tc 9.33984 0 Td (r)Tj /R11828152 10 Tf 4.43984 0 Td 3.197 Tw (\). If)Tj 21.384 0 Td 0.697 Tw [(it does not e)14.9805(xist, it will)]TJ -0.15 Tc -300.985 -12 Td (ex)Tj 0 Tc 9.28984 0 Td 1.195 Tw (ist afterw)Tj 38.5852 0 Td 3.695 Tw (ards. Otherwise)Tj 70.15 0 Td 1.195 Tw (it can contain a)Tj /R12164640 10 Tf 68.1 0 Td (debian/patches/series)Tj /R11828152 10 Tf 94.2551 0 Td (Œle, which git-dpm will im-)Tj -280.38 -12 Td (port.)Tj 24 TL 1.344 Tw T*[(The third ar)18.0029(gument can be a descendant of your upstream branch, that contains the changes of)]TJ -72 -40.8 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (4)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 0 Tw (Create the patched branch and check it out:)Tj /R36290528 10 Tf 2.5 -12 Td [(git-dpm check)14.9927(out-patched)]TJ /R35954040 10 Tf -2.5 -24 Td (Get a list of commits since the last upstream release:)Tj /R36290528 10 Tf 212.75 0 Td [(git r)18.0078(ebase -i upstr)18.0176(eam-unstable)]TJ /R35954040 10 Tf -212.75 -24 Td 0.656 Tw (This will open your def)Tj 96.4039 0 Td 0.655 Tw [(ault editor with a list of commits.)-565.493(Edit the list to remo)]TJ -0.15 Tc 224.565 0 Td 0.955 Tw (ve u)Tj 0 Tc 17.4449 0 Td 0.655 Tw (ndesired com-)Tj -338.414 -12 Td (mits.)Tj /R35626152 10 Tf 2.5 -12 Td (...)Tj /R36290528 10 Tf 12 TL 0 Tw (git commit)' /R35954040 10 Tf -2.5 -24 Td 0.411 Tw (Then you w)Tj 48.4922 0 Td 0.412 Tw (ant to get those changes into the Debian branch and the old patch Œles deleted \(which)Tj -48.4922 -12 Td 0.428 Tw (you can do using)Tj /R36290528 10 Tf 72.2621 0 Td (git-dpm update-patches)Tj /R35954040 10 Tf 101.818 0 Td 0.427 Tw [(\), b)19.9976(ut you most lik)9.99023(ely w)9.98047(ant to also document what you)]TJ -174.08 -12 Td 0 Tw (did in the changelog, so all in one step:)Tj /R36290528 10 Tf 2.5 -12 Td (git-dpm dch -- -i)Tj /R35954040 10 Tf -2.5 -24 Td (Perhaps change something in the Debian packaging:)Tj /R35626152 10 Tf 2.5 -12 Td (...)Tj /R36290528 10 Tf (git commit -a)' /R35954040 10 Tf -2.5 -24 Td (Then push the whole thing back:)Tj /R36290528 10 Tf 2.5 -12 Td (git push)Tj /R36290528 10.95 Tf -74.5 -28.8 Td [(GLOB)30.0538(AL OPTIONS)]TJ /R36290528 10 Tf 36 -12 Td [(--deb)20.0073(ug)]TJ /R35954040 10 Tf 36 -12 Td (Gi)Tj -0.15 Tc 9.75 0 Td 0.824 Tw (ve ve)Tj 0 Tc 21.6039 0 Td 0.524 Tw [(rbose output what git-dpm is doing.)-552.383(Mostly only useful for deb)]TJ 259.48 0 Td 0.525 Tw (ugging or when preparing)Tj -290.834 -12 Td 0 Tw [(an b)20.0159(ug report.)]TJ /R36290528 10 Tf -36 -28.8 Td [(--deb)20.0073(ug-git-calls)]TJ /R35954040 10 Tf 36 -12 Td (Output git in)Tj -0.2 Tc 50.7199 0 Td (vo)Tj 0 Tc 9.8 0 Td (cations to stderr)Tj 5 Tc 63.3301 0 Td (.\()Tj -0.15 Tc 10.8301 0 Td (Fo)Tj 2.5 Tc 10.4102 0 Td (rm)Tj 0 Tc 13.6102 0 Td [(ore complicated deb)20.0146(ugging cases\).)]TJ /R36290528 10 Tf -194.7 -28.8 Td [(--allo)10.0073(w-changes-in-debian-branch)]TJ /R35954040 10 Tf 36 -12 Td 0.13 Tw [(Ignore upstream changes in your Debian branch.)-513.008(This will either discard them if mer)17.998(ge-patched is)]TJ 0 Tw T*[(called by come command or them being ignored else)24.9927(where.)]TJ /R36290528 10.95 Tf -72 -28.8 Td (COMMANDS)Tj /R36290528 10 Tf 36 -12 Td (init)Tj /R35954040 10 Tf 16.95 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj /R35954040 10 Tf 29.45 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td (tarŒle)Tj /R35954040 10 Tf 26.3898 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td [(upstr)37.0166(eam-commit)]TJ /R35954040 10 Tf 72.1199 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td [(pr)37.0068(eapplied-commit)]TJ /R35954040 10 Tf 78.2301 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td [(patc)15.0073(hed-commit)]TJ /R35954040 10 Tf 64.2801 0 Td (]]])Tj -270.57 -12 Td (Create a ne)Tj 2.5 Tc 44.7301 0 Td (wp)Tj 0 Tc 14.7199 0 Td (roject.)Tj -59.45 -24 Td [(The Œrst ar)18(gument is an upstream tarball.)]TJ -1.1 Tc 24 TL (Yo)' 2.752 Tc 11.1199 0 Td (ua)Tj 0 Tc 12.1922 0 Td 0.253 Tw (lso need to ha)Tj -0.15 Tc 55.8289 0 Td 0.553 Tw (ve t)Tj 0 Tc 14.823 0 Td 0.253 Tw (he contents of that Œle and the Œles gi)Tj -0.15 Tc 151.764 0 Td (ve)Tj 2.753 Tc 9.28984 0 Td (nw)Tj 0 Tc 14.973 0 Td (ith --component unpackaged as)Tj -269.991 -12 Td 0.893 Tw (some branch or commit in your git repository \(or similar enough so)Tj /R36290528 10 Tf 282.915 0 Td [(dpkg-sour)18.0078(ce)]TJ /R35954040 10 Tf 55.9918 0 Td 0.892 Tw (will not kno)Tj 49.8738 0 Td (w)Tj -388.78 -12 Td 0.706 Tw (the dif)Tj 26.2859 0 Td 3.207 Tw (ference\). This)Tj 61.9441 0 Td 0.707 Tw (will be stored in the upstream branch \(called)Tj /R36290528 10 Tf 186.176 0 Td [(upstr)17.998(eam)]TJ /R35954040 10 Tf 43.577 0 Td (or)Tj /R36290528 10 Tf 11.5371 0 Td [(upstr)17.998(eam-)]TJ /R35626152 10 Tf 43.7 0 Td (what-)Tj -0.15 Tc -373.22 -12 Td (ev)Tj 0 Tc 8.73008 0 Td (er)Tj /R35954040 10 Tf 8.33008 0 Td 3.105 Tw (\). If)Tj 21.2 0 Td 0.605 Tw (the second ar)Tj 53.7898 0 Td 0.604 Tw [(gument is non-e)14.9951(xisting or empty)]TJ 3.104 Tc 131.616 0 Td (,t)Tj 0 Tc 8.38398 0 Td [(hat branch must already e)15(xist, otherwise)]TJ -232.05 -12 Td 1.218 Tw [(that branch will be initialized with what that second ar)18.0054(gument. \(It's your responsibility that the)]TJ 12 TL 0.499 Tw (contents match. git-dpm does not kno)' 2.999 Tc 152.795 0 Td (ww)Tj 0 Tc 17.4391 0 Td (hat your clean rule does, so cannot check \(and does not)Tj -0.25 Tc -170.234 -12 Td -2.15 Tw (ev e)Tj 2.5 Tc 13.4801 0 Td (nt)Tj 0 Tc 10.2801 0 Td 0 Tw [(ry to w)9.99268(arn yet\)\).)]TJ -1.1 Tc -23.7602 -24 Td (Yo)Tj 3.196 Tc 11.1199 0 Td (uc)Tj 0 Tc 12.6359 0 Td 0.696 Tw (an already ha)Tj -0.15 Tc 54.502 0 Td 0.996 Tw (ve a)Tj 3.196 Tc 16.9262 0 Td (nD)Tj 0 Tc 15.416 0 Td 0.696 Tw (ebian branch \(called)Tj /R36290528 10 Tf 85.668 0 Td (master)Tj /R35954040 10 Tf 32.6262 0 Td (or)Tj /R36290528 10 Tf 11.527 0 Td (whate)Tj -0.1 Tc 25.4 0 Td (ve)Tj 0 Tc 9.33984 0 Td (r)Tj /R35954040 10 Tf 4.43984 0 Td 3.197 Tw (\). If)Tj 21.384 0 Td 0.697 Tw [(it does not e)14.9805(xist, it will)]TJ -0.15 Tc -300.985 -12 Td (ex)Tj 0 Tc 9.28984 0 Td 1.195 Tw (ist afterw)Tj 38.5852 0 Td 3.695 Tw (ards. Otherwise)Tj 70.15 0 Td 1.195 Tw (it can contain a)Tj /R36290528 10 Tf 68.1 0 Td (debian/patches/series)Tj /R35954040 10 Tf 94.2551 0 Td (Œle, which git-dpm will im-)Tj -280.38 -12 Td (port.)Tj 24 TL 1.344 Tw T*[(The third ar)18.0029(gument can be a descendant of your upstream branch, that contains the changes of)]TJ -72 -40.8 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (4)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2359 │ │ │ │ │ +2360 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -878,29 +878,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 0.83 Tw (your Debian branch before an)Tj 3.33 Tc 122.57 0 Td (yp)Tj 0 Tc 13.3301 0 Td 0.829 Tw (atches are applied \(Most people prefer to ha)Tj -0.15 Tc 181.383 0 Td 1.129 Tw (ve n)Tj 0 Tc 17.6191 0 Td 0.829 Tw (one and lintian)Tj -0.1 Tc -334.902 -12 Td (wa)Tj 0 Tc 11.5602 0 Td 0.852 Tw [(rns, b)20.0122(ut if you ha)]TJ -0.15 Tc 71.0578 0 Td 1.152 Tw (ve s)Tj 0 Tc 16.532 0 Td 0.852 Tw (ome, commit/cherry pick them in a ne)Tj 3.353 Tc 157.342 0 Td (wb)Tj 0 Tc 15.573 0 Td 0.853 Tw (ranch/detached head on top of)Tj -272.065 -12 Td 0.519 Tw (your upstream branch and name them here\).)Tj -0.4 Tc 184.972 0 Td (Wi)Tj 0 Tc 11.8199 0 Td 0.518 Tw (thout --patches-applied, your Debian branch may)Tj -196.792 -12 Td 2.083 Tw (not ha)Tj -0.15 Tc 26.6031 0 Td 2.383 Tw [(ve a)-14.989(ny u)]TJ 0 Tc 37.7457 0 Td 2.083 Tw (pstream changes compared to this commit \(or if it is not gi)Tj -0.15 Tc 256.813 0 Td (ve)Tj 0 Tc 9.28984 0 Td 2.084 Tw (n, the upstream)Tj -330.452 -12 Td (branch\).)Tj 24 TL 0.007 Tw T*[(If there is no fourth ar)17.9834(gument, git-dpm will apply possible patches in your Debian branch on top of)]TJ 12 TL 0 Tw T*[(the third ar)18(gument or upstream.)]TJ -1.1 Tc 131.19 0 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (uc)Tj 0 Tc 11.9398 0 Td (an also do so yourself and gi)Tj -0.15 Tc 114.18 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td 0 Tw [(hat as fourth ar)17.9932(gument.)]TJ -283 -24 Td 0.485 Tw (The contents of this commit/branch gi)Tj -0.15 Tc 154.665 0 Td (ve)Tj 2.985 Tc 9.28984 0 Td [(ni)298.516(nt)]TJ 0 Tc 21.5297 0 Td 0.486 Tw (he fourth commit or created by applying patches on)Tj -185.484 -12 Td 0.325 Tw (top of the third/your upstream branch is then mer)Tj 199.06 0 Td 0.324 Tw (ged into your Debian branch and remembered as)Tj -199.06 -12 Td 0 Tw (patched branch.)Tj 24 TL (Options:)' /R12164640 10 Tf 16.8 TL (--component)' /R11500264 10 Tf 56.3801 0 Td (Œlename)Tj /R11828152 10 Tf -20.3801 -12 Td (Record a)Tj /R12164640 10 Tf 38.3199 0 Td (.orig-)Tj /R11500264 10 Tf 23.05 0 Td (component)Tj /R12164640 10 Tf 43.8801 0 Td (.tar)Tj /R11828152 10 Tf 17.7699 0 Td [(Œle to be unpack)9.99268(ed in your upstream branch.)]TJ /R12164640 10 Tf -159.02 -28.8 Td (--patches-applied)Tj /R11828152 10 Tf 36 -12 Td (Denote the Debian branch already has the patches applied.)Tj -0.4 Tc 24 TL (Wi)' 0 Tc 11.8199 0 Td 0.469 Tw (thout this git-dpm will check there are no changes in the Debian branch outside patch)Tj -11.8199 -12 Td 0.302 Tw (management before applying the patches; with this, it will instead check there are no dif-)Tj 12 TL 0 Tw (ferences after applying the patches.)' /R12164640 10 Tf -36 -28.8 Td [(--cr)17.9846(eate-no-patches)]TJ /R11828152 10 Tf 36 -12 Td 0.855 Tw (Do not create/o)Tj -0.15 Tc 63.2102 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rride)Tj /R12164640 10 Tf 22.2352 0 Td (debian/patches)Tj /R11828152 10 Tf 67.2551 0 Td (directory)Tj 5.855 Tc 35.45 0 Td (.Y)Tj 0 Tc 14.475 0 Td (ou will ha)Tj -0.15 Tc 41.5102 0 Td 1.155 Tw (ve t)Tj 3.355 Tc 15.425 0 Td (oc)Tj 0 Tc 12.7949 0 Td (all)Tj /R12164640 10 Tf 13.3551 0 Td (update-patches)Tj /R11828152 10 Tf -295 -12 Td 3.028 Tw (yourself. Useful)Tj 70.4859 0 Td 0.527 Tw [(if you are importing historical data and k)10.0098(eep the original patches in the)]TJ -70.4859 -12 Td 0 Tw (Debian branch.)Tj /R12164640 10 Tf -36 -28.8 Td [(--r)18.0078(ecord-patch-category)]TJ /R11828152 10 Tf 36 -12 Td 1.837 Tw (Add a)Tj -0.1 Tc /R12164640 10 Tf 30.334 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Category:)Tj /R11828152 10 Tf 63.757 0 Td (Œeld to each imported patch that is in a subdirectory of)Tj /R12164640 10 Tf 241.568 0 Td (de-)Tj -346.669 -12 Td (bian/patches)Tj 5 Tc /R11828152 10 Tf 53.9 0 Td (.T)Tj 0 Tc 13.6102 0 Td 0 Tw (his causes)Tj /R12164640 10 Tf 42.7699 0 Td (update-patches)Tj /R11828152 10 Tf 67.5 0 Td [(to store it in the same subdirectory)65.0098(.)]TJ /R12164640 10 Tf -213.78 -16.8 Td [(--r)18.0078(ecord-patch-name)]TJ /R11828152 10 Tf 36 -12 Td 2.768 Tw (Add a)Tj -0.1 Tc /R12164640 10 Tf 32.1961 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R11828152 10 Tf 50.248 0 Td (Œeld to each imported patch with its name.)Tj 197.683 0 Td 2.767 Tw (This causes)Tj /R12164640 10 Tf 54.4141 0 Td (up-)Tj -345.551 -12 Td (date-patches)Tj /R11828152 10 Tf 56.3801 0 Td 0 Tw (to store it under its original name.)Tj /R12164640 10 Tf -128.38 -28.8 Td [(pr)18.0078(epar)17.9846(e)]TJ /R11828152 10 Tf 36 -12 Td (Mak)Tj 2.571 Tc 18.2301 0 Td (es)Tj 0 Tc 10.9012 0 Td 0.071 Tw (ure upstream branch and upstream orig.tar ball are there and up to date.)Tj 291.403 0 Td 0.072 Tw (\(Best called after a)Tj -320.534 -12 Td 0 Tw (clone or a pull\).)Tj /R12164640 10 Tf -36 -28.8 Td (status)Tj /R11828152 10 Tf 27.5 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td [(br)15.0159(anc)15.0159(h)]TJ /R11828152 10 Tf 28.0297 0 Td (])Tj -22.8598 -24 Td 0.024 Tw (Check the status of the current project \(or of the project belonging to the ar)Tj 300.096 0 Td (gument)Tj /R11500264 10 Tf 32.5238 0 Td [(br)15.0146(anc)15.0146(h)]TJ /R11828152 10 Tf 30.5535 0 Td 0.023 Tw (if that is)Tj -363.173 -12 Td (gi)Tj -0.15 Tc 7.53008 0 Td (ve)Tj 0 Tc 9.28984 0 Td 2.5 Tw (n\). Returns)Tj 49.4398 0 Td 0 Tw [(with non-zero e)14.9854(xit code if something to do is detected.)]TJ /R12164640 10 Tf -102.26 -28.8 Td [(check)15.0159(out-patched)]TJ /R11828152 10 Tf 36 -24 Td (Check)Tj 25.45 0 Td 1.02 Tw (out the patched branch \()Tj /R12164640 10 Tf 100.72 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 3.52 Tc /R11828152 10 Tf 36.5098 0 Td (\)a)Tj 0 Tc 11.2898 0 Td [(fter making sure it e)15.0098(xists and is one)]TJ -247.079 -12 Td 0 Tw (recorded in the)Tj /R12164640 10 Tf 62.4801 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 70.5699 0 Td (Œle.)Tj -133.05 -24 Td 0.148 Tw (If the patched branch references an old state \(i.e. one that is already ancestor of the current Debian)Tj -72 -45.6 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (5)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 0.83 Tw (your Debian branch before an)Tj 3.33 Tc 122.57 0 Td (yp)Tj 0 Tc 13.3301 0 Td 0.829 Tw (atches are applied \(Most people prefer to ha)Tj -0.15 Tc 181.383 0 Td 1.129 Tw (ve n)Tj 0 Tc 17.6191 0 Td 0.829 Tw (one and lintian)Tj -0.1 Tc -334.902 -12 Td (wa)Tj 0 Tc 11.5602 0 Td 0.852 Tw [(rns, b)20.0122(ut if you ha)]TJ -0.15 Tc 71.0578 0 Td 1.152 Tw (ve s)Tj 0 Tc 16.532 0 Td 0.852 Tw (ome, commit/cherry pick them in a ne)Tj 3.353 Tc 157.342 0 Td (wb)Tj 0 Tc 15.573 0 Td 0.853 Tw (ranch/detached head on top of)Tj -272.065 -12 Td 0.519 Tw (your upstream branch and name them here\).)Tj -0.4 Tc 184.972 0 Td (Wi)Tj 0 Tc 11.8199 0 Td 0.518 Tw (thout --patches-applied, your Debian branch may)Tj -196.792 -12 Td 2.083 Tw (not ha)Tj -0.15 Tc 26.6031 0 Td 2.383 Tw [(ve a)-14.989(ny u)]TJ 0 Tc 37.7457 0 Td 2.083 Tw (pstream changes compared to this commit \(or if it is not gi)Tj -0.15 Tc 256.813 0 Td (ve)Tj 0 Tc 9.28984 0 Td 2.084 Tw (n, the upstream)Tj -330.452 -12 Td (branch\).)Tj 24 TL 0.007 Tw T*[(If there is no fourth ar)17.9834(gument, git-dpm will apply possible patches in your Debian branch on top of)]TJ 12 TL 0 Tw T*[(the third ar)18(gument or upstream.)]TJ -1.1 Tc 131.19 0 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (uc)Tj 0 Tc 11.9398 0 Td (an also do so yourself and gi)Tj -0.15 Tc 114.18 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td 0 Tw [(hat as fourth ar)17.9932(gument.)]TJ -283 -24 Td 0.485 Tw (The contents of this commit/branch gi)Tj -0.15 Tc 154.665 0 Td (ve)Tj 2.985 Tc 9.28984 0 Td [(ni)298.516(nt)]TJ 0 Tc 21.5297 0 Td 0.486 Tw (he fourth commit or created by applying patches on)Tj -185.484 -12 Td 0.325 Tw (top of the third/your upstream branch is then mer)Tj 199.06 0 Td 0.324 Tw (ged into your Debian branch and remembered as)Tj -199.06 -12 Td 0 Tw (patched branch.)Tj 24 TL (Options:)' /R36290528 10 Tf 16.8 TL (--component)' /R35626152 10 Tf 56.3801 0 Td (Œlename)Tj /R35954040 10 Tf -20.3801 -12 Td (Record a)Tj /R36290528 10 Tf 38.3199 0 Td (.orig-)Tj /R35626152 10 Tf 23.05 0 Td (component)Tj /R36290528 10 Tf 43.8801 0 Td (.tar)Tj /R35954040 10 Tf 17.7699 0 Td [(Œle to be unpack)9.99268(ed in your upstream branch.)]TJ /R36290528 10 Tf -159.02 -28.8 Td (--patches-applied)Tj /R35954040 10 Tf 36 -12 Td (Denote the Debian branch already has the patches applied.)Tj -0.4 Tc 24 TL (Wi)' 0 Tc 11.8199 0 Td 0.469 Tw (thout this git-dpm will check there are no changes in the Debian branch outside patch)Tj -11.8199 -12 Td 0.302 Tw (management before applying the patches; with this, it will instead check there are no dif-)Tj 12 TL 0 Tw (ferences after applying the patches.)' /R36290528 10 Tf -36 -28.8 Td [(--cr)17.9846(eate-no-patches)]TJ /R35954040 10 Tf 36 -12 Td 0.855 Tw (Do not create/o)Tj -0.15 Tc 63.2102 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rride)Tj /R36290528 10 Tf 22.2352 0 Td (debian/patches)Tj /R35954040 10 Tf 67.2551 0 Td (directory)Tj 5.855 Tc 35.45 0 Td (.Y)Tj 0 Tc 14.475 0 Td (ou will ha)Tj -0.15 Tc 41.5102 0 Td 1.155 Tw (ve t)Tj 3.355 Tc 15.425 0 Td (oc)Tj 0 Tc 12.7949 0 Td (all)Tj /R36290528 10 Tf 13.3551 0 Td (update-patches)Tj /R35954040 10 Tf -295 -12 Td 3.028 Tw (yourself. Useful)Tj 70.4859 0 Td 0.527 Tw [(if you are importing historical data and k)10.0098(eep the original patches in the)]TJ -70.4859 -12 Td 0 Tw (Debian branch.)Tj /R36290528 10 Tf -36 -28.8 Td [(--r)18.0078(ecord-patch-category)]TJ /R35954040 10 Tf 36 -12 Td 1.837 Tw (Add a)Tj -0.1 Tc /R36290528 10 Tf 30.334 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Category:)Tj /R35954040 10 Tf 63.757 0 Td (Œeld to each imported patch that is in a subdirectory of)Tj /R36290528 10 Tf 241.568 0 Td (de-)Tj -346.669 -12 Td (bian/patches)Tj 5 Tc /R35954040 10 Tf 53.9 0 Td (.T)Tj 0 Tc 13.6102 0 Td 0 Tw (his causes)Tj /R36290528 10 Tf 42.7699 0 Td (update-patches)Tj /R35954040 10 Tf 67.5 0 Td [(to store it in the same subdirectory)65.0098(.)]TJ /R36290528 10 Tf -213.78 -16.8 Td [(--r)18.0078(ecord-patch-name)]TJ /R35954040 10 Tf 36 -12 Td 2.768 Tw (Add a)Tj -0.1 Tc /R36290528 10 Tf 32.1961 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R35954040 10 Tf 50.248 0 Td (Œeld to each imported patch with its name.)Tj 197.683 0 Td 2.767 Tw (This causes)Tj /R36290528 10 Tf 54.4141 0 Td (up-)Tj -345.551 -12 Td (date-patches)Tj /R35954040 10 Tf 56.3801 0 Td 0 Tw (to store it under its original name.)Tj /R36290528 10 Tf -128.38 -28.8 Td [(pr)18.0078(epar)17.9846(e)]TJ /R35954040 10 Tf 36 -12 Td (Mak)Tj 2.571 Tc 18.2301 0 Td (es)Tj 0 Tc 10.9012 0 Td 0.071 Tw (ure upstream branch and upstream orig.tar ball are there and up to date.)Tj 291.403 0 Td 0.072 Tw (\(Best called after a)Tj -320.534 -12 Td 0 Tw (clone or a pull\).)Tj /R36290528 10 Tf -36 -28.8 Td (status)Tj /R35954040 10 Tf 27.5 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td [(br)15.0159(anc)15.0159(h)]TJ /R35954040 10 Tf 28.0297 0 Td (])Tj -22.8598 -24 Td 0.024 Tw (Check the status of the current project \(or of the project belonging to the ar)Tj 300.096 0 Td (gument)Tj /R35626152 10 Tf 32.5238 0 Td [(br)15.0146(anc)15.0146(h)]TJ /R35954040 10 Tf 30.5535 0 Td 0.023 Tw (if that is)Tj -363.173 -12 Td (gi)Tj -0.15 Tc 7.53008 0 Td (ve)Tj 0 Tc 9.28984 0 Td 2.5 Tw (n\). Returns)Tj 49.4398 0 Td 0 Tw [(with non-zero e)14.9854(xit code if something to do is detected.)]TJ /R36290528 10 Tf -102.26 -28.8 Td [(check)15.0159(out-patched)]TJ /R35954040 10 Tf 36 -24 Td (Check)Tj 25.45 0 Td 1.02 Tw (out the patched branch \()Tj /R36290528 10 Tf 100.72 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 3.52 Tc /R35954040 10 Tf 36.5098 0 Td (\)a)Tj 0 Tc 11.2898 0 Td [(fter making sure it e)15.0098(xists and is one)]TJ -247.079 -12 Td 0 Tw (recorded in the)Tj /R36290528 10 Tf 62.4801 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 70.5699 0 Td (Œle.)Tj -133.05 -24 Td 0.148 Tw (If the patched branch references an old state \(i.e. one that is already ancestor of the current Debian)Tj -72 -45.6 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (5)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2313 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -937,29 +937,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 0 Tw (branch\), it is changed to the recorded current one.)Tj 24 TL (Otherwise you can reset it to the last recorded state with the)' /R12164640 10 Tf 241.62 0 Td [(--f)25.0146(or)17.9834(ce)]TJ /R11828152 10 Tf 30.3801 0 Td (option.)Tj /R12164640 10 Tf -308 -28.8 Td (update-patches)Tj /R11828152 10 Tf 67.5 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj 2.5 Tc /R11828152 10 Tf 29.45 0 Td (][)Tj 0 Tc /R11500264 10 Tf 9.16016 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R11828152 10 Tf 53.0195 0 Td (])Tj -126.46 -24 Td 0.763 Tw (After calling)Tj /R12164640 10 Tf 54.8461 0 Td [(mer)9.98535(ge-patched-into-debian)]TJ /R11828152 10 Tf 119.263 0 Td (if necessary)Tj 3.263 Tc 47.593 0 Td (,u)Tj 0 Tc 10.7629 0 Td (pdate the contents of)Tj /R12164640 10 Tf 88.5922 0 Td (debian/patches)Tj /R11828152 10 Tf 67.1629 0 Td (to)Tj -388.22 -12 Td 0 Tw (the current state of the)Tj /R12164640 10 Tf 91.9199 0 Td (patched)Tj /R11828152 10 Tf 36.3898 0 Td (branch.)Tj -128.31 -24 Td (Also record in debian/.git-dpm which state of the patched branch the patches directory belongs to.)Tj 0.549 Tw (If a)' /R11500264 10 Tf 17.198 0 Td [(br)15.0159(anc)15.0159(h-name)]TJ /R11828152 10 Tf 56.0688 0 Td (is gi)Tj -0.15 Tc 17.2488 0 Td (ve)Tj 0 Tc 9.28984 0 Td [(n, that branch is processed.)-554.907(Otherwise the name is deri)]TJ -0.15 Tc 225.201 0 Td (ve)Tj 3.048 Tc 9.28984 0 Td (df)Tj 0 Tc 11.3781 0 Td 0.548 Tw (rom the cur)Tj 46.9961 0 Td (-)Tj -392.671 -12 Td 0 Tw [(rently check)10(ed out branch as usual.)]TJ (Options:)' /R12164640 10 Tf 16.8 TL T*[(--r)18.0078(edo)]TJ /R11828152 10 Tf 36 0 Td (Do something, e)Tj -0.15 Tc 65.5801 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.993(fi)249.985(ts)]TJ 0 Tc 28.0602 0 Td (eems lik)Tj 2.5 Tc 33.5102 0 Td (et)Tj 0 Tc 9.71992 0 Td (here is nothing to do.)Tj /R12164640 10 Tf -182.16 -28.8 Td [(--allo)10.0073(w-r)]TJ -0.15 Tc 36.9301 0 Td -2.3 Tw (ev e)Tj 0 Tc 13.6301 0 Td (rt)Tj /R11828152 10 Tf 7.76992 0 Td (,)Tj /R12164640 10 Tf 5 0 Td [(--ignor)17.9834(e-deletions)]TJ /R11828152 10 Tf 74.8102 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (--dot-git-Œles=)Tj /R11500264 10 Tf 60.6898 0 Td (*)Tj /R11828152 10 Tf -167.83 -12 Td 0 Tw [(passed on to mer)17.9834(ge-patched-into-debian)]TJ /R12164640 10 Tf -36 -28.8 Td (--amend)Tj /R11828152 10 Tf 36 -12 Td 1.612 Tw (Do not create a ne)Tj 4.112 Tc 78.948 0 Td (wc)Tj 0 Tc 15.7719 0 Td (ommit, b)Tj 37.532 0 Td 1.613 Tw [(ut amend the last one in the Debian branch.)-661.289(\(I.e. call)]TJ -132.252 -12 Td (mer)Tj 15.3699 0 Td 2.025 Tw (ge-patched-into-debian with --amend and amend the updates patches into the last)Tj -15.3699 -12 Td 0 Tw (commit e)Tj -0.15 Tc 37.25 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.993(ft)]TJ 0 Tc 18.8902 0 Td [(hat w)10.0146(as not created by mer)18(ge-patched-into-debian\).)]TJ /R12164640 10 Tf -101.43 -28.8 Td (-m)Tj /R11500264 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R11828152 10 Tf -2.5 -12 Td (Use)Tj /R11500264 10 Tf 18.4852 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R11828152 10 Tf 12.275 0 Td 0.435 Tw (as commit message.)Tj 86.5762 0 Td 0.436 Tw (\(If used together with --amend, do not reuse old com-)Tj -141.676 -12 Td 0.848 Tw (mit message, author or author date b)Tj 150.698 0 Td 0.847 Tw (ut replace the old commit with a ne)Tj 3.347 Tc 147.049 0 Td (wc)Tj 0 Tc 15.007 0 Td (ommit with)Tj -312.754 -12 Td 0 Tw (that message\).)Tj /R12164640 10 Tf -36 -28.8 Td [(--k)10.0073(eep-branch)]TJ /R11828152 10 Tf 36 -12 Td 0.734 Tw (do not remo)Tj -0.15 Tc 49.648 0 Td 1.034 Tw (ve a)Tj 3.234 Tc 16.9641 0 Td (ne)Tj 0 Tc 12.5238 0 Td 0.734 Tw (xisting patched branch \(usually that is remo)Tj -0.15 Tc 179.234 0 Td (ve)Tj 3.235 Tc 9.28984 0 Td (da)Tj 0 Tc 12.675 0 Td 0.735 Tw (nd can be recreated)Tj -280.335 -12 Td (with)Tj /R12164640 10 Tf 20.2801 0 Td [(check)15.0146(out-patched)]TJ /R11828152 10 Tf 77.9 0 Td 0 Tw (to a)Tj -0.2 Tc 14.5199 0 Td (vo)Tj 0 Tc 9.8 0 Td (id stale copies lurking around.)Tj /R12164640 10 Tf -158.5 -28.8 Td [(--allo)10.0073(w-nonlinear)]TJ /R11828152 10 Tf 36 -12 Td [(passed to mer)17.9834(ge-patched.)]TJ /R12164640 10 Tf -72 -28.8 Td (dch)Tj /R11828152 10 Tf 18.0602 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj /R11828152 10 Tf 29.45 0 Td (])Tj /R12164640 10 Tf 5.83008 0 Td (--)Tj /R11500264 10 Tf 9.16016 0 Td [(dc)15.0159(h-options)]TJ /R11828152 10 Tf -29.8305 -12 Td 0.793 Tw (After calling update-patches if necessary)Tj 3.293 Tc 165.802 0 Td (,r)Tj 0 Tc 9.12305 0 Td [(un de)25.0195(vscripts' dch with the speciŒed options and then)]TJ -174.925 -12 Td 0 Tw (do a)Tj /R12164640 10 Tf 19.4398 0 Td (git commit)Tj /R11828152 10 Tf 48.3199 0 Td (with a commit message containing changes to the)Tj /R12164640 10 Tf 201.09 0 Td (debian/changelog)Tj /R11828152 10 Tf 76.9602 0 Td (Œle.)Tj -345.81 -24 Td (Options:)Tj /R12164640 10 Tf (--amend)' /R11828152 10 Tf 36 -12 Td 0.558 Tw (Replace the commit currently the head of the Debian branch \()Tj /R12164640 10 Tf 252.74 0 Td (master)Tj /R11828152 10 Tf 29.4301 0 Td (|)Tj /R11500264 10 Tf 2 0 Td (something)Tj 3.059 Tc /R11828152 10 Tf 41.1102 0 Td (\)i)Tj 0 Tc 9.16914 0 Td (nstead)Tj -334.449 -12 Td 0.159 Tw (of creating a ne)Tj 2.658 Tc 62.1469 0 Td (wo)Tj 0 Tc 14.8781 0 Td 0.158 Tw [(ne on top.)-515.813(The commit message will also include changes done to)]TJ /R12164640 10 Tf 269.646 0 Td (de-)Tj -346.671 -12 Td (bian/changelog)Tj /R11828152 10 Tf 66.9602 0 Td 0 Tw [(in the pre)25.0073(vious commit \(unless re)]TJ -0.15 Tc 133.1 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rted by the ne)Tj 2.5 Tc 54.4602 0 Td (we)Tj 0 Tc 14.1602 0 Td (dit\).)Tj /R12164640 10 Tf -313.97 -28.8 Td [(--ignor)17.9846(e-patches)]TJ /R11828152 10 Tf 36 -12 Td 1.922 Tw [(Do not call update-patches b)20.0195(ut simply ignore the current state of the patched branch)]TJ 12 TL (\()' /R12164640 10 Tf 3.33008 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td (something)Tj /R11828152 10 Tf 41.1102 0 Td (\).)Tj -225.55 -48 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (6)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 0 Tw (branch\), it is changed to the recorded current one.)Tj 24 TL (Otherwise you can reset it to the last recorded state with the)' /R36290528 10 Tf 241.62 0 Td [(--f)25.0146(or)17.9834(ce)]TJ /R35954040 10 Tf 30.3801 0 Td (option.)Tj /R36290528 10 Tf -308 -28.8 Td (update-patches)Tj /R35954040 10 Tf 67.5 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj 2.5 Tc /R35954040 10 Tf 29.45 0 Td (][)Tj 0 Tc /R35626152 10 Tf 9.16016 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R35954040 10 Tf 53.0195 0 Td (])Tj -126.46 -24 Td 0.763 Tw (After calling)Tj /R36290528 10 Tf 54.8461 0 Td [(mer)9.98535(ge-patched-into-debian)]TJ /R35954040 10 Tf 119.263 0 Td (if necessary)Tj 3.263 Tc 47.593 0 Td (,u)Tj 0 Tc 10.7629 0 Td (pdate the contents of)Tj /R36290528 10 Tf 88.5922 0 Td (debian/patches)Tj /R35954040 10 Tf 67.1629 0 Td (to)Tj -388.22 -12 Td 0 Tw (the current state of the)Tj /R36290528 10 Tf 91.9199 0 Td (patched)Tj /R35954040 10 Tf 36.3898 0 Td (branch.)Tj -128.31 -24 Td (Also record in debian/.git-dpm which state of the patched branch the patches directory belongs to.)Tj 0.549 Tw (If a)' /R35626152 10 Tf 17.198 0 Td [(br)15.0159(anc)15.0159(h-name)]TJ /R35954040 10 Tf 56.0688 0 Td (is gi)Tj -0.15 Tc 17.2488 0 Td (ve)Tj 0 Tc 9.28984 0 Td [(n, that branch is processed.)-554.907(Otherwise the name is deri)]TJ -0.15 Tc 225.201 0 Td (ve)Tj 3.048 Tc 9.28984 0 Td (df)Tj 0 Tc 11.3781 0 Td 0.548 Tw (rom the cur)Tj 46.9961 0 Td (-)Tj -392.671 -12 Td 0 Tw [(rently check)10(ed out branch as usual.)]TJ (Options:)' /R36290528 10 Tf 16.8 TL T*[(--r)18.0078(edo)]TJ /R35954040 10 Tf 36 0 Td (Do something, e)Tj -0.15 Tc 65.5801 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.993(fi)249.985(ts)]TJ 0 Tc 28.0602 0 Td (eems lik)Tj 2.5 Tc 33.5102 0 Td (et)Tj 0 Tc 9.71992 0 Td (here is nothing to do.)Tj /R36290528 10 Tf -182.16 -28.8 Td [(--allo)10.0073(w-r)]TJ -0.15 Tc 36.9301 0 Td -2.3 Tw (ev e)Tj 0 Tc 13.6301 0 Td (rt)Tj /R35954040 10 Tf 7.76992 0 Td (,)Tj /R36290528 10 Tf 5 0 Td [(--ignor)17.9834(e-deletions)]TJ /R35954040 10 Tf 74.8102 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (--dot-git-Œles=)Tj /R35626152 10 Tf 60.6898 0 Td (*)Tj /R35954040 10 Tf -167.83 -12 Td 0 Tw [(passed on to mer)17.9834(ge-patched-into-debian)]TJ /R36290528 10 Tf -36 -28.8 Td (--amend)Tj /R35954040 10 Tf 36 -12 Td 1.612 Tw (Do not create a ne)Tj 4.112 Tc 78.948 0 Td (wc)Tj 0 Tc 15.7719 0 Td (ommit, b)Tj 37.532 0 Td 1.613 Tw [(ut amend the last one in the Debian branch.)-661.289(\(I.e. call)]TJ -132.252 -12 Td (mer)Tj 15.3699 0 Td 2.025 Tw (ge-patched-into-debian with --amend and amend the updates patches into the last)Tj -15.3699 -12 Td 0 Tw (commit e)Tj -0.15 Tc 37.25 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.993(ft)]TJ 0 Tc 18.8902 0 Td [(hat w)10.0146(as not created by mer)18(ge-patched-into-debian\).)]TJ /R36290528 10 Tf -101.43 -28.8 Td (-m)Tj /R35626152 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R35954040 10 Tf -2.5 -12 Td (Use)Tj /R35626152 10 Tf 18.4852 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R35954040 10 Tf 12.275 0 Td 0.435 Tw (as commit message.)Tj 86.5762 0 Td 0.436 Tw (\(If used together with --amend, do not reuse old com-)Tj -141.676 -12 Td 0.848 Tw (mit message, author or author date b)Tj 150.698 0 Td 0.847 Tw (ut replace the old commit with a ne)Tj 3.347 Tc 147.049 0 Td (wc)Tj 0 Tc 15.007 0 Td (ommit with)Tj -312.754 -12 Td 0 Tw (that message\).)Tj /R36290528 10 Tf -36 -28.8 Td [(--k)10.0073(eep-branch)]TJ /R35954040 10 Tf 36 -12 Td 0.734 Tw (do not remo)Tj -0.15 Tc 49.648 0 Td 1.034 Tw (ve a)Tj 3.234 Tc 16.9641 0 Td (ne)Tj 0 Tc 12.5238 0 Td 0.734 Tw (xisting patched branch \(usually that is remo)Tj -0.15 Tc 179.234 0 Td (ve)Tj 3.235 Tc 9.28984 0 Td (da)Tj 0 Tc 12.675 0 Td 0.735 Tw (nd can be recreated)Tj -280.335 -12 Td (with)Tj /R36290528 10 Tf 20.2801 0 Td [(check)15.0146(out-patched)]TJ /R35954040 10 Tf 77.9 0 Td 0 Tw (to a)Tj -0.2 Tc 14.5199 0 Td (vo)Tj 0 Tc 9.8 0 Td (id stale copies lurking around.)Tj /R36290528 10 Tf -158.5 -28.8 Td [(--allo)10.0073(w-nonlinear)]TJ /R35954040 10 Tf 36 -12 Td [(passed to mer)17.9834(ge-patched.)]TJ /R36290528 10 Tf -72 -28.8 Td (dch)Tj /R35954040 10 Tf 18.0602 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj /R35954040 10 Tf 29.45 0 Td (])Tj /R36290528 10 Tf 5.83008 0 Td (--)Tj /R35626152 10 Tf 9.16016 0 Td [(dc)15.0159(h-options)]TJ /R35954040 10 Tf -29.8305 -12 Td 0.793 Tw (After calling update-patches if necessary)Tj 3.293 Tc 165.802 0 Td (,r)Tj 0 Tc 9.12305 0 Td [(un de)25.0195(vscripts' dch with the speciŒed options and then)]TJ -174.925 -12 Td 0 Tw (do a)Tj /R36290528 10 Tf 19.4398 0 Td (git commit)Tj /R35954040 10 Tf 48.3199 0 Td (with a commit message containing changes to the)Tj /R36290528 10 Tf 201.09 0 Td (debian/changelog)Tj /R35954040 10 Tf 76.9602 0 Td (Œle.)Tj -345.81 -24 Td (Options:)Tj /R36290528 10 Tf (--amend)' /R35954040 10 Tf 36 -12 Td 0.558 Tw (Replace the commit currently the head of the Debian branch \()Tj /R36290528 10 Tf 252.74 0 Td (master)Tj /R35954040 10 Tf 29.4301 0 Td (|)Tj /R35626152 10 Tf 2 0 Td (something)Tj 3.059 Tc /R35954040 10 Tf 41.1102 0 Td (\)i)Tj 0 Tc 9.16914 0 Td (nstead)Tj -334.449 -12 Td 0.159 Tw (of creating a ne)Tj 2.658 Tc 62.1469 0 Td (wo)Tj 0 Tc 14.8781 0 Td 0.158 Tw [(ne on top.)-515.813(The commit message will also include changes done to)]TJ /R36290528 10 Tf 269.646 0 Td (de-)Tj -346.671 -12 Td (bian/changelog)Tj /R35954040 10 Tf 66.9602 0 Td 0 Tw [(in the pre)25.0073(vious commit \(unless re)]TJ -0.15 Tc 133.1 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rted by the ne)Tj 2.5 Tc 54.4602 0 Td (we)Tj 0 Tc 14.1602 0 Td (dit\).)Tj /R36290528 10 Tf -313.97 -28.8 Td [(--ignor)17.9846(e-patches)]TJ /R35954040 10 Tf 36 -12 Td 1.922 Tw [(Do not call update-patches b)20.0195(ut simply ignore the current state of the patched branch)]TJ 12 TL (\()' /R36290528 10 Tf 3.33008 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td (something)Tj /R35954040 10 Tf 41.1102 0 Td (\).)Tj -225.55 -48 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (6)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2190 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -996,29 +996,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -384.34 -36 Td [(--k)10.0073(eep-branch)]TJ /R11828152 10 Tf 60.45 0 Td (,)Tj /R12164640 10 Tf 5 0 Td [(--allo)10.0073(w-r)]TJ -0.15 Tc 36.9301 0 Td -2.3 Tw (ev e)Tj 0 Tc 13.6301 0 Td (rt)Tj /R11828152 10 Tf 7.76992 0 Td (,)Tj /R12164640 10 Tf 5 0 Td [(--allo)10.0073(w-nonlinear)]TJ /R11828152 10 Tf 73.7898 0 Td (,)Tj /R12164640 10 Tf 5 0 Td [(--ignor)17.9834(e-deletions)]TJ /R11828152 10 Tf 74.8102 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (--dot-git-Œles=)Tj /R11500264 10 Tf 60.6898 0 Td (*)Tj -0.15 Tc /R11828152 10 Tf -312.07 -12 Td (Pa)Tj 0 Tc 9.85 0 Td 0 Tw (ssed to update-patches, if called.)Tj /R12164640 10 Tf -45.85 -28.8 Td (--latest-only)Tj /R11828152 10 Tf 51.1 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (--latest)Tj /R11828152 10 Tf 29.4301 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (-l)Tj /R11828152 10 Tf -48.5301 -12 Td 0.434 Tw (Only include changes between the current w)Tj 180.234 0 Td 0.433 Tw (orking directory before calling dch and after)Tj -180.234 -12 Td 0 Tw (calling it \(and not since the last commit or the last commit not replaced\).)Tj /R12164640 10 Tf -36 -28.8 Td (-e)Tj /R11828152 10 Tf 10.2699 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (-v)Tj /R11828152 10 Tf 10.8301 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (-a)Tj /R11828152 10 Tf 10.8301 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--all)Tj /R11828152 10 Tf 19.7199 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (-s)Tj /R11828152 10 Tf 9.71992 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (-n)Tj /R11828152 10 Tf 11.3898 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td [(--no-v)10(erify)]TJ /R11828152 10 Tf 47.9398 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (-u)Tj /R11828152 10 Tf 11.3898 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td [(--untrack)10(ed-Œles)]TJ /R11828152 10 Tf 72.95 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (-q)Tj /R11828152 10 Tf 11.3898 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--quiet)Tj /R11828152 10 Tf 30.8301 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--cleanup=)Tj /R11500264 10 Tf 45.7 0 Td (...)Tj /R11828152 10 Tf 10 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--au-)Tj -356.959 -12 Td (thor=)Tj /R11500264 10 Tf 24.0301 0 Td (...)Tj /R11828152 10 Tf 11.9699 -12 Td (passed to git commit.)Tj /R12164640 10 Tf -72 -28.8 Td [(mer)9.98413(ge-patched-into-debian)]TJ /R11828152 10 Tf 118.5 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj 2.5 Tc /R11828152 10 Tf 29.45 0 Td (][)Tj 0 Tc /R11500264 10 Tf 9.16016 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R11828152 10 Tf 53.0195 0 Td (])Tj -177.46 -12 Td (Usually)Tj /R12164640 10 Tf 33.6102 0 Td (update-patches)Tj /R11828152 10 Tf 67.5 0 Td [(runs this for you if deemed necessary)64.9854(.)]TJ -101.11 -24 Td 0.8 Tw (This command is the core of)Tj /R12164640 10 Tf 121.45 0 Td (git-dpm)Tj 3.3 Tc /R11828152 10 Tf 33.8898 0 Td (,b)Tj 0 Tc 10.6 0 Td (ut you usually do not call it directly)Tj 5.8 Tc 147.45 0 Td (.I)Tj 3.3 Tc 11.6301 0 Td [(ti)329.985(sc)]TJ 0 Tc 20.4902 0 Td (alled by)Tj /R12164640 10 Tf 36.0398 0 Td (up-)Tj -381.55 -12 Td (date-patches)Tj /R11828152 10 Tf 56.3801 0 Td 0 Tw (and things calling)Tj /R12164640 10 Tf 73.6102 0 Td (update-patches)Tj /R11828152 10 Tf 67.5 0 Td [(lik)9.98535(e)]TJ /R12164640 10 Tf 17.4 0 Td (dch)Tj /R11828152 10 Tf 18.0602 0 Td [(when necessary)64.9902(.)]TJ -232.95 -24 Td 0.34 Tw [(It replaces all Œles \(with only the e)15.0073(xceptions described belo)25(w\) in the current Debian branch \()]TJ /R12164640 10 Tf 375.45 0 Td (mas-)Tj -375.45 -12 Td (ter)Tj /R11828152 10 Tf 12.2102 0 Td (|)Tj /R11500264 10 Tf 2 0 Td [(whate)15.0159(ver)]TJ 2.5 Tc /R11828152 10 Tf 36.5098 0 Td (\)w)Tj 0 Tc 13.05 0 Td 0 Tw (ith those found in the patched branch \()Tj /R12164640 10 Tf 154.14 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\).)Tj -327.529 -24 Td 0.469 Tw (Only the)Tj /R12164640 10 Tf 38.1578 0 Td (debian)Tj /R11828152 10 Tf 31.8691 0 Td (directory and Œles in the root directory starting with ".git" are k)Tj 258.189 0 Td 0.47 Tw (ept from the De-)Tj -328.216 -12 Td 0.975 Tw (bian branch \(so)Tj /R12164640 10 Tf 67.075 0 Td [(.gitignor)17.9834(e)]TJ /R11828152 10 Tf 40.65 0 Td (,)Tj /R12164640 10 Tf 5.975 0 Td [(.gitattrib)20(utes)]TJ 3.475 Tc /R11828152 10 Tf 55.0699 0 Td (,.)Tj 0 Tc 8.475 0 Td (.. will stay\).)Tj 55.4238 0 Td 0.974 Tw (And all Œles that were found in the last)Tj -232.669 -12 Td 0.536 Tw (recorded patched branch and deleted in the current Debian branch will also be deleted in the ne)Tj 388.776 0 Td (w)Tj -388.776 -12 Td (one.)Tj 24 TL 1.064 Tw (Additionally the)' /R12164640 10 Tf 69.907 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 71.6328 0 Td 1.063 Tw (Œle will be updated so the current patched branch is recorded)Tj -141.54 -12 Td 0 Tw [(and is mark)9.98413(ed as belonging to the last recorded upstream branch.)]TJ 0.068 Tw (If there is no)' /R11500264 10 Tf 53.5922 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R11828152 10 Tf 55.5875 0 Td (gi)Tj -0.15 Tc 7.53008 0 Td (ve)Tj 2.568 Tc 9.28984 0 Td [(no)256.804(nt)]TJ 0 Tc 22.916 0 Td 0.069 Tw (he command line the base name of the branches to operate on)Tj -148.916 -12 Td 0 Tw [(is computed from the currently check)10.0146(ed out branch as usual. Otherwise this ar)17.9834(gument is used.)]TJ (Options:)' /R12164640 10 Tf 16.8 TL T*[(--allo)10.0073(w-r)]TJ -0.15 Tc 36.9301 0 Td -2.3 Tw (ev e)Tj 0 Tc 13.6301 0 Td (rt)Tj /R11828152 10 Tf -14.5602 -12 Td 0.71 Tw (Usually re)Tj -0.15 Tc 41.8398 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0.709 Tw [(rting to an old state of the patched branch is not allo)25.0098(wed, to a)]TJ -0.2 Tc 253.177 0 Td (vo)Tj 0 Tc 9.8 0 Td (id mistak)Tj 37.559 0 Td (es)Tj -351.666 -12 Td (\(lik)Tj 3.528 Tc 13.7898 0 Td (eh)Tj -0.2 Tc 12.968 0 Td (av)Tj 0 Tc 9.23984 0 Td 1.028 Tw (ing only pulled the Debian branch and for)Tj 174.486 0 Td 1.029 Tw (got to run)Tj /R12164640 10 Tf 44.477 0 Td [(check)15.0146(out-patched)]TJ /R11828152 10 Tf 75.4 0 Td 3.529 Tw (\). This)Tj -330.361 -12 Td 0 Tw [(option changes that so you can for e)15.0146(xample drop the last patch in your stack.)]TJ /R12164640 10 Tf -36 -28.8 Td [(--no-ignor)18(e-deletions)]TJ /R11828152 10 Tf 91.2 0 Td [(\(def)10(ault\))]TJ -55.2 -12 Td 0.657 Tw (Files deleted currently in the Debian branch relati)Tj -0.15 Tc 202.919 0 Td 0.957 Tw (ve t)Tj 3.157 Tc 15.227 0 Td (ot)Tj 0 Tc 10.9371 0 Td 0.657 Tw (he recorded patched branch will)Tj -229.083 -12 Td 1.267 Tw (still be deleted in the ne)Tj 3.767 Tc 101.355 0 Td (wD)Tj 0 Tc 18.207 0 Td (ebian branch and not tak)Tj 103.278 0 Td 1.268 Tw (en from the ne)Tj 3.768 Tc 61.5941 0 Td (wp)Tj 0 Tc 15.9879 0 Td (atched branch.)Tj -300.422 -12 Td 0 Tw [(This is the def)10.0146(ault unless a dif)25(ferent def)10.0146(ault w)10.0073(as set with)]TJ /R12164640 10 Tf 2.5 -12 Td (git conŒg dpm.)Tj /R11500264 10 Tf 63.6199 0 Td [(BRANCHN)27.0166(AME)]TJ /R12164640 10 Tf 65.8398 0 Td [(.dpmIgnor)17.9834(eDeletions true)]TJ /R11828152 10 Tf 109.81 0 Td (.)Tj /R12164640 10 Tf -277.77 -28.8 Td [(--ignor)17.9846(e-deletions)]TJ /R11828152 10 Tf 36 -12 Td [(Disable the beha)20(vior described in)]TJ /R12164640 10 Tf 136.16 0 Td [(--no-ignor)18(e-deletions)]TJ /R11828152 10 Tf 88.7 0 Td (.)Tj /R12164640 10 Tf -260.86 -28.8 Td (--dot-git-Œles=)Tj /R11500264 10 Tf 61.0699 0 Td (method)Tj /R11828152 10 Tf -25.0699 -12 Td 0.664 Tw (Specify ho)Tj 3.163 Tc 43.4641 0 Td (wŒ)Tj 0 Tc 15.943 0 Td 0.663 Tw (les starting with)Tj /R12164640 10 Tf 68.3789 0 Td (.git)Tj /R11828152 10 Tf 16.773 0 Td (outside)Tj /R12164640 10 Tf 32.0531 0 Td (debian/)Tj /R11828152 10 Tf 34.843 0 Td [(are handled.)-566.309(Those are handles spe-)]TJ -211.455 -12 Td 0.031 Tw (cially as)Tj /R12164640 10 Tf 35.6121 0 Td [(.gitattrib)20(utes)]TJ /R11828152 10 Tf 57.6012 0 Td (and)Tj /R12164640 10 Tf 16.9711 0 Td [(.gitignor)17.9834(e)]TJ /R11828152 10 Tf 43.1812 0 Td (might be dif)Tj 48.702 0 Td 0.032 Tw (ferent in the Debian branch without be-)Tj -202.068 -12 Td 1.425 Tw (ing part of an)Tj 3.925 Tc 57.725 0 Td (yp)Tj 0 Tc 13.925 0 Td 3.925 Tw (atch. \(The)Tj 48.3898 0 Td (whole)Tj /R12164640 10 Tf 28.3648 0 Td (debian/)Tj /R11828152 10 Tf 35.6051 0 Td 1.425 Tw (directory is al)Tj -0.1 Tc 57.7398 0 Td (wa)Tj 0 Tc 11.5602 0 Td [(ys tak)9.98535(en from the Debian)]TJ -253.31 -12 Td 0 Tw [(branch, so Œles there are not af)25.0073(fected\).)]TJ -108 -50.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (7)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -384.34 -36 Td [(--k)10.0073(eep-branch)]TJ /R35954040 10 Tf 60.45 0 Td (,)Tj /R36290528 10 Tf 5 0 Td [(--allo)10.0073(w-r)]TJ -0.15 Tc 36.9301 0 Td -2.3 Tw (ev e)Tj 0 Tc 13.6301 0 Td (rt)Tj /R35954040 10 Tf 7.76992 0 Td (,)Tj /R36290528 10 Tf 5 0 Td [(--allo)10.0073(w-nonlinear)]TJ /R35954040 10 Tf 73.7898 0 Td (,)Tj /R36290528 10 Tf 5 0 Td [(--ignor)17.9834(e-deletions)]TJ /R35954040 10 Tf 74.8102 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (--dot-git-Œles=)Tj /R35626152 10 Tf 60.6898 0 Td (*)Tj -0.15 Tc /R35954040 10 Tf -312.07 -12 Td (Pa)Tj 0 Tc 9.85 0 Td 0 Tw (ssed to update-patches, if called.)Tj /R36290528 10 Tf -45.85 -28.8 Td (--latest-only)Tj /R35954040 10 Tf 51.1 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (--latest)Tj /R35954040 10 Tf 29.4301 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (-l)Tj /R35954040 10 Tf -48.5301 -12 Td 0.434 Tw (Only include changes between the current w)Tj 180.234 0 Td 0.433 Tw (orking directory before calling dch and after)Tj -180.234 -12 Td 0 Tw (calling it \(and not since the last commit or the last commit not replaced\).)Tj /R36290528 10 Tf -36 -28.8 Td (-e)Tj /R35954040 10 Tf 10.2699 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (-v)Tj /R35954040 10 Tf 10.8301 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (-a)Tj /R35954040 10 Tf 10.8301 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--all)Tj /R35954040 10 Tf 19.7199 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (-s)Tj /R35954040 10 Tf 9.71992 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (-n)Tj /R35954040 10 Tf 11.3898 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td [(--no-v)10(erify)]TJ /R35954040 10 Tf 47.9398 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (-u)Tj /R35954040 10 Tf 11.3898 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td [(--untrack)10(ed-Œles)]TJ /R35954040 10 Tf 72.95 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (-q)Tj /R35954040 10 Tf 11.3898 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--quiet)Tj /R35954040 10 Tf 30.8301 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--cleanup=)Tj /R35626152 10 Tf 45.7 0 Td (...)Tj /R35954040 10 Tf 10 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--au-)Tj -356.959 -12 Td (thor=)Tj /R35626152 10 Tf 24.0301 0 Td (...)Tj /R35954040 10 Tf 11.9699 -12 Td (passed to git commit.)Tj /R36290528 10 Tf -72 -28.8 Td [(mer)9.98413(ge-patched-into-debian)]TJ /R35954040 10 Tf 118.5 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj 2.5 Tc /R35954040 10 Tf 29.45 0 Td (][)Tj 0 Tc /R35626152 10 Tf 9.16016 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R35954040 10 Tf 53.0195 0 Td (])Tj -177.46 -12 Td (Usually)Tj /R36290528 10 Tf 33.6102 0 Td (update-patches)Tj /R35954040 10 Tf 67.5 0 Td [(runs this for you if deemed necessary)64.9854(.)]TJ -101.11 -24 Td 0.8 Tw (This command is the core of)Tj /R36290528 10 Tf 121.45 0 Td (git-dpm)Tj 3.3 Tc /R35954040 10 Tf 33.8898 0 Td (,b)Tj 0 Tc 10.6 0 Td (ut you usually do not call it directly)Tj 5.8 Tc 147.45 0 Td (.I)Tj 3.3 Tc 11.6301 0 Td [(ti)329.985(sc)]TJ 0 Tc 20.4902 0 Td (alled by)Tj /R36290528 10 Tf 36.0398 0 Td (up-)Tj -381.55 -12 Td (date-patches)Tj /R35954040 10 Tf 56.3801 0 Td 0 Tw (and things calling)Tj /R36290528 10 Tf 73.6102 0 Td (update-patches)Tj /R35954040 10 Tf 67.5 0 Td [(lik)9.98535(e)]TJ /R36290528 10 Tf 17.4 0 Td (dch)Tj /R35954040 10 Tf 18.0602 0 Td [(when necessary)64.9902(.)]TJ -232.95 -24 Td 0.34 Tw [(It replaces all Œles \(with only the e)15.0073(xceptions described belo)25(w\) in the current Debian branch \()]TJ /R36290528 10 Tf 375.45 0 Td (mas-)Tj -375.45 -12 Td (ter)Tj /R35954040 10 Tf 12.2102 0 Td (|)Tj /R35626152 10 Tf 2 0 Td [(whate)15.0159(ver)]TJ 2.5 Tc /R35954040 10 Tf 36.5098 0 Td (\)w)Tj 0 Tc 13.05 0 Td 0 Tw (ith those found in the patched branch \()Tj /R36290528 10 Tf 154.14 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\).)Tj -327.529 -24 Td 0.469 Tw (Only the)Tj /R36290528 10 Tf 38.1578 0 Td (debian)Tj /R35954040 10 Tf 31.8691 0 Td (directory and Œles in the root directory starting with ".git" are k)Tj 258.189 0 Td 0.47 Tw (ept from the De-)Tj -328.216 -12 Td 0.975 Tw (bian branch \(so)Tj /R36290528 10 Tf 67.075 0 Td [(.gitignor)17.9834(e)]TJ /R35954040 10 Tf 40.65 0 Td (,)Tj /R36290528 10 Tf 5.975 0 Td [(.gitattrib)20(utes)]TJ 3.475 Tc /R35954040 10 Tf 55.0699 0 Td (,.)Tj 0 Tc 8.475 0 Td (.. will stay\).)Tj 55.4238 0 Td 0.974 Tw (And all Œles that were found in the last)Tj -232.669 -12 Td 0.536 Tw (recorded patched branch and deleted in the current Debian branch will also be deleted in the ne)Tj 388.776 0 Td (w)Tj -388.776 -12 Td (one.)Tj 24 TL 1.064 Tw (Additionally the)' /R36290528 10 Tf 69.907 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 71.6328 0 Td 1.063 Tw (Œle will be updated so the current patched branch is recorded)Tj -141.54 -12 Td 0 Tw [(and is mark)9.98413(ed as belonging to the last recorded upstream branch.)]TJ 0.068 Tw (If there is no)' /R35626152 10 Tf 53.5922 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R35954040 10 Tf 55.5875 0 Td (gi)Tj -0.15 Tc 7.53008 0 Td (ve)Tj 2.568 Tc 9.28984 0 Td [(no)256.804(nt)]TJ 0 Tc 22.916 0 Td 0.069 Tw (he command line the base name of the branches to operate on)Tj -148.916 -12 Td 0 Tw [(is computed from the currently check)10.0146(ed out branch as usual. Otherwise this ar)17.9834(gument is used.)]TJ (Options:)' /R36290528 10 Tf 16.8 TL T*[(--allo)10.0073(w-r)]TJ -0.15 Tc 36.9301 0 Td -2.3 Tw (ev e)Tj 0 Tc 13.6301 0 Td (rt)Tj /R35954040 10 Tf -14.5602 -12 Td 0.71 Tw (Usually re)Tj -0.15 Tc 41.8398 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0.709 Tw [(rting to an old state of the patched branch is not allo)25.0098(wed, to a)]TJ -0.2 Tc 253.177 0 Td (vo)Tj 0 Tc 9.8 0 Td (id mistak)Tj 37.559 0 Td (es)Tj -351.666 -12 Td (\(lik)Tj 3.528 Tc 13.7898 0 Td (eh)Tj -0.2 Tc 12.968 0 Td (av)Tj 0 Tc 9.23984 0 Td 1.028 Tw (ing only pulled the Debian branch and for)Tj 174.486 0 Td 1.029 Tw (got to run)Tj /R36290528 10 Tf 44.477 0 Td [(check)15.0146(out-patched)]TJ /R35954040 10 Tf 75.4 0 Td 3.529 Tw (\). This)Tj -330.361 -12 Td 0 Tw [(option changes that so you can for e)15.0146(xample drop the last patch in your stack.)]TJ /R36290528 10 Tf -36 -28.8 Td [(--no-ignor)18(e-deletions)]TJ /R35954040 10 Tf 91.2 0 Td [(\(def)10(ault\))]TJ -55.2 -12 Td 0.657 Tw (Files deleted currently in the Debian branch relati)Tj -0.15 Tc 202.919 0 Td 0.957 Tw (ve t)Tj 3.157 Tc 15.227 0 Td (ot)Tj 0 Tc 10.9371 0 Td 0.657 Tw (he recorded patched branch will)Tj -229.083 -12 Td 1.267 Tw (still be deleted in the ne)Tj 3.767 Tc 101.355 0 Td (wD)Tj 0 Tc 18.207 0 Td (ebian branch and not tak)Tj 103.278 0 Td 1.268 Tw (en from the ne)Tj 3.768 Tc 61.5941 0 Td (wp)Tj 0 Tc 15.9879 0 Td (atched branch.)Tj -300.422 -12 Td 0 Tw [(This is the def)10.0146(ault unless a dif)25(ferent def)10.0146(ault w)10.0073(as set with)]TJ /R36290528 10 Tf 2.5 -12 Td (git conŒg dpm.)Tj /R35626152 10 Tf 63.6199 0 Td [(BRANCHN)27.0166(AME)]TJ /R36290528 10 Tf 65.8398 0 Td [(.dpmIgnor)17.9834(eDeletions true)]TJ /R35954040 10 Tf 109.81 0 Td (.)Tj /R36290528 10 Tf -277.77 -28.8 Td [(--ignor)17.9846(e-deletions)]TJ /R35954040 10 Tf 36 -12 Td [(Disable the beha)20(vior described in)]TJ /R36290528 10 Tf 136.16 0 Td [(--no-ignor)18(e-deletions)]TJ /R35954040 10 Tf 88.7 0 Td (.)Tj /R36290528 10 Tf -260.86 -28.8 Td (--dot-git-Œles=)Tj /R35626152 10 Tf 61.0699 0 Td (method)Tj /R35954040 10 Tf -25.0699 -12 Td 0.664 Tw (Specify ho)Tj 3.163 Tc 43.4641 0 Td (wŒ)Tj 0 Tc 15.943 0 Td 0.663 Tw (les starting with)Tj /R36290528 10 Tf 68.3789 0 Td (.git)Tj /R35954040 10 Tf 16.773 0 Td (outside)Tj /R36290528 10 Tf 32.0531 0 Td (debian/)Tj /R35954040 10 Tf 34.843 0 Td [(are handled.)-566.309(Those are handles spe-)]TJ -211.455 -12 Td 0.031 Tw (cially as)Tj /R36290528 10 Tf 35.6121 0 Td [(.gitattrib)20(utes)]TJ /R35954040 10 Tf 57.6012 0 Td (and)Tj /R36290528 10 Tf 16.9711 0 Td [(.gitignor)17.9834(e)]TJ /R35954040 10 Tf 43.1812 0 Td (might be dif)Tj 48.702 0 Td 0.032 Tw (ferent in the Debian branch without be-)Tj -202.068 -12 Td 1.425 Tw (ing part of an)Tj 3.925 Tc 57.725 0 Td (yp)Tj 0 Tc 13.925 0 Td 3.925 Tw (atch. \(The)Tj 48.3898 0 Td (whole)Tj /R36290528 10 Tf 28.3648 0 Td (debian/)Tj /R35954040 10 Tf 35.6051 0 Td 1.425 Tw (directory is al)Tj -0.1 Tc 57.7398 0 Td (wa)Tj 0 Tc 11.5602 0 Td [(ys tak)9.98535(en from the Debian)]TJ -253.31 -12 Td 0 Tw [(branch, so Œles there are not af)25.0073(fected\).)]TJ -108 -50.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (7)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2810 │ │ │ │ │ +2809 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1055,29 +1055,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -348.34 -36 Td 0 Tw (Possible methods are:)Tj /R12164640 10 Tf 16.8 TL (automatic)' /R11828152 10 Tf 45.2699 0 Td [(\(def)10(ault\))]TJ -9.26992 -12 Td [(An)15.0073(y)]TJ /R12164640 10 Tf 19.7668 0 Td (.git)Tj /R11500264 10 Tf 13.6102 0 Td (*)Tj /R11828152 10 Tf 7.69688 0 Td 0.198 Tw (Œles that are added, modiŒed or remo)Tj -0.15 Tc 150.738 0 Td (ve)Tj 2.698 Tc 9.28984 0 Td [(di)269.785(nt)]TJ 0 Tc 20.9563 0 Td (he current Debian branch)Tj -222.058 -12 Td 0.028 Tw (compared to the old upstream branch are set to this state, e)Tj -0.15 Tc 234.458 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0.027 Tw (rything else is tak)Tj 70.8109 0 Td (en)Tj -314.559 -12 Td 0 Tw (as found in the ne)Tj 2.5 Tc 70.85 0 Td (wp)Tj 0 Tc 14.7199 0 Td (atched branch.)Tj /R12164640 10 Tf -121.57 -28.8 Td (debian)Tj /R11828152 10 Tf 36 0 Td (All)Tj /R12164640 10 Tf 16.793 0 Td (.git)Tj /R11500264 10 Tf 13.6102 0 Td (*)Tj /R11828152 10 Tf 9.01289 0 Td 1.513 Tw [(Œles are tak)9.98291(en from the Debian branch.)]TJ 171.282 0 Td 1.514 Tw (Files with a name lik)Tj 4.014 Tc 89.8461 0 Td (et)Tj 0 Tc 11.234 0 Td (hat)Tj -311.778 -12 Td 0 Tw (from the patched branch are ignored.)Tj /R12164640 10 Tf -36 -28.8 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 36 -12 Td 0.789 Tw (Files starting with)Tj /R12164640 10 Tf 77.0969 0 Td (.git)Tj /R11828152 10 Tf 16.8988 0 Td (are not gi)Tj -0.15 Tc 39.098 0 Td (ve)Tj 3.288 Tc 9.28984 0 Td (ns)Tj 0 Tc 12.1781 0 Td 0.788 Tw (pecial handling.)Tj 70.4559 0 Td (The)Tj 3.288 Tc 15.4 0 Td (ya)Tj 0 Tc 12.7281 0 Td [(re tak)9.98535(en from the)]TJ -253.146 -12 Td 1.634 Tw (patched branch, unless the)Tj 4.134 Tc 110.282 0 Td (ya)Tj 0 Tc 13.5738 0 Td (re deleted in the Debian branch and the def)Tj 185.142 0 Td (ault)Tj /R12164640 10 Tf -308.998 -12 Td [(--no-ignor)18(e-deletions)]TJ /R11828152 10 Tf 91.2 0 Td 0 Tw (is acti)Tj -0.15 Tc 23.3602 0 Td (ve)Tj 5 Tc 9.28984 0 Td (.\()Tj 0 Tc 10.8301 0 Td (i.e. just lik)Tj 2.5 Tc 42.1301 0 Td (ea)Tj -0.15 Tc 11.3801 0 Td 0.3 Tw (ny o)Tj 0 Tc 17.35 0 Td 0 Tw (ther Œle outside)Tj /R12164640 10 Tf 64.7199 0 Td (debian/)Tj /R11828152 10 Tf 31.6801 0 Td (\).)Tj /R12164640 10 Tf -373.94 -28.8 Td [(--k)10.0073(eep-branch)]TJ /R11828152 10 Tf 36 -12 Td 0.735 Tw (do not remo)Tj -0.15 Tc 49.65 0 Td 1.035 Tw (ve a)Tj 3.235 Tc 16.9648 0 Td (ne)Tj 0 Tc 12.525 0 Td 0.734 Tw (xisting patched branch \(usually that is remo)Tj -0.15 Tc 179.234 0 Td (ve)Tj 3.234 Tc 9.28984 0 Td (da)Tj 0 Tc 12.6738 0 Td (nd can be recreated)Tj -280.337 -12 Td (with)Tj /R12164640 10 Tf 20.2801 0 Td [(check)15.0146(out-patched)]TJ /R11828152 10 Tf 77.9 0 Td 0 Tw (to a)Tj -0.2 Tc 14.5199 0 Td (vo)Tj 0 Tc 9.8 0 Td (id stale copies lurking around\).)Tj /R12164640 10 Tf -158.5 -28.8 Td (--amend)Tj /R11828152 10 Tf 36 -12 Td 0.198 Tw [(Replace the last commit on your Debian branch \(as git commit --amend w)9.99023(ould do\).)]TJ -0.4 Tc 340.402 0 Td (Wi)Tj 0 Tc 11.8199 0 Td (th)Tj -352.222 -12 Td 0.612 Tw [(the e)15.0122(xception that e)]TJ -0.15 Tc 79.4758 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0.611 Tw (ry parent that is an ancestor of or equal to the ne)Tj 3.111 Tc 199.481 0 Td (wp)Tj 0 Tc 15.3309 0 Td (atched branch)Tj -303.577 -12 Td 0.402 Tw [(or the recorded patched branch is omitted.)-540.198(\(That is, you lose not only the commit on the)]TJ 12 TL 0.96 Tw T*[(Debian branch, b)19.9854(ut also a pre)24.9927(vious state of the patched branch if your last commit also)]TJ 0 Tw T*[(mer)18.0078(ged the patched branch\).)]TJ /R12164640 10 Tf -36 -28.8 Td (-m)Tj /R11500264 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R11828152 10 Tf -2.5 -12 Td 0.24 Tw (Commit message to use for the ne)Tj 2.74 Tc 137.29 0 Td (wc)Tj 0 Tc 14.4 0 Td [(ommit created.)-523.992(\(If used together with --amend, this)]TJ -151.69 -12 Td 0 Tw (disables reusing the old author and date\).)Tj /R12164640 10 Tf -36 -28.8 Td [(--allo)10.0073(w-nonlinear)]TJ /R11828152 10 Tf 36 -12 Td 0.682 Tw (do not abort with an error if the patched branch is no linear series of commits on top of)Tj 0.835 Tw T*[(the upstream branch.)-583.491(Using this option is not recommended as it easily hides problems)]TJ 0.102 Tw (with patched or upstream branch and may introduce brok)' 229.556 0 Td 0.101 Tw (en debian/patches/ series, as for)Tj 127.114 0 Td (-)Tj -356.67 -12 Td 0 Tw (mat-patch does no serialisation.)Tj /R12164640 10 Tf -72 -28.8 Td [(import-new-upstr)18.0078(eam)]TJ /R11828152 10 Tf 96.1898 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj /R11828152 10 Tf 29.45 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td [(.orig)15.0073(.tar)]TJ /R11828152 10 Tf -98.8 -12 Td 2.042 Tw (Import the contents of the gi)Tj -0.15 Tc 123.56 0 Td (ve)Tj 4.543 Tc 9.28984 0 Td (nt)Tj 0 Tc 12.323 0 Td 2.043 Tw (arŒle \(as with)Tj /R12164640 10 Tf 63.6191 0 Td (import-tar)Tj 4.543 Tc /R11828152 10 Tf 45.5398 0 Td (\)a)Tj 0 Tc 12.3129 0 Td (nd record this branch \(as with)Tj -0.18 Tc /R12164640 10 Tf -266.645 -12 Td (re)Tj 0 Tc 8.7 0 Td [(cord-new-upstr)18.0078(eam)]TJ /R11828152 10 Tf 83.6898 0 Td (\).)Tj -92.3898 -24 Td 0 Tw (This is roughly equi)Tj -0.25 Tc 80.0301 0 Td (va)Tj 0 Tc 9.18984 0 Td (lent to:)Tj /R12164640 10 Tf -86.7199 -12 Td (git-dpm import-tar -p)Tj /R11500264 10 Tf 95.8199 0 Td [(upstr)37.0166(eam Œlename)]TJ /R12164640 10 Tf -95.8199 -12 Td [(git check)15(out -b)]TJ /R11500264 10 Tf 65.6801 0 Td [(upstr)37.0166(eam)]TJ /R12164640 10 Tf -65.6801 -12 Td [(git-dpm r)18(ecord-new-upstr)17.9834(eam)]TJ /R11500264 10 Tf 131.28 0 Td (Œlename)Tj /R12164640 10 Tf -133.78 -28.8 Td (--detached)Tj /R11828152 10 Tf 36 -12 Td 0.309 Tw (Don't mak)Tj 2.809 Tc 43.259 0 Td (et)Tj 0 Tc 10.0289 0 Td (he ne)Tj 2.809 Tc 21.4391 0 Td (wu)Tj 0 Tc 15.0289 0 Td 0.308 Tw (pstream branch an ancestor of the old upstream branch \(unless you)Tj -89.7559 -12 Td 0 Tw (re-add that with)Tj /R12164640 10 Tf 65.8199 0 Td (-p)Tj /R11828152 10 Tf 8.88984 0 Td (\).)Tj /R12164640 10 Tf -110.71 -16.8 Td (-p)Tj /R11500264 10 Tf 11.3898 0 Td (commit-id)Tj /R11828152 10 Tf 40.55 0 Td (|)Tj /R12164640 10 Tf 2 0 Td [(--par)17.9932(ent)]TJ /R11500264 10 Tf 37.3102 0 Td (commit-id)Tj /R11828152 10 Tf -55.25 -12 Td (Gi)Tj -0.15 Tc 9.75 0 Td (ve)Tj 0 Tc /R12164640 10 Tf 11.7898 0 Td (import-tar)Tj /R11828152 10 Tf 48.0398 0 Td (additional parents of the ne)Tj 2.5 Tc 108.62 0 Td (wc)Tj 0 Tc 14.1602 0 Td (ommit to create.)Tj -300.36 -60 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (8)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -348.34 -36 Td 0 Tw (Possible methods are:)Tj /R36290528 10 Tf 16.8 TL (automatic)' /R35954040 10 Tf 45.2699 0 Td [(\(def)10(ault\))]TJ -9.26992 -12 Td [(An)15.0073(y)]TJ /R36290528 10 Tf 19.7668 0 Td (.git)Tj /R35626152 10 Tf 13.6102 0 Td (*)Tj /R35954040 10 Tf 7.69688 0 Td 0.198 Tw (Œles that are added, modiŒed or remo)Tj -0.15 Tc 150.738 0 Td (ve)Tj 2.698 Tc 9.28984 0 Td [(di)269.785(nt)]TJ 0 Tc 20.9563 0 Td (he current Debian branch)Tj -222.058 -12 Td 0.028 Tw (compared to the old upstream branch are set to this state, e)Tj -0.15 Tc 234.458 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0.027 Tw (rything else is tak)Tj 70.8109 0 Td (en)Tj -314.559 -12 Td 0 Tw (as found in the ne)Tj 2.5 Tc 70.85 0 Td (wp)Tj 0 Tc 14.7199 0 Td (atched branch.)Tj /R36290528 10 Tf -121.57 -28.8 Td (debian)Tj /R35954040 10 Tf 36 0 Td (All)Tj /R36290528 10 Tf 16.793 0 Td (.git)Tj /R35626152 10 Tf 13.6102 0 Td (*)Tj /R35954040 10 Tf 9.01289 0 Td 1.513 Tw [(Œles are tak)9.98291(en from the Debian branch.)]TJ 171.282 0 Td 1.514 Tw (Files with a name lik)Tj 4.014 Tc 89.8461 0 Td (et)Tj 0 Tc 11.234 0 Td (hat)Tj -311.778 -12 Td 0 Tw (from the patched branch are ignored.)Tj /R36290528 10 Tf -36 -28.8 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 36 -12 Td 0.789 Tw (Files starting with)Tj /R36290528 10 Tf 77.0969 0 Td (.git)Tj /R35954040 10 Tf 16.8988 0 Td (are not gi)Tj -0.15 Tc 39.098 0 Td (ve)Tj 3.288 Tc 9.28984 0 Td (ns)Tj 0 Tc 12.1781 0 Td 0.788 Tw (pecial handling.)Tj 70.4559 0 Td (The)Tj 3.288 Tc 15.4 0 Td (ya)Tj 0 Tc 12.7281 0 Td [(re tak)9.98535(en from the)]TJ -253.146 -12 Td 1.634 Tw (patched branch, unless the)Tj 4.134 Tc 110.282 0 Td (ya)Tj 0 Tc 13.5738 0 Td (re deleted in the Debian branch and the def)Tj 185.142 0 Td (ault)Tj /R36290528 10 Tf -308.998 -12 Td [(--no-ignor)18(e-deletions)]TJ /R35954040 10 Tf 91.2 0 Td 0 Tw (is acti)Tj -0.15 Tc 23.3602 0 Td (ve)Tj 5 Tc 9.28984 0 Td (.\()Tj 0 Tc 10.8301 0 Td (i.e. just lik)Tj 2.5 Tc 42.1301 0 Td (ea)Tj -0.15 Tc 11.3801 0 Td 0.3 Tw (ny o)Tj 0 Tc 17.35 0 Td 0 Tw (ther Œle outside)Tj /R36290528 10 Tf 64.7199 0 Td (debian/)Tj /R35954040 10 Tf 31.6801 0 Td (\).)Tj /R36290528 10 Tf -373.94 -28.8 Td [(--k)10.0073(eep-branch)]TJ /R35954040 10 Tf 36 -12 Td 0.735 Tw (do not remo)Tj -0.15 Tc 49.65 0 Td 1.035 Tw (ve a)Tj 3.235 Tc 16.9648 0 Td (ne)Tj 0 Tc 12.525 0 Td 0.734 Tw (xisting patched branch \(usually that is remo)Tj -0.15 Tc 179.234 0 Td (ve)Tj 3.234 Tc 9.28984 0 Td (da)Tj 0 Tc 12.6738 0 Td (nd can be recreated)Tj -280.337 -12 Td (with)Tj /R36290528 10 Tf 20.2801 0 Td [(check)15.0146(out-patched)]TJ /R35954040 10 Tf 77.9 0 Td 0 Tw (to a)Tj -0.2 Tc 14.5199 0 Td (vo)Tj 0 Tc 9.8 0 Td (id stale copies lurking around\).)Tj /R36290528 10 Tf -158.5 -28.8 Td (--amend)Tj /R35954040 10 Tf 36 -12 Td 0.198 Tw [(Replace the last commit on your Debian branch \(as git commit --amend w)9.99023(ould do\).)]TJ -0.4 Tc 340.402 0 Td (Wi)Tj 0 Tc 11.8199 0 Td (th)Tj -352.222 -12 Td 0.612 Tw [(the e)15.0122(xception that e)]TJ -0.15 Tc 79.4758 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0.611 Tw (ry parent that is an ancestor of or equal to the ne)Tj 3.111 Tc 199.481 0 Td (wp)Tj 0 Tc 15.3309 0 Td (atched branch)Tj -303.577 -12 Td 0.402 Tw [(or the recorded patched branch is omitted.)-540.198(\(That is, you lose not only the commit on the)]TJ 12 TL 0.96 Tw T*[(Debian branch, b)19.9854(ut also a pre)24.9927(vious state of the patched branch if your last commit also)]TJ 0 Tw T*[(mer)18.0078(ged the patched branch\).)]TJ /R36290528 10 Tf -36 -28.8 Td (-m)Tj /R35626152 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R35954040 10 Tf -2.5 -12 Td 0.24 Tw (Commit message to use for the ne)Tj 2.74 Tc 137.29 0 Td (wc)Tj 0 Tc 14.4 0 Td [(ommit created.)-523.992(\(If used together with --amend, this)]TJ -151.69 -12 Td 0 Tw (disables reusing the old author and date\).)Tj /R36290528 10 Tf -36 -28.8 Td [(--allo)10.0073(w-nonlinear)]TJ /R35954040 10 Tf 36 -12 Td 0.682 Tw (do not abort with an error if the patched branch is no linear series of commits on top of)Tj 0.835 Tw T*[(the upstream branch.)-583.491(Using this option is not recommended as it easily hides problems)]TJ 0.102 Tw (with patched or upstream branch and may introduce brok)' 229.556 0 Td 0.101 Tw (en debian/patches/ series, as for)Tj 127.114 0 Td (-)Tj -356.67 -12 Td 0 Tw (mat-patch does no serialisation.)Tj /R36290528 10 Tf -72 -28.8 Td [(import-new-upstr)18.0078(eam)]TJ /R35954040 10 Tf 96.1898 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj /R35954040 10 Tf 29.45 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td [(.orig)15.0073(.tar)]TJ /R35954040 10 Tf -98.8 -12 Td 2.042 Tw (Import the contents of the gi)Tj -0.15 Tc 123.56 0 Td (ve)Tj 4.543 Tc 9.28984 0 Td (nt)Tj 0 Tc 12.323 0 Td 2.043 Tw (arŒle \(as with)Tj /R36290528 10 Tf 63.6191 0 Td (import-tar)Tj 4.543 Tc /R35954040 10 Tf 45.5398 0 Td (\)a)Tj 0 Tc 12.3129 0 Td (nd record this branch \(as with)Tj -0.18 Tc /R36290528 10 Tf -266.645 -12 Td (re)Tj 0 Tc 8.7 0 Td [(cord-new-upstr)18.0078(eam)]TJ /R35954040 10 Tf 83.6898 0 Td (\).)Tj -92.3898 -24 Td 0 Tw (This is roughly equi)Tj -0.25 Tc 80.0301 0 Td (va)Tj 0 Tc 9.18984 0 Td (lent to:)Tj /R36290528 10 Tf -86.7199 -12 Td (git-dpm import-tar -p)Tj /R35626152 10 Tf 95.8199 0 Td [(upstr)37.0166(eam Œlename)]TJ /R36290528 10 Tf -95.8199 -12 Td [(git check)15(out -b)]TJ /R35626152 10 Tf 65.6801 0 Td [(upstr)37.0166(eam)]TJ /R36290528 10 Tf -65.6801 -12 Td [(git-dpm r)18(ecord-new-upstr)17.9834(eam)]TJ /R35626152 10 Tf 131.28 0 Td (Œlename)Tj /R36290528 10 Tf -133.78 -28.8 Td (--detached)Tj /R35954040 10 Tf 36 -12 Td 0.309 Tw (Don't mak)Tj 2.809 Tc 43.259 0 Td (et)Tj 0 Tc 10.0289 0 Td (he ne)Tj 2.809 Tc 21.4391 0 Td (wu)Tj 0 Tc 15.0289 0 Td 0.308 Tw (pstream branch an ancestor of the old upstream branch \(unless you)Tj -89.7559 -12 Td 0 Tw (re-add that with)Tj /R36290528 10 Tf 65.8199 0 Td (-p)Tj /R35954040 10 Tf 8.88984 0 Td (\).)Tj /R36290528 10 Tf -110.71 -16.8 Td (-p)Tj /R35626152 10 Tf 11.3898 0 Td (commit-id)Tj /R35954040 10 Tf 40.55 0 Td (|)Tj /R36290528 10 Tf 2 0 Td [(--par)17.9932(ent)]TJ /R35626152 10 Tf 37.3102 0 Td (commit-id)Tj /R35954040 10 Tf -55.25 -12 Td (Gi)Tj -0.15 Tc 9.75 0 Td (ve)Tj 0 Tc /R36290528 10 Tf 11.7898 0 Td (import-tar)Tj /R35954040 10 Tf 48.0398 0 Td (additional parents of the ne)Tj 2.5 Tc 108.62 0 Td (wc)Tj 0 Tc 14.1602 0 Td (ommit to create.)Tj -300.36 -60 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (8)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2404 │ │ │ │ │ +2405 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1114,29 +1114,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -0.15 Tc -348.34 -36 Td (Fo)Tj 3.735 Tc 10.4102 0 Td (re)Tj 0 Tc 11.3551 0 Td 1.236 Tw (xample if you track upstream's git repository in some branch, you can name that)Tj -21.7652 -12 Td 0 Tw (here to mak)Tj 2.5 Tc 47.1102 0 Td [(ei)250.007(tp)]TJ 0 Tc 20 0 Td (art of the history of your Debian branch.)Tj /R12164640 10 Tf -103.11 -28.8 Td [(--allo)10.0073(w-no-par)17.9834(ent)]TJ /R11828152 10 Tf 36 -12 Td 1.971 Tw (If dpm.importW)Tj 67.1211 0 Td (ithoutP)Tj 28.75 0 Td [(arent is set to f)9.99268(alse via git conŒg, git-dpm will not allo)]TJ 4.47 Tc 238.551 0 Td (wi)Tj 0 Tc 14.4699 0 Td (m-)Tj -348.892 -12 Td 0 Tw [(port-ne)24.9927(w-upstream to be run without this option or at least on -p option.)]TJ /R12164640 10 Tf -36 -28.8 Td [(--r)18.0078(ebase-patched)]TJ /R11828152 10 Tf 36 -12 Td 0.303 Tw (After recording the ne)Tj 2.803 Tc 89.2391 0 Td (wu)Tj 0 Tc 15.023 0 Td (pstream branch, rebase the patched branch to the ne)Tj 2.804 Tc 209.054 0 Td (wu)Tj 0 Tc 15.0238 0 Td (pstream)Tj -328.34 -12 Td (branch.)Tj /R12164640 10 Tf -36 -28.8 Td [(--no-r)17.9846(ebase-patched)]TJ /R11828152 10 Tf 36 -12 Td 1.048 Tw (Do not call rebase-patched after recording the ne)Tj 3.547 Tc 202.296 0 Td (wu)Tj 0 Tc 15.7672 0 Td 1.047 Tw [(pstream branch.)-604.707(\(This is currently)]TJ -218.063 -12 Td 0 Tw [(the def)10.0146(ault, b)20(ut that may change in the future\).)]TJ /R12164640 10 Tf -36 -28.8 Td (-m)Tj /R11500264 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R11828152 10 Tf -2.5 -12 Td 0.536 Tw (Commit message to use for the ne)Tj 3.037 Tc 139.066 0 Td (wc)Tj 0 Tc 14.6969 0 Td 0.537 Tw (ommit to the Debian branch recording the ne)Tj 3.037 Tc 183.199 0 Td (wŒ)Tj 0 Tc 15.8172 0 Td (le)Tj -352.779 -12 Td 0 Tw (and upstream branch.)Tj /R12164640 10 Tf -36 -28.8 Td (--component)Tj /R11500264 10 Tf 56.3801 0 Td [(pac)20.0146(ka)]TJ -0.1 Tc 23.5797 0 Td (ge)Tj 0 Tc /R12164640 10 Tf 9.33984 0 Td (_)Tj /R11500264 10 Tf 5 0 Td [(ver)10.0073(sion)]TJ /R12164640 10 Tf 29.3398 0 Td (.orig-)Tj /R11500264 10 Tf 23.05 0 Td (component)Tj /R12164640 10 Tf 43.8801 0 Td (.tar)Tj /R11500264 10 Tf 15.2699 0 Td (.gz)Tj /R11828152 10 Tf -169.839 -12 Td 0.268 Tw (Unpack the speciŒed Œlename into the)Tj /R11500264 10 Tf 157.698 0 Td (component)Tj /R11828152 10 Tf 46.648 0 Td 0.267 Tw (directory and record it so that)Tj /R12164640 10 Tf 122.132 0 Td [(pr)18.0078(epar)17.9834(e)]TJ /R11828152 10 Tf -326.478 -12 Td (and)Tj /R12164640 10 Tf 16.9398 0 Td (status)Tj /R11828152 10 Tf 27.5 0 Td (kno)Tj 2.5 Tc 14.75 0 Td [(wt)250(oc)]TJ 0 Tc 24.4398 0 Td 0 Tw (heck for it.)Tj /R12164640 10 Tf -119.63 -28.8 Td (--init)Tj /R11828152 10 Tf 36 -24 Td [(None of the branches yet e)14.9854(xists, create them.)]TJ 24 TL 1.094 Tw (As the branches to operate on are deri)' -0.15 Tc 158.748 0 Td (ve)Tj 3.594 Tc 9.28984 0 Td (df)Tj 0 Tc 11.9238 0 Td (rom)Tj /R12164640 10 Tf 19.7039 0 Td (HEAD)Tj /R11828152 10 Tf 32.484 0 Td (if no)Tj /R12164640 10 Tf 23.298 0 Td (--branch)Tj /R11828152 10 Tf 40.8141 0 Td (option is gi)Tj -0.15 Tc 46.948 0 Td (ve)Tj 0 Tc 9.28984 0 Td (n,)Tj -352.5 -12 Td 0.54 Tw (you either need)Tj /R12164640 10 Tf 65.7699 0 Td (HEAD)Tj /R11828152 10 Tf 31.9301 0 Td 0.539 Tw [(point to an not yet e)15.0146(xisting branch \(lik)]TJ 3.039 Tc 156.573 0 Td (ed)Tj 0 Tc 12.4789 0 Td (irectly after)Tj /R12164640 10 Tf 49.948 0 Td (git init)Tj 3.039 Tc /R11828152 10 Tf 28.5988 0 Td (\)o)Tj 0 Tc 11.3691 0 Td (r)Tj -356.668 -12 Td 0.857 Tw (you need you gi)Tj -0.15 Tc 66.4809 0 Td 1.158 Tw (ve a n)Tj 0 Tc 25.4461 0 Td 0.858 Tw (ame with)Tj /R12164640 10 Tf 41.1559 0 Td (--branch)Tj 3.358 Tc /R11828152 10 Tf 37.2199 0 Td (.O)Tj 0 Tc 13.0781 0 Td (therwise one of the branches already e)Tj 158.278 0 Td (xists)Tj -341.659 -12 Td 0 Tw (and you only get an error message.)Tj /R12164640 10 Tf -36 -28.8 Td (--branch)Tj /R11500264 10 Tf 39.7199 0 Td [(debianbr)14.9854(anc)15.0146(h)]TJ /R11828152 10 Tf -3.71992 -12 Td 0.29 Tw (Don't deri)Tj -0.15 Tc 41.4199 0 Td 0.59 Tw (ve t)Tj 0 Tc 14.8602 0 Td 0.289 Tw (he Debian branch name from current)Tj /R12164640 10 Tf 151.684 0 Td (HEAD)Tj -0.2 Tc /R11828152 10 Tf 31.6789 0 Td (bu)Tj 2.789 Tc 9.8 0 Td (tu)Tj 0 Tc 10.5691 0 Td (se)Tj /R11500264 10 Tf 11.1191 0 Td [(debianbr)14.9854(anc)15.0146(h)]TJ /R11828152 10 Tf 58.0391 0 Td (instead.)Tj -329.17 -12 Td 0 Tw (\(And upstream branch name and patched branch name deri)Tj -0.15 Tc 235.79 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (df)Tj 0 Tc 10.8301 0 Td (rom that as usual\).)Tj /R12164640 10 Tf -291.91 -28.8 Td (--pristine-tar-commit)Tj /R11828152 10 Tf 93.5801 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--ptc)Tj /R11828152 10 Tf -62.0801 -12 Td (Call)Tj /R12164640 10 Tf 19.1699 0 Td (pristine-tar commit)Tj /R11828152 10 Tf 86.0898 0 Td (for all imported tarballs not yet found in the pristine-tar branch.)Tj /R12164640 10 Tf -141.26 -28.8 Td (--no-pristine-tar-commit)Tj /R11828152 10 Tf 36 -12 Td (Do not call)Tj /R12164640 10 Tf 46.9398 0 Td (pristine-tar commit)Tj /R11828152 10 Tf 86.0898 0 Td (for all imported tarballs e)Tj -0.15 Tc 101.4 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.99(fc)]TJ 0 Tc 20.55 0 Td (onŒgured to do so by)Tj /R12164640 10 Tf -261.77 -12 Td [(git conŒg dpm.pristineT)92(arCommit true)]TJ /R11828152 10 Tf 169.35 0 Td (or by)Tj /R12164640 10 Tf -169.35 -12 Td (git conŒg branch.)Tj /R11828152 10 Tf 74.7301 0 Td (debianbranch)Tj /R12164640 10 Tf 53.8699 0 Td [(.dpmPristineT)91.9922(arCommit true)]TJ /R11828152 10 Tf 125.73 0 Td (.)Tj /R12164640 10 Tf -292.83 -28.8 Td [(--ignor)17.9846(e-deletions)]TJ /R11828152 10 Tf 74.8102 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (--dot-git-Œles=)Tj -0.15 Tc /R11828152 10 Tf -43.8102 -12 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to mer)18.0078(ge-patched, if called \(only done if there were no patches pre)25(viously\).)]TJ /R12164640 10 Tf -45.85 -28.8 Td [(--upstr)17.9846(eam-author)]TJ /R11500264 10 Tf 81.75 0 Td (author)Tj /R11828152 10 Tf -45.75 -12 Td (Used as the)Tj /R12164640 10 Tf 48.6 0 Td (--author)Tj /R11828152 10 Tf 38.05 0 Td [(ar)18.0151(gument to)]TJ /R12164640 10 Tf 50.3699 0 Td (git-dpm import-tar)Tj /R11828152 10 Tf 81.9301 0 Td (.)Tj -326.95 -55.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (9)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -0.15 Tc -348.34 -36 Td (Fo)Tj 3.735 Tc 10.4102 0 Td (re)Tj 0 Tc 11.3551 0 Td 1.236 Tw (xample if you track upstream's git repository in some branch, you can name that)Tj -21.7652 -12 Td 0 Tw (here to mak)Tj 2.5 Tc 47.1102 0 Td [(ei)250.007(tp)]TJ 0 Tc 20 0 Td (art of the history of your Debian branch.)Tj /R36290528 10 Tf -103.11 -28.8 Td [(--allo)10.0073(w-no-par)17.9834(ent)]TJ /R35954040 10 Tf 36 -12 Td 1.971 Tw (If dpm.importW)Tj 67.1211 0 Td (ithoutP)Tj 28.75 0 Td [(arent is set to f)9.99268(alse via git conŒg, git-dpm will not allo)]TJ 4.47 Tc 238.551 0 Td (wi)Tj 0 Tc 14.4699 0 Td (m-)Tj -348.892 -12 Td 0 Tw [(port-ne)24.9927(w-upstream to be run without this option or at least on -p option.)]TJ /R36290528 10 Tf -36 -28.8 Td [(--r)18.0078(ebase-patched)]TJ /R35954040 10 Tf 36 -12 Td 0.303 Tw (After recording the ne)Tj 2.803 Tc 89.2391 0 Td (wu)Tj 0 Tc 15.023 0 Td (pstream branch, rebase the patched branch to the ne)Tj 2.804 Tc 209.054 0 Td (wu)Tj 0 Tc 15.0238 0 Td (pstream)Tj -328.34 -12 Td (branch.)Tj /R36290528 10 Tf -36 -28.8 Td [(--no-r)17.9846(ebase-patched)]TJ /R35954040 10 Tf 36 -12 Td 1.048 Tw (Do not call rebase-patched after recording the ne)Tj 3.547 Tc 202.296 0 Td (wu)Tj 0 Tc 15.7672 0 Td 1.047 Tw [(pstream branch.)-604.707(\(This is currently)]TJ -218.063 -12 Td 0 Tw [(the def)10.0146(ault, b)20(ut that may change in the future\).)]TJ /R36290528 10 Tf -36 -28.8 Td (-m)Tj /R35626152 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R35954040 10 Tf -2.5 -12 Td 0.536 Tw (Commit message to use for the ne)Tj 3.037 Tc 139.066 0 Td (wc)Tj 0 Tc 14.6969 0 Td 0.537 Tw (ommit to the Debian branch recording the ne)Tj 3.037 Tc 183.199 0 Td (wŒ)Tj 0 Tc 15.8172 0 Td (le)Tj -352.779 -12 Td 0 Tw (and upstream branch.)Tj /R36290528 10 Tf -36 -28.8 Td (--component)Tj /R35626152 10 Tf 56.3801 0 Td [(pac)20.0146(ka)]TJ -0.1 Tc 23.5797 0 Td (ge)Tj 0 Tc /R36290528 10 Tf 9.33984 0 Td (_)Tj /R35626152 10 Tf 5 0 Td [(ver)10.0073(sion)]TJ /R36290528 10 Tf 29.3398 0 Td (.orig-)Tj /R35626152 10 Tf 23.05 0 Td (component)Tj /R36290528 10 Tf 43.8801 0 Td (.tar)Tj /R35626152 10 Tf 15.2699 0 Td (.gz)Tj /R35954040 10 Tf -169.839 -12 Td 0.268 Tw (Unpack the speciŒed Œlename into the)Tj /R35626152 10 Tf 157.698 0 Td (component)Tj /R35954040 10 Tf 46.648 0 Td 0.267 Tw (directory and record it so that)Tj /R36290528 10 Tf 122.132 0 Td [(pr)18.0078(epar)17.9834(e)]TJ /R35954040 10 Tf -326.478 -12 Td (and)Tj /R36290528 10 Tf 16.9398 0 Td (status)Tj /R35954040 10 Tf 27.5 0 Td (kno)Tj 2.5 Tc 14.75 0 Td [(wt)250(oc)]TJ 0 Tc 24.4398 0 Td 0 Tw (heck for it.)Tj /R36290528 10 Tf -119.63 -28.8 Td (--init)Tj /R35954040 10 Tf 36 -24 Td [(None of the branches yet e)14.9854(xists, create them.)]TJ 24 TL 1.094 Tw (As the branches to operate on are deri)' -0.15 Tc 158.748 0 Td (ve)Tj 3.594 Tc 9.28984 0 Td (df)Tj 0 Tc 11.9238 0 Td (rom)Tj /R36290528 10 Tf 19.7039 0 Td (HEAD)Tj /R35954040 10 Tf 32.484 0 Td (if no)Tj /R36290528 10 Tf 23.298 0 Td (--branch)Tj /R35954040 10 Tf 40.8141 0 Td (option is gi)Tj -0.15 Tc 46.948 0 Td (ve)Tj 0 Tc 9.28984 0 Td (n,)Tj -352.5 -12 Td 0.54 Tw (you either need)Tj /R36290528 10 Tf 65.7699 0 Td (HEAD)Tj /R35954040 10 Tf 31.9301 0 Td 0.539 Tw [(point to an not yet e)15.0146(xisting branch \(lik)]TJ 3.039 Tc 156.573 0 Td (ed)Tj 0 Tc 12.4789 0 Td (irectly after)Tj /R36290528 10 Tf 49.948 0 Td (git init)Tj 3.039 Tc /R35954040 10 Tf 28.5988 0 Td (\)o)Tj 0 Tc 11.3691 0 Td (r)Tj -356.668 -12 Td 0.857 Tw (you need you gi)Tj -0.15 Tc 66.4809 0 Td 1.158 Tw (ve a n)Tj 0 Tc 25.4461 0 Td 0.858 Tw (ame with)Tj /R36290528 10 Tf 41.1559 0 Td (--branch)Tj 3.358 Tc /R35954040 10 Tf 37.2199 0 Td (.O)Tj 0 Tc 13.0781 0 Td (therwise one of the branches already e)Tj 158.278 0 Td (xists)Tj -341.659 -12 Td 0 Tw (and you only get an error message.)Tj /R36290528 10 Tf -36 -28.8 Td (--branch)Tj /R35626152 10 Tf 39.7199 0 Td [(debianbr)14.9854(anc)15.0146(h)]TJ /R35954040 10 Tf -3.71992 -12 Td 0.29 Tw (Don't deri)Tj -0.15 Tc 41.4199 0 Td 0.59 Tw (ve t)Tj 0 Tc 14.8602 0 Td 0.289 Tw (he Debian branch name from current)Tj /R36290528 10 Tf 151.684 0 Td (HEAD)Tj -0.2 Tc /R35954040 10 Tf 31.6789 0 Td (bu)Tj 2.789 Tc 9.8 0 Td (tu)Tj 0 Tc 10.5691 0 Td (se)Tj /R35626152 10 Tf 11.1191 0 Td [(debianbr)14.9854(anc)15.0146(h)]TJ /R35954040 10 Tf 58.0391 0 Td (instead.)Tj -329.17 -12 Td 0 Tw (\(And upstream branch name and patched branch name deri)Tj -0.15 Tc 235.79 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (df)Tj 0 Tc 10.8301 0 Td (rom that as usual\).)Tj /R36290528 10 Tf -291.91 -28.8 Td (--pristine-tar-commit)Tj /R35954040 10 Tf 93.5801 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--ptc)Tj /R35954040 10 Tf -62.0801 -12 Td (Call)Tj /R36290528 10 Tf 19.1699 0 Td (pristine-tar commit)Tj /R35954040 10 Tf 86.0898 0 Td (for all imported tarballs not yet found in the pristine-tar branch.)Tj /R36290528 10 Tf -141.26 -28.8 Td (--no-pristine-tar-commit)Tj /R35954040 10 Tf 36 -12 Td (Do not call)Tj /R36290528 10 Tf 46.9398 0 Td (pristine-tar commit)Tj /R35954040 10 Tf 86.0898 0 Td (for all imported tarballs e)Tj -0.15 Tc 101.4 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.99(fc)]TJ 0 Tc 20.55 0 Td (onŒgured to do so by)Tj /R36290528 10 Tf -261.77 -12 Td [(git conŒg dpm.pristineT)92(arCommit true)]TJ /R35954040 10 Tf 169.35 0 Td (or by)Tj /R36290528 10 Tf -169.35 -12 Td (git conŒg branch.)Tj /R35954040 10 Tf 74.7301 0 Td (debianbranch)Tj /R36290528 10 Tf 53.8699 0 Td [(.dpmPristineT)91.9922(arCommit true)]TJ /R35954040 10 Tf 125.73 0 Td (.)Tj /R36290528 10 Tf -292.83 -28.8 Td [(--ignor)17.9846(e-deletions)]TJ /R35954040 10 Tf 74.8102 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (--dot-git-Œles=)Tj -0.15 Tc /R35954040 10 Tf -43.8102 -12 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to mer)18.0078(ge-patched, if called \(only done if there were no patches pre)25(viously\).)]TJ /R36290528 10 Tf -45.85 -28.8 Td [(--upstr)17.9846(eam-author)]TJ /R35626152 10 Tf 81.75 0 Td (author)Tj /R35954040 10 Tf -45.75 -12 Td (Used as the)Tj /R36290528 10 Tf 48.6 0 Td (--author)Tj /R35954040 10 Tf 38.05 0 Td [(ar)18.0151(gument to)]TJ /R36290528 10 Tf 50.3699 0 Td (git-dpm import-tar)Tj /R35954040 10 Tf 81.9301 0 Td (.)Tj -326.95 -55.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 463 0 Td (9)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2223 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1173,29 +1173,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -384.34 -36 Td [(--upstr)17.9846(eam-date)]TJ /R11500264 10 Tf 71.1902 0 Td (date)Tj /R11828152 10 Tf -35.1902 -12 Td 0.606 Tw (Used as the)Tj /R12164640 10 Tf 50.4191 0 Td (--date)Tj /R11828152 10 Tf 28.0969 0 Td (ar)Tj 7.58984 0 Td 0.607 Tw (gument to)Tj /R12164640 10 Tf 43.9941 0 Td (git-dpm import-tar)Tj /R11828152 10 Tf 85.6441 0 Td (\(especially)Tj /R12164640 10 Tf 46.427 0 Td (auto)Tj /R11828152 10 Tf 21.9969 0 Td (is supported to e)Tj 67.5012 0 Td (x-)Tj -351.669 -12 Td 0 Tw (tract a date from the tar Œle\).)Tj /R12164640 10 Tf -36 -28.8 Td (--exclude)Tj /R11500264 10 Tf 41.3801 0 Td (pattern)Tj /R11828152 10 Tf -5.38008 -12 Td 0.272 Tw (The gi)Tj -0.15 Tc 25.852 0 Td (ve)Tj 2.772 Tc 9.28984 0 Td (np)Tj 0 Tc 12.7719 0 Td (attern is passed to tar as e)Tj 103.682 0 Td 0.271 Tw [(xclude pattern when unpacking.)-527.1(Can be gi)]TJ -0.15 Tc 172.456 0 Td (ve)Tj 2.771 Tc 9.28984 0 Td (nm)Tj 0 Tc 15.5512 0 Td (ul-)Tj -348.893 -12 Td 0 Tw (tiple times.)Tj /R12164640 10 Tf -72 -28.8 Td (import-tar)Tj /R11828152 10 Tf 48.0398 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj /R11828152 10 Tf 29.45 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td (.tar-Œle)Tj /R11828152 10 Tf -50.65 -12 Td 0.288 Tw (Create a ne)Tj 2.788 Tc 45.3059 0 Td (wc)Tj 0 Tc 14.448 0 Td (ommit containing the contents of the gi)Tj -0.15 Tc 158.698 0 Td (ve)Tj 2.788 Tc 9.28984 0 Td (nŒ)Tj 0 Tc 13.348 0 Td 2.788 Tw (le. The)Tj 33.3461 0 Td 0.289 Tw (commit will not ha)Tj -0.15 Tc 76.507 0 Td 0.589 Tw [(ve a)-15.0146(ny p)]TJ 0 Tc 34.1582 0 Td [(ar)20.0098(-)]TJ -385.101 -12 Td 0 Tw (ents, unless you gi)Tj -0.15 Tc 73.6398 0 Td (ve)Tj 0 Tc /R12164640 10 Tf 11.7898 0 Td (-p)Tj /R11828152 10 Tf 11.3898 0 Td (options.)Tj /R12164640 10 Tf -96.8195 -28.8 Td (-p)Tj /R11500264 10 Tf 11.3898 0 Td (commit-id)Tj /R11828152 10 Tf 40.55 0 Td (|)Tj /R12164640 10 Tf 2 0 Td [(--par)17.9932(ent)]TJ /R11500264 10 Tf 37.3102 0 Td (commit-id)Tj /R11828152 10 Tf -55.25 -12 Td (Add the gi)Tj -0.15 Tc 41.9699 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (nc)Tj 0 Tc 11.9398 0 Td [(ommit as parent.)-500(\(Can be speciŒed multiple times\).)]TJ /R12164640 10 Tf -99.1996 -28.8 Td (--branch)Tj /R11500264 10 Tf 39.7199 0 Td [(br)15.0159(anc)15.0146(hname)]TJ /R11828152 10 Tf -3.71992 -12 Td 0.395 Tw (Create ne)Tj 2.895 Tc 38.1852 0 Td (wb)Tj 0 Tc 15.1148 0 Td (ranch)Tj /R11500264 10 Tf 25.1051 0 Td [(br)15.0146(anc)15.0146(hname)]TJ /R11828152 10 Tf 52.5848 0 Td [(if it does not already e)15(xist or replace)]TJ /R11500264 10 Tf 151.31 0 Td [(br)15.0146(anc)15.0146(hname)]TJ /R11828152 10 Tf 52.5848 0 Td (with a)Tj -334.885 -12 Td 0 Tw (commit created from the tarball with the current)Tj /R11500264 10 Tf 194.96 0 Td [(br)15.0146(anc)15.0146(hname)]TJ /R11828152 10 Tf 52.1898 0 Td (head as parent.)Tj /R12164640 10 Tf -283.15 -28.8 Td (-m)Tj /R11500264 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R11828152 10 Tf -2.5 -12 Td [(Do not start an editor for the commit message, b)19.9854(ut use the ar)18.0078(gument instead.)]TJ /R12164640 10 Tf -36 -28.8 Td (--date)Tj /R11500264 10 Tf 27.4898 0 Td (date)Tj /R11828152 10 Tf 8.51016 -12 Td (Date of the commit to create.)Tj 24 TL T*[(If the v)24.9927(alue is)]TJ /R12164640 10 Tf 56.9602 0 Td (auto)Tj /R11828152 10 Tf 21.3898 0 Td [(then the ne)24.9927(west date of an)]TJ 2.5 Tc 103.74 0 Td (yŒ)Tj 0 Tc 13.0602 0 Td (le or directory in the tarball is used.)Tj /R12164640 10 Tf -231.15 -28.8 Td (--author)Tj /R11500264 10 Tf 38.05 0 Td (author)Tj /R11828152 10 Tf -2.05 -12 Td (Author of the commit to create. It has to be in the usual git format)Tj /R11500264 10 Tf 2.5 -12 Td (author)Tj /R12164640 10 Tf 29.1699 0 Td (<)Tj /R11500264 10 Tf 5.7 0 Td (email)Tj /R12164640 10 Tf 22.2199 0 Td (>)Tj /R11828152 10 Tf 5.7 0 Td (.)Tj /R12164640 10 Tf -101.29 -28.8 Td (--exclude)Tj /R11500264 10 Tf 41.3801 0 Td (pattern)Tj /R11828152 10 Tf -5.38008 -12 Td 0.271 Tw (The gi)Tj -0.15 Tc 25.8512 0 Td (ve)Tj 2.771 Tc 9.28984 0 Td (np)Tj 0 Tc 12.7711 0 Td [(attern is passed to tar as e)14.9829(xclude pattern when unpacking.)]TJ 237.511 0 Td 0.272 Tw (Can be gi)Tj -0.15 Tc 38.6238 0 Td (ve)Tj 2.772 Tc 9.28984 0 Td (nm)Tj 0 Tc 15.552 0 Td (ul-)Tj -348.889 -12 Td 0 Tw (tiple times.)Tj -0.18 Tc /R12164640 10 Tf -72 -28.8 Td (re)Tj 0 Tc 8.7 0 Td [(cord-new-upstr)18.0078(eam)]TJ /R11828152 10 Tf 86.1898 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj /R11828152 10 Tf 29.45 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td [(.orig)15.0073(.tar)]TJ /R11828152 10 Tf 35.6898 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (commit)Tj /R11828152 10 Tf 29.4398 0 Td (])Tj -165.96 -24 Td 2.4 Tw (If you changed the upstream branch \()Tj /R12164640 10 Tf 163.8 0 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 40.3699 0 Td (|)Tj /R12164640 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R11500264 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\), git-dpm needs to kno)Tj 102.4 0 Td (w)Tj -388.78 -12 Td 2.739 Tw (which tarball this branch no)Tj 5.239 Tc 122.356 0 Td (wc)Tj 0 Tc 16.8988 0 Td (orresponds to and you ha)Tj -0.15 Tc 111.296 0 Td 3.039 Tw (ve t)Tj 5.24 Tc 17.309 0 Td (or)Tj 0 Tc 13.5699 0 Td 2.74 Tw (ebase your patched branch)Tj -281.43 -12 Td (\()Tj /R12164640 10 Tf 3.33008 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 2.5 Tc /R11828152 10 Tf 36.5098 0 Td [(\)t)249.985(ot)]TJ 0 Tc 18.8902 0 Td 0 Tw (he ne)Tj 2.5 Tc 21.1301 0 Td (wu)Tj 0 Tc 14.7199 0 Td (pstream branch.)Tj -167.69 -24 Td 0.195 Tw [(If there is a second ar)18.0078(gument, this command Œrst replaces your upstream branch with the speciŒed)]TJ 12 TL (commit.)' 24 TL 0 Tw (Then the ne)' 2.5 Tc 46.9602 0 Td (wu)Tj 0 Tc 14.7199 0 Td (pstream branch is recorded in your Debian branch's)Tj /R12164640 10 Tf 209.94 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 70.5699 0 Td (Œle.)Tj -342.19 -24 Td 0.851 Tw (If you speciŒed)Tj /R12164640 10 Tf 67.2629 0 Td [(--r)18.0078(ebase-patched)]TJ /R11828152 10 Tf 74.8211 0 Td 0.852 Tw (\(or short)Tj /R12164640 10 Tf 38.3641 0 Td [(--r)18.0078(ebase)]TJ /R11828152 10 Tf 34.25 0 Td (\),)Tj /R12164640 10 Tf 9.18203 0 Td (git-dpm r)Tj 41.502 0 Td (ebase-patched)Tj /R11828152 10 Tf 63.902 0 Td (will be called to)Tj -329.284 -12 Td 0 Tw (rebase your patched branch on top of the ne)Tj 2.5 Tc 174.7 0 Td (wu)Tj 0 Tc 14.7199 0 Td (pstream branch.)Tj -189.42 -24 Td 2.132 Tw (After this \(and if the branch then looks lik)Tj 4.632 Tc 185.266 0 Td (ew)Tj 0 Tc 16.2922 0 Td (hat you w)Tj 43.6039 0 Td 2.131 Tw (ant\), you still need to call)Tj /R12164640 10 Tf 116.946 0 Td (git-dpm)Tj -362.108 -12 Td [(mer)9.98413(ge-patched-into-debian)]TJ /R11828152 10 Tf 118.5 0 Td 0 Tw (\(or directly)Tj /R12164640 10 Tf 47.2102 0 Td (git-dpm update-patches)Tj /R11828152 10 Tf 101.39 0 Td (\).)Tj -339.1 -40.8 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (10)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -384.34 -36 Td [(--upstr)17.9846(eam-date)]TJ /R35626152 10 Tf 71.1902 0 Td (date)Tj /R35954040 10 Tf -35.1902 -12 Td 0.606 Tw (Used as the)Tj /R36290528 10 Tf 50.4191 0 Td (--date)Tj /R35954040 10 Tf 28.0969 0 Td (ar)Tj 7.58984 0 Td 0.607 Tw (gument to)Tj /R36290528 10 Tf 43.9941 0 Td (git-dpm import-tar)Tj /R35954040 10 Tf 85.6441 0 Td (\(especially)Tj /R36290528 10 Tf 46.427 0 Td (auto)Tj /R35954040 10 Tf 21.9969 0 Td (is supported to e)Tj 67.5012 0 Td (x-)Tj -351.669 -12 Td 0 Tw (tract a date from the tar Œle\).)Tj /R36290528 10 Tf -36 -28.8 Td (--exclude)Tj /R35626152 10 Tf 41.3801 0 Td (pattern)Tj /R35954040 10 Tf -5.38008 -12 Td 0.272 Tw (The gi)Tj -0.15 Tc 25.852 0 Td (ve)Tj 2.772 Tc 9.28984 0 Td (np)Tj 0 Tc 12.7719 0 Td (attern is passed to tar as e)Tj 103.682 0 Td 0.271 Tw [(xclude pattern when unpacking.)-527.1(Can be gi)]TJ -0.15 Tc 172.456 0 Td (ve)Tj 2.771 Tc 9.28984 0 Td (nm)Tj 0 Tc 15.5512 0 Td (ul-)Tj -348.893 -12 Td 0 Tw (tiple times.)Tj /R36290528 10 Tf -72 -28.8 Td (import-tar)Tj /R35954040 10 Tf 48.0398 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj /R35954040 10 Tf 29.45 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td (.tar-Œle)Tj /R35954040 10 Tf -50.65 -12 Td 0.288 Tw (Create a ne)Tj 2.788 Tc 45.3059 0 Td (wc)Tj 0 Tc 14.448 0 Td (ommit containing the contents of the gi)Tj -0.15 Tc 158.698 0 Td (ve)Tj 2.788 Tc 9.28984 0 Td (nŒ)Tj 0 Tc 13.348 0 Td 2.788 Tw (le. The)Tj 33.3461 0 Td 0.289 Tw (commit will not ha)Tj -0.15 Tc 76.507 0 Td 0.589 Tw [(ve a)-15.0146(ny p)]TJ 0 Tc 34.1582 0 Td [(ar)20.0098(-)]TJ -385.101 -12 Td 0 Tw (ents, unless you gi)Tj -0.15 Tc 73.6398 0 Td (ve)Tj 0 Tc /R36290528 10 Tf 11.7898 0 Td (-p)Tj /R35954040 10 Tf 11.3898 0 Td (options.)Tj /R36290528 10 Tf -96.8195 -28.8 Td (-p)Tj /R35626152 10 Tf 11.3898 0 Td (commit-id)Tj /R35954040 10 Tf 40.55 0 Td (|)Tj /R36290528 10 Tf 2 0 Td [(--par)17.9932(ent)]TJ /R35626152 10 Tf 37.3102 0 Td (commit-id)Tj /R35954040 10 Tf -55.25 -12 Td (Add the gi)Tj -0.15 Tc 41.9699 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (nc)Tj 0 Tc 11.9398 0 Td [(ommit as parent.)-500(\(Can be speciŒed multiple times\).)]TJ /R36290528 10 Tf -99.1996 -28.8 Td (--branch)Tj /R35626152 10 Tf 39.7199 0 Td [(br)15.0159(anc)15.0146(hname)]TJ /R35954040 10 Tf -3.71992 -12 Td 0.395 Tw (Create ne)Tj 2.895 Tc 38.1852 0 Td (wb)Tj 0 Tc 15.1148 0 Td (ranch)Tj /R35626152 10 Tf 25.1051 0 Td [(br)15.0146(anc)15.0146(hname)]TJ /R35954040 10 Tf 52.5848 0 Td [(if it does not already e)15(xist or replace)]TJ /R35626152 10 Tf 151.31 0 Td [(br)15.0146(anc)15.0146(hname)]TJ /R35954040 10 Tf 52.5848 0 Td (with a)Tj -334.885 -12 Td 0 Tw (commit created from the tarball with the current)Tj /R35626152 10 Tf 194.96 0 Td [(br)15.0146(anc)15.0146(hname)]TJ /R35954040 10 Tf 52.1898 0 Td (head as parent.)Tj /R36290528 10 Tf -283.15 -28.8 Td (-m)Tj /R35626152 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R35954040 10 Tf -2.5 -12 Td [(Do not start an editor for the commit message, b)19.9854(ut use the ar)18.0078(gument instead.)]TJ /R36290528 10 Tf -36 -28.8 Td (--date)Tj /R35626152 10 Tf 27.4898 0 Td (date)Tj /R35954040 10 Tf 8.51016 -12 Td (Date of the commit to create.)Tj 24 TL T*[(If the v)24.9927(alue is)]TJ /R36290528 10 Tf 56.9602 0 Td (auto)Tj /R35954040 10 Tf 21.3898 0 Td [(then the ne)24.9927(west date of an)]TJ 2.5 Tc 103.74 0 Td (yŒ)Tj 0 Tc 13.0602 0 Td (le or directory in the tarball is used.)Tj /R36290528 10 Tf -231.15 -28.8 Td (--author)Tj /R35626152 10 Tf 38.05 0 Td (author)Tj /R35954040 10 Tf -2.05 -12 Td (Author of the commit to create. It has to be in the usual git format)Tj /R35626152 10 Tf 2.5 -12 Td (author)Tj /R36290528 10 Tf 29.1699 0 Td (<)Tj /R35626152 10 Tf 5.7 0 Td (email)Tj /R36290528 10 Tf 22.2199 0 Td (>)Tj /R35954040 10 Tf 5.7 0 Td (.)Tj /R36290528 10 Tf -101.29 -28.8 Td (--exclude)Tj /R35626152 10 Tf 41.3801 0 Td (pattern)Tj /R35954040 10 Tf -5.38008 -12 Td 0.271 Tw (The gi)Tj -0.15 Tc 25.8512 0 Td (ve)Tj 2.771 Tc 9.28984 0 Td (np)Tj 0 Tc 12.7711 0 Td [(attern is passed to tar as e)14.9829(xclude pattern when unpacking.)]TJ 237.511 0 Td 0.272 Tw (Can be gi)Tj -0.15 Tc 38.6238 0 Td (ve)Tj 2.772 Tc 9.28984 0 Td (nm)Tj 0 Tc 15.552 0 Td (ul-)Tj -348.889 -12 Td 0 Tw (tiple times.)Tj -0.18 Tc /R36290528 10 Tf -72 -28.8 Td (re)Tj 0 Tc 8.7 0 Td [(cord-new-upstr)18.0078(eam)]TJ /R35954040 10 Tf 86.1898 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj /R35954040 10 Tf 29.45 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td [(.orig)15.0073(.tar)]TJ /R35954040 10 Tf 35.6898 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (commit)Tj /R35954040 10 Tf 29.4398 0 Td (])Tj -165.96 -24 Td 2.4 Tw (If you changed the upstream branch \()Tj /R36290528 10 Tf 163.8 0 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 40.3699 0 Td (|)Tj /R36290528 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R35626152 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\), git-dpm needs to kno)Tj 102.4 0 Td (w)Tj -388.78 -12 Td 2.739 Tw (which tarball this branch no)Tj 5.239 Tc 122.356 0 Td (wc)Tj 0 Tc 16.8988 0 Td (orresponds to and you ha)Tj -0.15 Tc 111.296 0 Td 3.039 Tw (ve t)Tj 5.24 Tc 17.309 0 Td (or)Tj 0 Tc 13.5699 0 Td 2.74 Tw (ebase your patched branch)Tj -281.43 -12 Td (\()Tj /R36290528 10 Tf 3.33008 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 2.5 Tc /R35954040 10 Tf 36.5098 0 Td [(\)t)249.985(ot)]TJ 0 Tc 18.8902 0 Td 0 Tw (he ne)Tj 2.5 Tc 21.1301 0 Td (wu)Tj 0 Tc 14.7199 0 Td (pstream branch.)Tj -167.69 -24 Td 0.195 Tw [(If there is a second ar)18.0078(gument, this command Œrst replaces your upstream branch with the speciŒed)]TJ 12 TL (commit.)' 24 TL 0 Tw (Then the ne)' 2.5 Tc 46.9602 0 Td (wu)Tj 0 Tc 14.7199 0 Td (pstream branch is recorded in your Debian branch's)Tj /R36290528 10 Tf 209.94 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 70.5699 0 Td (Œle.)Tj -342.19 -24 Td 0.851 Tw (If you speciŒed)Tj /R36290528 10 Tf 67.2629 0 Td [(--r)18.0078(ebase-patched)]TJ /R35954040 10 Tf 74.8211 0 Td 0.852 Tw (\(or short)Tj /R36290528 10 Tf 38.3641 0 Td [(--r)18.0078(ebase)]TJ /R35954040 10 Tf 34.25 0 Td (\),)Tj /R36290528 10 Tf 9.18203 0 Td (git-dpm r)Tj 41.502 0 Td (ebase-patched)Tj /R35954040 10 Tf 63.902 0 Td (will be called to)Tj -329.284 -12 Td 0 Tw (rebase your patched branch on top of the ne)Tj 2.5 Tc 174.7 0 Td (wu)Tj 0 Tc 14.7199 0 Td (pstream branch.)Tj -189.42 -24 Td 2.132 Tw (After this \(and if the branch then looks lik)Tj 4.632 Tc 185.266 0 Td (ew)Tj 0 Tc 16.2922 0 Td (hat you w)Tj 43.6039 0 Td 2.131 Tw (ant\), you still need to call)Tj /R36290528 10 Tf 116.946 0 Td (git-dpm)Tj -362.108 -12 Td [(mer)9.98413(ge-patched-into-debian)]TJ /R35954040 10 Tf 118.5 0 Td 0 Tw (\(or directly)Tj /R36290528 10 Tf 47.2102 0 Td (git-dpm update-patches)Tj /R35954040 10 Tf 101.39 0 Td (\).)Tj -339.1 -40.8 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (10)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2289 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1232,29 +1232,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -1.2 Tc /R12164640 10 Tf -384.34 -36 Td (WA)Tj 0 Tc 16.0199 0 Td (RNING)Tj /R11828152 10 Tf 36.4359 0 Td 0.606 Tw (to a)Tj -0.2 Tc 15.1262 0 Td (vo)Tj 0 Tc 9.8 0 Td (id an)Tj 3.106 Tc 20.1762 0 Td (ym)Tj 0 Tc 15.8859 0 Td [(isunderstandings: Y)109.983(ou ha)]TJ -0.15 Tc 101.572 0 Td 0.906 Tw (ve t)Tj 3.106 Tc 15.1762 0 Td (oc)Tj 0 Tc 12.5461 0 Td 0.606 Tw (hange the upstream branch before us-)Tj -242.739 -12 Td 0.412 Tw [(ing this command.)-541.187(It's your responsibility to ensure the contents of the tarball match those of the)]TJ 12 TL 0 Tw (upstream branch.)' /R12164640 10 Tf 28.8 TL T*[(--r)18.0078(ebase-patched)]TJ /R11828152 10 Tf 36 -12 Td (Automatically call)Tj /R12164640 10 Tf 76.6602 0 Td [(git-dpm r)18(ebase-patched)]TJ /R11828152 10 Tf 101.2 0 Td (.)Tj /R12164640 10 Tf -213.86 -28.8 Td (--new-tarball-only)Tj /R11828152 10 Tf 36 -12 Td 1.169 Tw [(Don't refuse operation if the tarball changes b)19.9878(ut the upstream branch did not.)]TJ 328.548 0 Td 1.17 Tw (\(This is)Tj -328.548 -12 Td 0 Tw [(only sensible if the tarball changed without changing its contents, see the w)9.98535(arning abo)]TJ -0.15 Tc 344.15 0 Td (ve)Tj 0 Tc 9.28984 0 Td (\).)Tj /R12164640 10 Tf -389.44 -28.8 Td (-m)Tj /R11500264 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R11828152 10 Tf -2.5 -12 Td 0.537 Tw (Commit message to use for the ne)Tj 3.037 Tc 139.072 0 Td (wc)Tj 0 Tc 14.6969 0 Td 0.536 Tw (ommit to the Debian branch recording the ne)Tj 3.036 Tc 183.192 0 Td (wŒ)Tj 0 Tc 15.816 0 Td (le)Tj -352.777 -12 Td 0 Tw (and upstream branch.)Tj /R12164640 10 Tf -36 -28.8 Td (--amend)Tj /R11828152 10 Tf 36 -12 Td (Replace the last commit instead of creating a ne)Tj 2.5 Tc 191.38 0 Td (wo)Tj 0 Tc 14.7199 0 Td (ne on top.)Tj /R12164640 10 Tf -242.1 -28.8 Td (--component)Tj /R11500264 10 Tf 56.3801 0 Td (Œlename)Tj /R11828152 10 Tf -20.3801 -12 Td (Record)Tj /R11500264 10 Tf 34.6109 0 Td (Œlename)Tj /R11828152 10 Tf 39.6109 0 Td 3.231 Tw (as needed component source Œle \(i.e. a)Tj /R11500264 10 Tf 180.078 0 Td [(sour)36.9824(cename)]TJ /R12164640 10 Tf 47.95 0 Td (_)Tj /R11500264 10 Tf 5 0 Td [(upstr)37.0166(eamver)19.9902(-)]TJ -307.25 -12 Td (sion)Tj /R12164640 10 Tf 16.6699 0 Td (.orig-)Tj /R11500264 10 Tf 23.05 0 Td (component)Tj /R12164640 10 Tf 43.8801 0 Td [(.tar)100(.)]TJ /R11500264 10 Tf 16.7699 0 Td [(compr)36.9922(ession)]TJ /R11828152 10 Tf 53.7422 0 Td 3.561 Tw (Œle\). It's)Tj 41.5621 0 Td 1.061 Tw (your responsible to ha)Tj -0.15 Tc 91.5828 0 Td 1.361 Tw (ve t)Tj 0 Tc 15.6309 0 Td 1.061 Tw (hat Œle's con-)Tj -302.888 -12 Td 0 Tw (tents already as part of your upstream branch \(in a)Tj /R11500264 10 Tf 203.28 0 Td (component)Tj /R11828152 10 Tf 46.3801 0 Td (subdirectory\).)Tj -249.66 -24 Td 0.95 Tw [(\(Recorded Œles will be look)10(ed for by)]TJ /R12164640 10 Tf 156.25 0 Td (status)Tj /R11828152 10 Tf 28.45 0 Td (and)Tj /R12164640 10 Tf 17.8898 0 Td [(pr)18.0078(epar)17.9834(e)]TJ 5.95 Tc /R11828152 10 Tf 33.5199 0 Td (.T)Tj 0 Tc 14.5602 0 Td (he list of recorded compo-)Tj -250.67 -12 Td 0.301 Tw (nent source Œles is remo)Tj -0.15 Tc 98.2641 0 Td (ve)Tj 2.801 Tc 9.28984 0 Td (dw)Tj 0 Tc 15.0211 0 Td (hen a ne)Tj 2.801 Tc 33.6719 0 Td (wu)Tj 0 Tc 15.0211 0 Td (pstream branch or upstream)Tj /R12164640 10 Tf 115.063 0 Td (.orig)Tj /R11828152 10 Tf 22.5199 0 Td 0.3 Tw (source Œle is)Tj -308.851 -12 Td (recorded\).)Tj /R12164640 10 Tf -36 -28.8 Td [(--ignor)17.9846(e-deletions)]TJ /R11828152 10 Tf 74.8102 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (--)Tj 6.66016 -5 Td (ot-git-Œles=)Tj -0.15 Tc /R11828152 10 Tf -50.4703 -7 Td (Pa)Tj 0 Tc 9.85 0 Td 1.257 Tw (ssed to mer)Tj 47.884 0 Td 1.258 Tw (ge-patched, if called \(which is only done if there were no patches pre)Tj 291.156 0 Td (vi-)Tj -348.89 -12 Td (ously)Tj 2.5 Tc 21.0199 0 Td [(,s)250.015(ot)]TJ 0 Tc 19.1699 0 Td 0 Tw (he ne)Tj 2.5 Tc 21.1301 0 Td (wu)Tj 0 Tc 14.7199 0 Td [(pstream branch is mer)17.9834(ged in directly\).)]TJ -0.18 Tc /R12164640 10 Tf -148.04 -28.8 Td (re)Tj 0 Tc 8.7 0 Td (base-patched)Tj -0.35 Tc /R11828152 10 Tf 27.3 -12 Td (Tr)Tj 2.606 Tc 9.08984 0 Td [(yt)260.607(or)]TJ 0 Tc 21.3219 0 Td 0.106 Tw (ebase your current patched branch \()Tj /R12164640 10 Tf 143.53 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 2.606 Tc /R11828152 10 Tf 36.5098 0 Td [(\)t)260.601(oy)]TJ 0 Tc 21.3219 0 Td 0.105 Tw (our current current up-)Tj -304.883 -12 Td 0 Tw (stream branch \()Tj /R12164640 10 Tf 62.2 0 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 40.3699 0 Td (|)Tj /R12164640 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R11500264 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\).)Tj -184.78 -24 Td 2.204 Tw [(If those branches do not yet e)15.0171(xist as git branches, the)]TJ 4.704 Tc 233.09 0 Td (ya)Tj 0 Tc 14.1441 0 Td (re \(re\)created from the information)Tj -247.234 -12 Td 0 Tw (recorded in)Tj /R12164640 10 Tf 47.7602 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 70.5699 0 Td (Œrst.)Tj -118.33 -24 Td 0.153 Tw (This is only a con)Tj -0.15 Tc 71.3219 0 Td (ve)Tj 0 Tc 9.28984 0 Td [(nience wrapper around git rebase that Œrst tries to determine what e)15.0049(xactly is to)]TJ -80.6117 -12 Td 3.395 Tw (rebase. If)Tj 43.9898 0 Td 0.895 Tw (there are an)Tj 3.395 Tc 48.2801 0 Td (yc)Tj 0 Tc 12.8352 0 Td (onicts, git rebase will ask you to resolv)Tj 3.395 Tc 167.775 0 Td (et)Tj 0 Tc 10.6148 0 Td (hem and tell rebase to con-)Tj -283.495 -12 Td (tinue.)Tj 24 TL 3.532 Tw (After this is Œnished \(and if the branch then looks lik)' 6.032 Tc 246.87 0 Td (ew)Tj 0 Tc 17.6922 0 Td (hat you w)Tj 46.4039 0 Td 3.531 Tw (ant\), you still need)Tj /R12164640 10 Tf -310.966 -12 Td [(mer)9.98413(ge-patched-into-debian)]TJ /R11828152 10 Tf 118.5 0 Td 0 Tw (\(or directly)Tj /R12164640 10 Tf 47.2102 0 Td (update-patches)Tj /R11828152 10 Tf 65 0 Td (\).)Tj /R12164640 10 Tf -266.71 -28.8 Td (tag)Tj /R11828152 10 Tf 15.8301 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td (options)Tj 2.5 Tc /R11828152 10 Tf 31.95 0 Td (][)Tj 0 Tc /R11500264 10 Tf 11.6602 0 Td [(ver)10.0073(sion)]TJ /R11828152 10 Tf 31.8398 0 Td (])Tj -61.1102 -12 Td 0.034 Tw [(Add tags to the upstream, patched and Debian branches.)-503.386(If no v)14.9878(ersion is gi)]TJ -0.15 Tc 300.542 0 Td (ve)Tj 0 Tc 9.28984 0 Td [(n, it is tak)10.0049(en from de-)]TJ -309.832 -12 Td (bian/changelog.)Tj (Options:)' -72 -57.6 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (11)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -1.2 Tc /R36290528 10 Tf -384.34 -36 Td (WA)Tj 0 Tc 16.0199 0 Td (RNING)Tj /R35954040 10 Tf 36.4359 0 Td 0.606 Tw (to a)Tj -0.2 Tc 15.1262 0 Td (vo)Tj 0 Tc 9.8 0 Td (id an)Tj 3.106 Tc 20.1762 0 Td (ym)Tj 0 Tc 15.8859 0 Td [(isunderstandings: Y)109.983(ou ha)]TJ -0.15 Tc 101.572 0 Td 0.906 Tw (ve t)Tj 3.106 Tc 15.1762 0 Td (oc)Tj 0 Tc 12.5461 0 Td 0.606 Tw (hange the upstream branch before us-)Tj -242.739 -12 Td 0.412 Tw [(ing this command.)-541.187(It's your responsibility to ensure the contents of the tarball match those of the)]TJ 12 TL 0 Tw (upstream branch.)' /R36290528 10 Tf 28.8 TL T*[(--r)18.0078(ebase-patched)]TJ /R35954040 10 Tf 36 -12 Td (Automatically call)Tj /R36290528 10 Tf 76.6602 0 Td [(git-dpm r)18(ebase-patched)]TJ /R35954040 10 Tf 101.2 0 Td (.)Tj /R36290528 10 Tf -213.86 -28.8 Td (--new-tarball-only)Tj /R35954040 10 Tf 36 -12 Td 1.169 Tw [(Don't refuse operation if the tarball changes b)19.9878(ut the upstream branch did not.)]TJ 328.548 0 Td 1.17 Tw (\(This is)Tj -328.548 -12 Td 0 Tw [(only sensible if the tarball changed without changing its contents, see the w)9.98535(arning abo)]TJ -0.15 Tc 344.15 0 Td (ve)Tj 0 Tc 9.28984 0 Td (\).)Tj /R36290528 10 Tf -389.44 -28.8 Td (-m)Tj /R35626152 10 Tf 14.1602 0 Td (messa)Tj -0.1 Tc 24.3398 0 Td (ge)Tj 0 Tc /R35954040 10 Tf -2.5 -12 Td 0.537 Tw (Commit message to use for the ne)Tj 3.037 Tc 139.072 0 Td (wc)Tj 0 Tc 14.6969 0 Td 0.536 Tw (ommit to the Debian branch recording the ne)Tj 3.036 Tc 183.192 0 Td (wŒ)Tj 0 Tc 15.816 0 Td (le)Tj -352.777 -12 Td 0 Tw (and upstream branch.)Tj /R36290528 10 Tf -36 -28.8 Td (--amend)Tj /R35954040 10 Tf 36 -12 Td (Replace the last commit instead of creating a ne)Tj 2.5 Tc 191.38 0 Td (wo)Tj 0 Tc 14.7199 0 Td (ne on top.)Tj /R36290528 10 Tf -242.1 -28.8 Td (--component)Tj /R35626152 10 Tf 56.3801 0 Td (Œlename)Tj /R35954040 10 Tf -20.3801 -12 Td (Record)Tj /R35626152 10 Tf 34.6109 0 Td (Œlename)Tj /R35954040 10 Tf 39.6109 0 Td 3.231 Tw (as needed component source Œle \(i.e. a)Tj /R35626152 10 Tf 180.078 0 Td [(sour)36.9824(cename)]TJ /R36290528 10 Tf 47.95 0 Td (_)Tj /R35626152 10 Tf 5 0 Td [(upstr)37.0166(eamver)19.9902(-)]TJ -307.25 -12 Td (sion)Tj /R36290528 10 Tf 16.6699 0 Td (.orig-)Tj /R35626152 10 Tf 23.05 0 Td (component)Tj /R36290528 10 Tf 43.8801 0 Td [(.tar)100(.)]TJ /R35626152 10 Tf 16.7699 0 Td [(compr)36.9922(ession)]TJ /R35954040 10 Tf 53.7422 0 Td 3.561 Tw (Œle\). It's)Tj 41.5621 0 Td 1.061 Tw (your responsible to ha)Tj -0.15 Tc 91.5828 0 Td 1.361 Tw (ve t)Tj 0 Tc 15.6309 0 Td 1.061 Tw (hat Œle's con-)Tj -302.888 -12 Td 0 Tw (tents already as part of your upstream branch \(in a)Tj /R35626152 10 Tf 203.28 0 Td (component)Tj /R35954040 10 Tf 46.3801 0 Td (subdirectory\).)Tj -249.66 -24 Td 0.95 Tw [(\(Recorded Œles will be look)10(ed for by)]TJ /R36290528 10 Tf 156.25 0 Td (status)Tj /R35954040 10 Tf 28.45 0 Td (and)Tj /R36290528 10 Tf 17.8898 0 Td [(pr)18.0078(epar)17.9834(e)]TJ 5.95 Tc /R35954040 10 Tf 33.5199 0 Td (.T)Tj 0 Tc 14.5602 0 Td (he list of recorded compo-)Tj -250.67 -12 Td 0.301 Tw (nent source Œles is remo)Tj -0.15 Tc 98.2641 0 Td (ve)Tj 2.801 Tc 9.28984 0 Td (dw)Tj 0 Tc 15.0211 0 Td (hen a ne)Tj 2.801 Tc 33.6719 0 Td (wu)Tj 0 Tc 15.0211 0 Td (pstream branch or upstream)Tj /R36290528 10 Tf 115.063 0 Td (.orig)Tj /R35954040 10 Tf 22.5199 0 Td 0.3 Tw (source Œle is)Tj -308.851 -12 Td (recorded\).)Tj /R36290528 10 Tf -36 -28.8 Td [(--ignor)17.9846(e-deletions)]TJ /R35954040 10 Tf 74.8102 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (--)Tj 6.66016 -5 Td (ot-git-Œles=)Tj -0.15 Tc /R35954040 10 Tf -50.4703 -7 Td (Pa)Tj 0 Tc 9.85 0 Td 1.257 Tw (ssed to mer)Tj 47.884 0 Td 1.258 Tw (ge-patched, if called \(which is only done if there were no patches pre)Tj 291.156 0 Td (vi-)Tj -348.89 -12 Td (ously)Tj 2.5 Tc 21.0199 0 Td [(,s)250.015(ot)]TJ 0 Tc 19.1699 0 Td 0 Tw (he ne)Tj 2.5 Tc 21.1301 0 Td (wu)Tj 0 Tc 14.7199 0 Td [(pstream branch is mer)17.9834(ged in directly\).)]TJ -0.18 Tc /R36290528 10 Tf -148.04 -28.8 Td (re)Tj 0 Tc 8.7 0 Td (base-patched)Tj -0.35 Tc /R35954040 10 Tf 27.3 -12 Td (Tr)Tj 2.606 Tc 9.08984 0 Td [(yt)260.607(or)]TJ 0 Tc 21.3219 0 Td 0.106 Tw (ebase your current patched branch \()Tj /R36290528 10 Tf 143.53 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ 2.606 Tc /R35954040 10 Tf 36.5098 0 Td [(\)t)260.601(oy)]TJ 0 Tc 21.3219 0 Td 0.105 Tw (our current current up-)Tj -304.883 -12 Td 0 Tw (stream branch \()Tj /R36290528 10 Tf 62.2 0 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 40.3699 0 Td (|)Tj /R36290528 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R35626152 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\).)Tj -184.78 -24 Td 2.204 Tw [(If those branches do not yet e)15.0171(xist as git branches, the)]TJ 4.704 Tc 233.09 0 Td (ya)Tj 0 Tc 14.1441 0 Td (re \(re\)created from the information)Tj -247.234 -12 Td 0 Tw (recorded in)Tj /R36290528 10 Tf 47.7602 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 70.5699 0 Td (Œrst.)Tj -118.33 -24 Td 0.153 Tw (This is only a con)Tj -0.15 Tc 71.3219 0 Td (ve)Tj 0 Tc 9.28984 0 Td [(nience wrapper around git rebase that Œrst tries to determine what e)15.0049(xactly is to)]TJ -80.6117 -12 Td 3.395 Tw (rebase. If)Tj 43.9898 0 Td 0.895 Tw (there are an)Tj 3.395 Tc 48.2801 0 Td (yc)Tj 0 Tc 12.8352 0 Td (onicts, git rebase will ask you to resolv)Tj 3.395 Tc 167.775 0 Td (et)Tj 0 Tc 10.6148 0 Td (hem and tell rebase to con-)Tj -283.495 -12 Td (tinue.)Tj 24 TL 3.532 Tw (After this is Œnished \(and if the branch then looks lik)' 6.032 Tc 246.87 0 Td (ew)Tj 0 Tc 17.6922 0 Td (hat you w)Tj 46.4039 0 Td 3.531 Tw (ant\), you still need)Tj /R36290528 10 Tf -310.966 -12 Td [(mer)9.98413(ge-patched-into-debian)]TJ /R35954040 10 Tf 118.5 0 Td 0 Tw (\(or directly)Tj /R36290528 10 Tf 47.2102 0 Td (update-patches)Tj /R35954040 10 Tf 65 0 Td (\).)Tj /R36290528 10 Tf -266.71 -28.8 Td (tag)Tj /R35954040 10 Tf 15.8301 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td (options)Tj 2.5 Tc /R35954040 10 Tf 31.95 0 Td (][)Tj 0 Tc /R35626152 10 Tf 11.6602 0 Td [(ver)10.0073(sion)]TJ /R35954040 10 Tf 31.8398 0 Td (])Tj -61.1102 -12 Td 0.034 Tw [(Add tags to the upstream, patched and Debian branches.)-503.386(If no v)14.9878(ersion is gi)]TJ -0.15 Tc 300.542 0 Td (ve)Tj 0 Tc 9.28984 0 Td [(n, it is tak)10.0049(en from de-)]TJ -309.832 -12 Td (bian/changelog.)Tj (Options:)' -72 -57.6 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (11)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2505 │ │ │ │ │ +2506 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1291,29 +1291,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -384.34 -36 Td [(--r)18.0078(efr)17.9919(esh)]TJ /R11828152 10 Tf 36 -12 Td 0 Tw [(Ov)15.0073(erwrite the tags if the)]TJ 2.5 Tc 96.9 0 Td (ya)Tj 0 Tc 11.9398 0 Td [(re already there and dif)25.0146(fer \(e)15.0073(xcept upstream\).)]TJ /R12164640 10 Tf -144.84 -28.8 Td [(--r)18.0078(efr)17.9919(esh-upstr)18.0078(eam)]TJ /R11828152 10 Tf 36 -12 Td [(Ov)15.0073(erwrite the upstream if that is there and dif)25.0073(fers.)]TJ /R12164640 10 Tf -36 -28.8 Td [(--allo)10.0073(w-stale-patches)]TJ /R11828152 10 Tf 36 -12 Td 0.25 Tw (Don't error out if patches are not up to date.)Tj 183.569 0 Td 0.249 Tw (This is only useful if you are importing his-)Tj -183.569 -12 Td 0 Tw [(torical data and w)10.0073(ant to tag it.)]TJ /R12164640 10 Tf -36 -28.8 Td (--named)Tj /R11828152 10 Tf 36 -12 Td 2.431 Tw (Use the package name as part of the names of the generated tags.)Tj 296.804 0 Td (\(use)Tj /R12164640 10 Tf 21.5922 0 Td 2.432 Tw (git conŒg)Tj -318.396 -12 Td 0 Tw (dpm.tagsNamed true)Tj /R11828152 10 Tf 92.4898 0 Td (to mak)Tj 2.5 Tc 27.4 0 Td (et)Tj 0 Tc 9.71992 0 Td [(his the def)9.98535(ault\))]TJ /R12164640 10 Tf -165.61 -28.8 Td (--with-name)Tj /R11500264 10 Tf 54.7102 0 Td (name)Tj /R11828152 10 Tf -18.7102 -12 Td [(Lik)10.0159(e)]TJ /R12164640 10 Tf 20.7297 0 Td (--named)Tj -0.2 Tc /R11828152 10 Tf 38.05 0 Td (bu)Tj 2.5 Tc 9.8 0 Td (tg)Tj -0.25 Tc 10.2801 0 Td -2.15 Tw (iv e)Tj 0 Tc 14.3199 0 Td 0 Tw (the name to use.)Tj /R12164640 10 Tf -129.18 -28.8 Td (--debian-tag)Tj /R11500264 10 Tf 54.7199 0 Td [(ta)9.99268(g-name)]TJ /R12164640 10 Tf -54.7199 -16.8 Td (--patched-tag)Tj /R11500264 10 Tf 59.7102 0 Td [(ta)9.99268(g-name)]TJ /R12164640 10 Tf -59.7102 -16.8 Td [(--upstr)17.9846(eam-tag)]TJ /R11500264 10 Tf 66.1902 0 Td [(ta)9.99268(g-name)]TJ /R11828152 10 Tf -30.1902 -12 Td (Specify the names of the tags to generate.)Tj /R12164640 10 Tf 28.8 TL (%p)' /R11828152 10 Tf 18.0602 0 Td (is replaced with the package name,)Tj /R12164640 10 Tf -18.0602 -16.8 Td (%v)Tj /R11828152 10 Tf 17.9531 0 Td 0.453 Tw (with the v)Tj 40.7559 0 Td 0.452 Tw (ersion \(without epoch\) with colons \(:\) and tilde \(~\) replaced by underscore)Tj -22.709 -12 Td (\(_\),)Tj /R12164640 10 Tf -36 -16.8 Td (%u)Tj /R11828152 10 Tf 19.4398 0 Td 1.38 Tw [(with the upstream v)15(ersion \(without epoch or Debian re)25.0146(vision\) with colons \(:\) and)]TJ 16.5602 -12 Td 0 Tw (tilde \(~\) replaced by underscore \(_\),)Tj /R12164640 10 Tf -36 -16.8 Td (%e)Tj /R11828152 10 Tf 16.9398 0 Td (with the epoch,)Tj /R12164640 10 Tf -16.9398 -16.8 Td (%f)Tj /R11828152 10 Tf 15.948 0 Td 0.117 Tw [(with the epoch follo)24.9902(wed by an underscore \(_\) if there is an epoch, and with the empty)]TJ 20.052 -12 Td 0 Tw (string if there is no epoch,)Tj /R12164640 10 Tf -36 -16.8 Td (%V)Tj /R11828152 10 Tf 19.7199 0 Td [(with the v)15(ersion \(without epoch\) with colons \(:\) and tilde \(~\) replaced by dots \(.\),)]TJ /R12164640 10 Tf -19.7199 -16.8 Td (%U)Tj /R11828152 10 Tf 20.9719 0 Td 1.252 Tw [(with the upstream v)14.9976(ersion \(without epoch or Debian re)]TJ 228.466 0 Td 1.253 Tw (vision\) with colons \(:\) and)Tj -213.438 -12 Td 0 Tw (tilde \(~\) replaced with dots \(.\),)Tj /R12164640 10 Tf -36 -16.8 Td (%E)Tj /R11828152 10 Tf 20.0039 0 Td 0.834 Tw [(with the epoch follo)25.0122(wed by a dot if there is an epoch, and with the empty string if)]TJ 15.9961 -12 Td 0 Tw (there is no epoch,)Tj /R12164640 10 Tf -36 -16.8 Td (%%)Tj /R11828152 10 Tf 22.5 0 Td (with a single)Tj /R12164640 10 Tf 53.6102 0 Td (%)Tj /R11828152 10 Tf 10 0 Td (.)Tj -122.11 -24 Td 0.379 Tw (If one of those is not set via the command line option,)Tj /R12164640 10 Tf 222.589 0 Td 0.38 Tw (git conŒg)Tj /R11828152 10 Tf 42.4301 0 Td [(is ask)9.99023(ed about v)25.0098(alue of)]TJ /R12164640 10 Tf 95.7 0 Td (dpm.de-)Tj -360.719 -12 Td [(bianT)92(ag)]TJ /R11828152 10 Tf 34.65 0 Td (,)Tj /R12164640 10 Tf 6.94688 0 Td [(dpm.patchedT)92.0166(ag)]TJ /R11828152 10 Tf 76.0367 0 Td (or)Tj /R12164640 10 Tf 12.7762 0 Td [(dpm.upstr)18(eamT)92.0068(ag)]TJ 6.946 Tc /R11828152 10 Tf 78.0699 0 Td (.I)Tj 4.446 Tc 12.7762 0 Td (ft)Tj 0 Tc 10.5559 0 Td 1.946 Tw (hat is also not set or the special v)Tj 147.528 0 Td (alue)Tj -0.5 Tc /R12164640 10 Tf -379.34 -12 Td (AU)Tj -0.18 Tc 13.9398 0 Td (TO)Tj 2.5 Tc /R11828152 10 Tf 14.2699 0 Td (,t)Tj 0 Tc 7.78008 0 Td 0 Tw (hen debian/.git-dpm is scanned for a line of the form)Tj /R12164640 10 Tf -33.4898 -12 Td [(debianT)92(ag=")]TJ /R11500264 10 Tf 55.9 0 Td (value)Tj /R12164640 10 Tf 21.6602 0 Td (")Tj /R11828152 10 Tf 5.55 0 Td (,)Tj /R12164640 10 Tf -83.1102 -12 Td [(patchedT)92.0154(ag=")]TJ /R11500264 10 Tf 60.8898 0 Td (value)Tj /R12164640 10 Tf 21.6602 0 Td (")Tj /R11828152 10 Tf 8.05 0 Td (or)Tj /R12164640 10 Tf -90.6 -12 Td [(upstr)18(eamT)92.0081(ag=")]TJ /R11500264 10 Tf 67.3699 0 Td (value)Tj /R12164640 10 Tf 21.6602 0 Td (")Tj /R11828152 10 Tf 5.55 0 Td (.)Tj -97.0801 -24 Td (\(Note: al)Tj -0.1 Tc 35.1699 0 Td (wa)Tj 0 Tc 11.5602 0 Td (ys add those to the end of the Œle, the Œrst eight lines ha)Tj -0.15 Tc 223.12 0 Td 0.3 Tw (ve Œ)Tj 17.35 0 Td (xe)Tj 2.5 Tc 9.28984 0 Td (dl)Tj 0 Tc 10.2801 0 Td 0 Tw (ine numbers\))Tj -306.77 -24 Td 4.088 Tw (If this still does not result in an pattern to use, the def)Tj 261.996 0 Td 4.089 Tw (aults are ')Tj /R12164640 10 Tf 47.6078 0 Td (%p-debian%e-%v)Tj /R11828152 10 Tf 80.5602 0 Td (',)Tj -390.164 -12 Td (')Tj /R12164640 10 Tf 3.33008 0 Td (%p-patched%e-%v)Tj 8.584 Tc /R11828152 10 Tf 85.55 0 Td ('a)Tj 0 Tc 16.3539 0 Td 6.084 Tw (nd ')Tj /R12164640 10 Tf 21.9141 0 Td [(%p-upstr)18.0151(eam%e-%u)]TJ 8.583 Tc /R11828152 10 Tf 92.5898 0 Td ('w)Tj 0 Tc 19.1328 0 Td (ith)Tj /R12164640 10 Tf 19.143 0 Td (--named)Tj /R11828152 10 Tf 44.1328 0 Td 6.083 Tw (and ')Tj /R12164640 10 Tf 26.3531 0 Td (debian%e-%v)Tj /R11828152 10 Tf 61.6699 0 Td (',)Tj -462.17 -43.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (12)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -384.34 -36 Td [(--r)18.0078(efr)17.9919(esh)]TJ /R35954040 10 Tf 36 -12 Td 0 Tw [(Ov)15.0073(erwrite the tags if the)]TJ 2.5 Tc 96.9 0 Td (ya)Tj 0 Tc 11.9398 0 Td [(re already there and dif)25.0146(fer \(e)15.0073(xcept upstream\).)]TJ /R36290528 10 Tf -144.84 -28.8 Td [(--r)18.0078(efr)17.9919(esh-upstr)18.0078(eam)]TJ /R35954040 10 Tf 36 -12 Td [(Ov)15.0073(erwrite the upstream if that is there and dif)25.0073(fers.)]TJ /R36290528 10 Tf -36 -28.8 Td [(--allo)10.0073(w-stale-patches)]TJ /R35954040 10 Tf 36 -12 Td 0.25 Tw (Don't error out if patches are not up to date.)Tj 183.569 0 Td 0.249 Tw (This is only useful if you are importing his-)Tj -183.569 -12 Td 0 Tw [(torical data and w)10.0073(ant to tag it.)]TJ /R36290528 10 Tf -36 -28.8 Td (--named)Tj /R35954040 10 Tf 36 -12 Td 2.431 Tw (Use the package name as part of the names of the generated tags.)Tj 296.804 0 Td (\(use)Tj /R36290528 10 Tf 21.5922 0 Td 2.432 Tw (git conŒg)Tj -318.396 -12 Td 0 Tw (dpm.tagsNamed true)Tj /R35954040 10 Tf 92.4898 0 Td (to mak)Tj 2.5 Tc 27.4 0 Td (et)Tj 0 Tc 9.71992 0 Td [(his the def)9.98535(ault\))]TJ /R36290528 10 Tf -165.61 -28.8 Td (--with-name)Tj /R35626152 10 Tf 54.7102 0 Td (name)Tj /R35954040 10 Tf -18.7102 -12 Td [(Lik)10.0159(e)]TJ /R36290528 10 Tf 20.7297 0 Td (--named)Tj -0.2 Tc /R35954040 10 Tf 38.05 0 Td (bu)Tj 2.5 Tc 9.8 0 Td (tg)Tj -0.25 Tc 10.2801 0 Td -2.15 Tw (iv e)Tj 0 Tc 14.3199 0 Td 0 Tw (the name to use.)Tj /R36290528 10 Tf -129.18 -28.8 Td (--debian-tag)Tj /R35626152 10 Tf 54.7199 0 Td [(ta)9.99268(g-name)]TJ /R36290528 10 Tf -54.7199 -16.8 Td (--patched-tag)Tj /R35626152 10 Tf 59.7102 0 Td [(ta)9.99268(g-name)]TJ /R36290528 10 Tf -59.7102 -16.8 Td [(--upstr)17.9846(eam-tag)]TJ /R35626152 10 Tf 66.1902 0 Td [(ta)9.99268(g-name)]TJ /R35954040 10 Tf -30.1902 -12 Td (Specify the names of the tags to generate.)Tj /R36290528 10 Tf 28.8 TL (%p)' /R35954040 10 Tf 18.0602 0 Td (is replaced with the package name,)Tj /R36290528 10 Tf -18.0602 -16.8 Td (%v)Tj /R35954040 10 Tf 17.9531 0 Td 0.453 Tw (with the v)Tj 40.7559 0 Td 0.452 Tw (ersion \(without epoch\) with colons \(:\) and tilde \(~\) replaced by underscore)Tj -22.709 -12 Td (\(_\),)Tj /R36290528 10 Tf -36 -16.8 Td (%u)Tj /R35954040 10 Tf 19.4398 0 Td 1.38 Tw [(with the upstream v)15(ersion \(without epoch or Debian re)25.0146(vision\) with colons \(:\) and)]TJ 16.5602 -12 Td 0 Tw (tilde \(~\) replaced by underscore \(_\),)Tj /R36290528 10 Tf -36 -16.8 Td (%e)Tj /R35954040 10 Tf 16.9398 0 Td (with the epoch,)Tj /R36290528 10 Tf -16.9398 -16.8 Td (%f)Tj /R35954040 10 Tf 15.948 0 Td 0.117 Tw [(with the epoch follo)24.9902(wed by an underscore \(_\) if there is an epoch, and with the empty)]TJ 20.052 -12 Td 0 Tw (string if there is no epoch,)Tj /R36290528 10 Tf -36 -16.8 Td (%V)Tj /R35954040 10 Tf 19.7199 0 Td [(with the v)15(ersion \(without epoch\) with colons \(:\) and tilde \(~\) replaced by dots \(.\),)]TJ /R36290528 10 Tf -19.7199 -16.8 Td (%U)Tj /R35954040 10 Tf 20.9719 0 Td 1.252 Tw [(with the upstream v)14.9976(ersion \(without epoch or Debian re)]TJ 228.466 0 Td 1.253 Tw (vision\) with colons \(:\) and)Tj -213.438 -12 Td 0 Tw (tilde \(~\) replaced with dots \(.\),)Tj /R36290528 10 Tf -36 -16.8 Td (%E)Tj /R35954040 10 Tf 20.0039 0 Td 0.834 Tw [(with the epoch follo)25.0122(wed by a dot if there is an epoch, and with the empty string if)]TJ 15.9961 -12 Td 0 Tw (there is no epoch,)Tj /R36290528 10 Tf -36 -16.8 Td (%%)Tj /R35954040 10 Tf 22.5 0 Td (with a single)Tj /R36290528 10 Tf 53.6102 0 Td (%)Tj /R35954040 10 Tf 10 0 Td (.)Tj -122.11 -24 Td 0.379 Tw (If one of those is not set via the command line option,)Tj /R36290528 10 Tf 222.589 0 Td 0.38 Tw (git conŒg)Tj /R35954040 10 Tf 42.4301 0 Td [(is ask)9.99023(ed about v)25.0098(alue of)]TJ /R36290528 10 Tf 95.7 0 Td (dpm.de-)Tj -360.719 -12 Td [(bianT)92(ag)]TJ /R35954040 10 Tf 34.65 0 Td (,)Tj /R36290528 10 Tf 6.94688 0 Td [(dpm.patchedT)92.0166(ag)]TJ /R35954040 10 Tf 76.0367 0 Td (or)Tj /R36290528 10 Tf 12.7762 0 Td [(dpm.upstr)18(eamT)92.0068(ag)]TJ 6.946 Tc /R35954040 10 Tf 78.0699 0 Td (.I)Tj 4.446 Tc 12.7762 0 Td (ft)Tj 0 Tc 10.5559 0 Td 1.946 Tw (hat is also not set or the special v)Tj 147.528 0 Td (alue)Tj -0.5 Tc /R36290528 10 Tf -379.34 -12 Td (AU)Tj -0.18 Tc 13.9398 0 Td (TO)Tj 2.5 Tc /R35954040 10 Tf 14.2699 0 Td (,t)Tj 0 Tc 7.78008 0 Td 0 Tw (hen debian/.git-dpm is scanned for a line of the form)Tj /R36290528 10 Tf -33.4898 -12 Td [(debianT)92(ag=")]TJ /R35626152 10 Tf 55.9 0 Td (value)Tj /R36290528 10 Tf 21.6602 0 Td (")Tj /R35954040 10 Tf 5.55 0 Td (,)Tj /R36290528 10 Tf -83.1102 -12 Td [(patchedT)92.0154(ag=")]TJ /R35626152 10 Tf 60.8898 0 Td (value)Tj /R36290528 10 Tf 21.6602 0 Td (")Tj /R35954040 10 Tf 8.05 0 Td (or)Tj /R36290528 10 Tf -90.6 -12 Td [(upstr)18(eamT)92.0081(ag=")]TJ /R35626152 10 Tf 67.3699 0 Td (value)Tj /R36290528 10 Tf 21.6602 0 Td (")Tj /R35954040 10 Tf 5.55 0 Td (.)Tj -97.0801 -24 Td (\(Note: al)Tj -0.1 Tc 35.1699 0 Td (wa)Tj 0 Tc 11.5602 0 Td (ys add those to the end of the Œle, the Œrst eight lines ha)Tj -0.15 Tc 223.12 0 Td 0.3 Tw (ve Œ)Tj 17.35 0 Td (xe)Tj 2.5 Tc 9.28984 0 Td (dl)Tj 0 Tc 10.2801 0 Td 0 Tw (ine numbers\))Tj -306.77 -24 Td 4.088 Tw (If this still does not result in an pattern to use, the def)Tj 261.996 0 Td 4.089 Tw (aults are ')Tj /R36290528 10 Tf 47.6078 0 Td (%p-debian%e-%v)Tj /R35954040 10 Tf 80.5602 0 Td (',)Tj -390.164 -12 Td (')Tj /R36290528 10 Tf 3.33008 0 Td (%p-patched%e-%v)Tj 8.584 Tc /R35954040 10 Tf 85.55 0 Td ('a)Tj 0 Tc 16.3539 0 Td 6.084 Tw (nd ')Tj /R36290528 10 Tf 21.9141 0 Td [(%p-upstr)18.0151(eam%e-%u)]TJ 8.583 Tc /R35954040 10 Tf 92.5898 0 Td ('w)Tj 0 Tc 19.1328 0 Td (ith)Tj /R36290528 10 Tf 19.143 0 Td (--named)Tj /R35954040 10 Tf 44.1328 0 Td 6.083 Tw (and ')Tj /R36290528 10 Tf 26.3531 0 Td (debian%e-%v)Tj /R35954040 10 Tf 61.6699 0 Td (',)Tj -462.17 -43.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (12)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2016 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1350,29 +1350,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td (')Tj /R12164640 10 Tf 3.33008 0 Td (patched%e-%v)Tj 2.5 Tc /R11828152 10 Tf 66.6602 0 Td ('a)Tj 0 Tc 10.2699 0 Td 0 Tw (nd ')Tj /R12164640 10 Tf 15.8301 0 Td [(upstr)18(eam%e-%u)]TJ 2.5 Tc /R11828152 10 Tf 73.7 0 Td ('w)Tj 0 Tc 13.05 0 Td (ithout.)Tj -182.84 -24 Td [(If a tag name has the special v)25(alue)]TJ /R12164640 10 Tf 139.71 0 Td (NONE)Tj 2.5 Tc /R11828152 10 Tf 28.8898 0 Td [(,n)250(ot)]TJ 0 Tc 20.2801 0 Td (ag is generated.)Tj -0.18 Tc /R12164640 10 Tf -224.88 -28.8 Td (re)Tj 0 Tc 8.7 0 Td (f-tag)Tj /R11828152 10 Tf 22.4898 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td (options)Tj /R11828152 10 Tf 31.95 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td (commit)Tj /R11828152 10 Tf 31.9398 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td [(ver)10.0073(sion)]TJ /R11828152 10 Tf 31.8398 0 Td (])Tj -108.41 -12 Td [(Lik)10.0159(e)]TJ /R12164640 10 Tf 21.8398 0 Td (tag)Tj 3.61 Tc /R11828152 10 Tf 13.3301 0 Td (,b)Tj 0 Tc 10.9102 0 Td 1.11 Tw (ut create tags for)Tj /R11500264 10 Tf 73.8602 0 Td (commit)Tj 3.61 Tc /R11828152 10 Tf 29.4398 0 Td (,i)Tj 0 Tc 8.88984 0 Td (.e.)Tj /R11500264 10 Tf 15.55 0 Td (commit)Tj /R11828152 10 Tf 33.0512 0 Td 1.111 Tw (will get the Debian tag and the other tags are)Tj -206.871 -12 Td 0 Tw (placed where the)Tj /R12164640 10 Tf 70.25 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 70.5699 0 Td (Œle of that commit points to.)Tj -140.82 -24 Td (So it is mostly equi)Tj -0.25 Tc 76.9898 0 Td (va)Tj 0 Tc 9.18984 0 Td (lent to:)Tj /R12164640 10 Tf -83.6797 -12 Td [(git check)15(out -b temp)]TJ /R11500264 10 Tf 89.8398 0 Td (commit)Tj /R12164640 10 Tf -89.8398 -12 Td (git-dpm tag)Tj /R11828152 10 Tf 52.2199 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj 2.5 Tc /R11828152 10 Tf 29.45 0 Td (][)Tj 0 Tc /R11500264 10 Tf 9.16016 0 Td [(ver)10.0073(sion)]TJ /R11828152 10 Tf 29.3398 0 Td (])Tj /R12164640 10 Tf -123.5 -12 Td [(git check)15(out)]TJ /R11500264 10 Tf 54.2898 0 Td (pr)Tj -0.15 Tc 8.51992 0 Td (ev)Tj 0 Tc 8.73008 0 Td (ious-head)Tj /R12164640 10 Tf -71.5398 -12 Td (git branch -D temp)Tj /R11828152 10 Tf -2.5 -24 Td [(Options lik)9.99268(e)]TJ /R12164640 10 Tf 51.5699 0 Td (tag)Tj /R11828152 10 Tf 13.3301 0 Td (.)Tj /R12164640 10 Tf -100.9 -28.8 Td (apply-patch)Tj /R11828152 10 Tf 53.6199 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td (options...)Tj 2.5 Tc /R11828152 10 Tf 39.45 0 Td (][)Tj 0 Tc /R11500264 10 Tf 11.6602 0 Td (Œlename)Tj /R11828152 10 Tf 36.3801 0 Td (])Tj -110.94 -12 Td 0.205 Tw (Switch to the patched branch \(assuming it is up to date, use check)Tj 265.38 0 Td 0.204 Tw (out-patched Œrst to mak)Tj 2.704 Tc 95.782 0 Td (es)Tj 0 Tc 11.034 0 Td (ure or)Tj -372.196 -12 Td 0 Tw [(get an w)9.99268(arning\), and apply the patch gi)]TJ -0.15 Tc 155.73 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(na)250.015(sa)]TJ -0.18 Tc 22.7699 0 Td (rg)Tj 0 Tc 8.15 0 Td (ument or from stdin.)Tj /R12164640 10 Tf -195.94 -28.8 Td (--author)Tj /R11500264 10 Tf 38.05 0 Td (author <email>)Tj /R11828152 10 Tf -2.05 -12 Td [(Ov)15.0073(erride the author to be recorded.)]TJ /R12164640 10 Tf -36 -28.8 Td (--defaultauthor)Tj /R11500264 10 Tf 68.05 0 Td (author <email>)Tj /R11828152 10 Tf -32.05 -12 Td (If no author could be determined from the commit, use this.)Tj /R12164640 10 Tf -36 -28.8 Td (--date)Tj /R11500264 10 Tf 27.4898 0 Td (date)Tj /R11828152 10 Tf 8.51016 -12 Td (Date to record this patch originally be from if non found.)Tj /R12164640 10 Tf -36 -28.8 Td (--dpatch)Tj -0.15 Tc /R11828152 10 Tf 36 -12 Td (Pa)Tj 0 Tc 9.85 0 Td 0.241 Tw (rse patch as dpatch patch \(Only w)Tj 136.866 0 Td 0.242 Tw (orks for dpatch patches actually being a patch, might)Tj -146.716 -12 Td 0 Tw [(silently f)9.99268(ail for others\).)]TJ /R12164640 10 Tf -36 -28.8 Td (--cdbs)Tj -0.15 Tc /R11828152 10 Tf 36 0 Td (Pa)Tj 0 Tc 9.85 0 Td 1.241 Tw [(rse patch as cdbs simple-patchsys.mk patch \(Only w)10.0122(orks for dpatch patches actually)]TJ -9.85 -12 Td 0 Tw [(being a patch, might silently f)10.0146(ail for others\).)]TJ /R12164640 10 Tf -36 -28.8 Td (--edit)Tj /R11828152 10 Tf 36 0 Td (Start an editor before doing the commit \(In case you are too lazy to amend\).)Tj /R12164640 10 Tf -36 -28.8 Td [(--r)18.0078(ecord-name)]TJ /R11828152 10 Tf 36 -12 Td (Add a)Tj -0.1 Tc /R12164640 10 Tf 26.6602 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R11828152 10 Tf 47.4801 0 Td (Œeld to tell)Tj /R12164640 10 Tf 45.8398 0 Td (update-patches)Tj /R11828152 10 Tf 67.5 0 Td [(to e)15.0073(xport it with the same name ag)5.00977(ain.)]TJ /R12164640 10 Tf -234.49 -28.8 Td (--name)Tj /R11500264 10 Tf 32.4898 0 Td (name)Tj /R11828152 10 Tf 3.51016 -12 Td 1.2 Tw (Add a)Tj -0.1 Tc /R12164640 10 Tf 29.0602 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R11828152 10 Tf 48.6801 0 Td (Œeld to tell)Tj /R12164640 10 Tf 49.4398 0 Td (update-patches)Tj /R11828152 10 Tf 68.7 0 Td (to use)Tj /R11500264 10 Tf 28.5102 0 Td (name)Tj /R11828152 10 Tf 25.3602 0 Td (as Œlename to store this)Tj -260.761 -12 Td 0 Tw (patch into \(relati)Tj -0.15 Tc 65.85 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td (o)Tj /R12164640 10 Tf 7.5 0 Td (debian/patches)Tj /R11828152 10 Tf 63.9 0 Td (\).)Tj /R12164640 10 Tf -187.82 -28.8 Td (--category)Tj /R11500264 10 Tf 45.8102 0 Td (name)Tj /R11828152 10 Tf -9.81016 -12 Td 1.17 Tw (Add a)Tj -0.1 Tc /R12164640 10 Tf 29 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Category:)Tj /R11828152 10 Tf 63.0898 0 Td (Œeld to tell)Tj /R12164640 10 Tf 49.35 0 Td (update-patches)Tj /R11828152 10 Tf 68.6699 0 Td (to al)Tj -0.1 Tc 18.5699 0 Td (wa)Tj 0 Tc 11.5602 0 Td [(ys e)15(xport this patch into a)]TJ -251.25 -12 Td (subdirectory)Tj /R11500264 10 Tf 52.4898 0 Td (name)Tj /R11828152 10 Tf 24.1602 0 Td (of)Tj /R12164640 10 Tf 10.8301 0 Td (debian/patches)Tj /R11828152 10 Tf 63.9 0 Td (.)Tj -259.38 -67.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (13)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td (')Tj /R36290528 10 Tf 3.33008 0 Td (patched%e-%v)Tj 2.5 Tc /R35954040 10 Tf 66.6602 0 Td ('a)Tj 0 Tc 10.2699 0 Td 0 Tw (nd ')Tj /R36290528 10 Tf 15.8301 0 Td [(upstr)18(eam%e-%u)]TJ 2.5 Tc /R35954040 10 Tf 73.7 0 Td ('w)Tj 0 Tc 13.05 0 Td (ithout.)Tj -182.84 -24 Td [(If a tag name has the special v)25(alue)]TJ /R36290528 10 Tf 139.71 0 Td (NONE)Tj 2.5 Tc /R35954040 10 Tf 28.8898 0 Td [(,n)250(ot)]TJ 0 Tc 20.2801 0 Td (ag is generated.)Tj -0.18 Tc /R36290528 10 Tf -224.88 -28.8 Td (re)Tj 0 Tc 8.7 0 Td (f-tag)Tj /R35954040 10 Tf 22.4898 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td (options)Tj /R35954040 10 Tf 31.95 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td (commit)Tj /R35954040 10 Tf 31.9398 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td [(ver)10.0073(sion)]TJ /R35954040 10 Tf 31.8398 0 Td (])Tj -108.41 -12 Td [(Lik)10.0159(e)]TJ /R36290528 10 Tf 21.8398 0 Td (tag)Tj 3.61 Tc /R35954040 10 Tf 13.3301 0 Td (,b)Tj 0 Tc 10.9102 0 Td 1.11 Tw (ut create tags for)Tj /R35626152 10 Tf 73.8602 0 Td (commit)Tj 3.61 Tc /R35954040 10 Tf 29.4398 0 Td (,i)Tj 0 Tc 8.88984 0 Td (.e.)Tj /R35626152 10 Tf 15.55 0 Td (commit)Tj /R35954040 10 Tf 33.0512 0 Td 1.111 Tw (will get the Debian tag and the other tags are)Tj -206.871 -12 Td 0 Tw (placed where the)Tj /R36290528 10 Tf 70.25 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 70.5699 0 Td (Œle of that commit points to.)Tj -140.82 -24 Td (So it is mostly equi)Tj -0.25 Tc 76.9898 0 Td (va)Tj 0 Tc 9.18984 0 Td (lent to:)Tj /R36290528 10 Tf -83.6797 -12 Td [(git check)15(out -b temp)]TJ /R35626152 10 Tf 89.8398 0 Td (commit)Tj /R36290528 10 Tf -89.8398 -12 Td (git-dpm tag)Tj /R35954040 10 Tf 52.2199 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj 2.5 Tc /R35954040 10 Tf 29.45 0 Td (][)Tj 0 Tc /R35626152 10 Tf 9.16016 0 Td [(ver)10.0073(sion)]TJ /R35954040 10 Tf 29.3398 0 Td (])Tj /R36290528 10 Tf -123.5 -12 Td [(git check)15(out)]TJ /R35626152 10 Tf 54.2898 0 Td (pr)Tj -0.15 Tc 8.51992 0 Td (ev)Tj 0 Tc 8.73008 0 Td (ious-head)Tj /R36290528 10 Tf -71.5398 -12 Td (git branch -D temp)Tj /R35954040 10 Tf -2.5 -24 Td [(Options lik)9.99268(e)]TJ /R36290528 10 Tf 51.5699 0 Td (tag)Tj /R35954040 10 Tf 13.3301 0 Td (.)Tj /R36290528 10 Tf -100.9 -28.8 Td (apply-patch)Tj /R35954040 10 Tf 53.6199 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td (options...)Tj 2.5 Tc /R35954040 10 Tf 39.45 0 Td (][)Tj 0 Tc /R35626152 10 Tf 11.6602 0 Td (Œlename)Tj /R35954040 10 Tf 36.3801 0 Td (])Tj -110.94 -12 Td 0.205 Tw (Switch to the patched branch \(assuming it is up to date, use check)Tj 265.38 0 Td 0.204 Tw (out-patched Œrst to mak)Tj 2.704 Tc 95.782 0 Td (es)Tj 0 Tc 11.034 0 Td (ure or)Tj -372.196 -12 Td 0 Tw [(get an w)9.99268(arning\), and apply the patch gi)]TJ -0.15 Tc 155.73 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(na)250.015(sa)]TJ -0.18 Tc 22.7699 0 Td (rg)Tj 0 Tc 8.15 0 Td (ument or from stdin.)Tj /R36290528 10 Tf -195.94 -28.8 Td (--author)Tj /R35626152 10 Tf 38.05 0 Td (author <email>)Tj /R35954040 10 Tf -2.05 -12 Td [(Ov)15.0073(erride the author to be recorded.)]TJ /R36290528 10 Tf -36 -28.8 Td (--defaultauthor)Tj /R35626152 10 Tf 68.05 0 Td (author <email>)Tj /R35954040 10 Tf -32.05 -12 Td (If no author could be determined from the commit, use this.)Tj /R36290528 10 Tf -36 -28.8 Td (--date)Tj /R35626152 10 Tf 27.4898 0 Td (date)Tj /R35954040 10 Tf 8.51016 -12 Td (Date to record this patch originally be from if non found.)Tj /R36290528 10 Tf -36 -28.8 Td (--dpatch)Tj -0.15 Tc /R35954040 10 Tf 36 -12 Td (Pa)Tj 0 Tc 9.85 0 Td 0.241 Tw (rse patch as dpatch patch \(Only w)Tj 136.866 0 Td 0.242 Tw (orks for dpatch patches actually being a patch, might)Tj -146.716 -12 Td 0 Tw [(silently f)9.99268(ail for others\).)]TJ /R36290528 10 Tf -36 -28.8 Td (--cdbs)Tj -0.15 Tc /R35954040 10 Tf 36 0 Td (Pa)Tj 0 Tc 9.85 0 Td 1.241 Tw [(rse patch as cdbs simple-patchsys.mk patch \(Only w)10.0122(orks for dpatch patches actually)]TJ -9.85 -12 Td 0 Tw [(being a patch, might silently f)10.0146(ail for others\).)]TJ /R36290528 10 Tf -36 -28.8 Td (--edit)Tj /R35954040 10 Tf 36 0 Td (Start an editor before doing the commit \(In case you are too lazy to amend\).)Tj /R36290528 10 Tf -36 -28.8 Td [(--r)18.0078(ecord-name)]TJ /R35954040 10 Tf 36 -12 Td (Add a)Tj -0.1 Tc /R36290528 10 Tf 26.6602 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R35954040 10 Tf 47.4801 0 Td (Œeld to tell)Tj /R36290528 10 Tf 45.8398 0 Td (update-patches)Tj /R35954040 10 Tf 67.5 0 Td [(to e)15.0073(xport it with the same name ag)5.00977(ain.)]TJ /R36290528 10 Tf -234.49 -28.8 Td (--name)Tj /R35626152 10 Tf 32.4898 0 Td (name)Tj /R35954040 10 Tf 3.51016 -12 Td 1.2 Tw (Add a)Tj -0.1 Tc /R36290528 10 Tf 29.0602 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R35954040 10 Tf 48.6801 0 Td (Œeld to tell)Tj /R36290528 10 Tf 49.4398 0 Td (update-patches)Tj /R35954040 10 Tf 68.7 0 Td (to use)Tj /R35626152 10 Tf 28.5102 0 Td (name)Tj /R35954040 10 Tf 25.3602 0 Td (as Œlename to store this)Tj -260.761 -12 Td 0 Tw (patch into \(relati)Tj -0.15 Tc 65.85 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td (o)Tj /R36290528 10 Tf 7.5 0 Td (debian/patches)Tj /R35954040 10 Tf 63.9 0 Td (\).)Tj /R36290528 10 Tf -187.82 -28.8 Td (--category)Tj /R35626152 10 Tf 45.8102 0 Td (name)Tj /R35954040 10 Tf -9.81016 -12 Td 1.17 Tw (Add a)Tj -0.1 Tc /R36290528 10 Tf 29 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Category:)Tj /R35954040 10 Tf 63.0898 0 Td (Œeld to tell)Tj /R36290528 10 Tf 49.35 0 Td (update-patches)Tj /R35954040 10 Tf 68.6699 0 Td (to al)Tj -0.1 Tc 18.5699 0 Td (wa)Tj 0 Tc 11.5602 0 Td [(ys e)15(xport this patch into a)]TJ -251.25 -12 Td (subdirectory)Tj /R35626152 10 Tf 52.4898 0 Td (name)Tj /R35954040 10 Tf 24.1602 0 Td (of)Tj /R36290528 10 Tf 10.8301 0 Td (debian/patches)Tj /R35954040 10 Tf 63.9 0 Td (.)Tj -259.38 -67.2 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (13)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -1877 │ │ │ │ │ +1879 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1409,29 +1409,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -420.34 -36 Td (cherry-pick)Tj /R11828152 10 Tf 52.4898 0 Td ([)Tj /R11500264 10 Tf 5.83008 0 Td (options...)Tj /R11828152 10 Tf 39.45 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td (commit)Tj /R11828152 10 Tf -67.6 -12 Td 0.056 Tw (Recreate the patched branch and cherry-pick the gi)Tj -0.15 Tc 203.682 0 Td (ve)Tj 2.557 Tc 9.28984 0 Td (nc)Tj 0 Tc 11.9969 0 Td 2.557 Tw (ommit. Then)Tj 56.784 0 Td (mer)Tj 15.3699 0 Td 0.057 Tw (ge that back into the De-)Tj -297.123 -12 Td 0.961 Tw (bian branch and update the debian/patches directory \(i.e. mostly equi)Tj -0.25 Tc 284.179 0 Td (va)Tj 0 Tc 9.18984 0 Td (lent to check)Tj 52.9219 0 Td (out-patched,)Tj -346.291 -12 Td 0 Tw (git's cherry-pick, and update-patches\).)Tj /R12164640 10 Tf 28.8 TL T*[(--mer)10.0073(ge-only)]TJ /R11828152 10 Tf 36 -12 Td 0.012 Tw [(Only mer)17.998(ge the patched branch back into the Debian branch b)19.9854(ut do not update the patches)]TJ 12 TL 0 Tw T*[(directory \(Y)110(ou'll need to run update-patches later to get this done\).)]TJ /R12164640 10 Tf -36 -28.8 Td (-e)Tj /R11828152 10 Tf 10.2699 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--edit)Tj -0.15 Tc /R11828152 10 Tf 21.2301 -12 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to git's cherry-pick: edit the commit message pick)9.99023(ed.)]TJ /R12164640 10 Tf -45.85 -28.8 Td (-s)Tj /R11828152 10 Tf 9.71992 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--signoff)Tj -0.15 Tc /R11828152 10 Tf 21.7801 -12 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to git's cherry-pick: add a Signed-of)25.0073(f-by header)]TJ /R12164640 10 Tf -45.85 -28.8 Td (-x)Tj -0.15 Tc /R11828152 10 Tf 36 0 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to git's cherry-pick: add a line describing what w)10(as pick)10(ed)]TJ /R12164640 10 Tf -45.85 -28.8 Td (-m)Tj /R11500264 10 Tf 14.1602 0 Td (num)Tj /R11828152 10 Tf 19.7199 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--mainline)Tj /R11500264 10 Tf 46.3898 0 Td (num)Tj -0.15 Tc /R11828152 10 Tf -48.7699 -12 Td (Pa)Tj 0 Tc 9.85 0 Td (ssed to git's cherry-pick: allo)Tj 2.5 Tc 116.4 0 Td (wp)Tj 0 Tc 14.7199 0 Td [(icking a mer)17.9834(ge by specifying the parent to look at.)]TJ /R12164640 10 Tf -176.97 -28.8 Td [(--r)18.0078(epick)]TJ /R11828152 10 Tf 36 -12 Td (Don't abort if the speciŒed commit is already contained.)Tj /R12164640 10 Tf -36 -28.8 Td [(--allo)10.0073(w-nonlinear)]TJ /R11828152 10 Tf 73.7898 0 Td (,)Tj /R12164640 10 Tf 5 0 Td [(--ignor)17.9834(e-deletions)]TJ /R11828152 10 Tf 74.8102 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (--dot-git-Œles=)Tj -0.15 Tc /R11828152 10 Tf -122.6 -12 Td (Pa)Tj 0 Tc 9.85 0 Td (ssed to update-patches, if called.)Tj -9.85 -24 Td [(passed to mer)17.9834(ge-patched-into-debian and update-patches.)]TJ /R12164640 10 Tf -36 -28.8 Td [(--k)10.0073(eep-branch)]TJ /R11828152 10 Tf 36 -12 Td (do not remo)Tj -0.15 Tc 48.1801 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td 0 Tw (he patched branch when it is no longer needed.)Tj /R12164640 10 Tf -98.75 -28.8 Td (--amend)Tj /R11828152 10 Tf 36 -12 Td [(passed to mer)17.9834(ge-patched-into-debian: amend the last commit in the Debian branch.)]TJ /R12164640 10 Tf -72 -28.8 Td (import-dsc)Tj /R11828152 10 Tf 36 -12 Td 0.832 Tw (Import a Debian source package from a .dsc Œle.)Tj 206.878 0 Td 0.831 Tw (This can be used to create a ne)Tj 3.331 Tc 128.027 0 Td (wp)Tj 0 Tc 15.5512 0 Td (roject or to)Tj -350.456 -12 Td 0 Tw [(import a source package into an e)14.9854(xisting project.)]TJ 24 TL 0.939 Tw (While a possible old state of a project is recorded as parent commit, the state of the old Debian)' 12 TL 0.339 Tw (branch is not tak)' 67.2969 0 Td 0.338 Tw [(en into account.)-533.806(Especially all Œle deletions and .gitignore Œles and the lik)]TJ 2.838 Tc 302.546 0 Td (en)Tj 0 Tc 12.2781 0 Td (eed)Tj -382.121 -12 Td 0.78 Tw (to be reapplied/re-added afterw)Tj 127.47 0 Td 3.281 Tw (ards. \(Assumption)Tj 79.8922 0 Td 0.781 Tw (is that ne)Tj 3.281 Tc 37.4219 0 Td (ws)Tj 0 Tc 14.391 0 Td [(ource package v)14.9951(ersions from out-)]TJ -259.175 -12 Td 0.125 Tw (side might change stuf)Tj 2.625 Tc 90.3949 0 Td (fs)Tj 0 Tc 9.84492 0 Td (igniŒcantly)Tj 2.625 Tc 44.9102 0 Td [(,s)262.515(oo)]TJ 0 Tc 21.6398 0 Td [(ld information might more lik)10(ely be outdated.)-512.5(And reap-)]TJ -166.79 -12 Td 0 Tw (plying it is easier then re)Tj -0.15 Tc 98.35 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rting such changes.\))Tj -107.64 -24 Td 1.479 Tw (First step is importing the)Tj /R12164640 10 Tf 112.685 0 Td [(.orig)15.0073(.tar)]TJ /R11828152 10 Tf 38.8188 0 Td (Œle and possible)Tj /R12164640 10 Tf 71.9371 0 Td (.orig-)Tj /R11500264 10 Tf 23.05 0 Td (component)Tj /R12164640 10 Tf 43.8801 0 Td (.tar)Tj /R11828152 10 Tf 19.2488 0 Td 3.98 Tw (Œles. Y)Tj 31.7699 0 Td 1.48 Tw (ou can either)Tj -341.39 -12 Td 1.02 Tw (specify a branch to use.)Tj 104.24 0 Td (Otherwise)Tj /R12164640 10 Tf 44.6199 0 Td (import-dsc)Tj /R11828152 10 Tf 50.1789 0 Td 1.019 Tw [(will look if the pre)25(vious state of this project al-)]TJ -199.039 -12 Td 0.207 Tw [(ready has the needed Œle so the old upstream branch can be reused.)-520.684(If there is non, the Œle will be)]TJ 0 Tw (imported as a ne)' 2.5 Tc 65.5699 0 Td (wc)Tj 0 Tc 14.1602 0 Td [(ommit, by def)10.0146(ault with a possible pre)25.0073(vious upstream branch as parent.)]TJ -79.7301 -24 Td (Then)Tj /R12164640 10 Tf 23.0648 0 Td (import-dsc)Tj /R11828152 10 Tf 49.175 0 Td 0.014 Tw (will try to import the source package in the state as)Tj /R12164640 10 Tf 206.514 0 Td (dpkg-sour)Tj 43.7199 0 Td (ce -x)Tj -0.1 Tc /R11828152 10 Tf 22.2379 0 Td (wo)Tj 0 Tc 12.1199 0 Td (uld create)Tj -428.832 -48 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (14)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -420.34 -36 Td (cherry-pick)Tj /R35954040 10 Tf 52.4898 0 Td ([)Tj /R35626152 10 Tf 5.83008 0 Td (options...)Tj /R35954040 10 Tf 39.45 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td (commit)Tj /R35954040 10 Tf -67.6 -12 Td 0.056 Tw (Recreate the patched branch and cherry-pick the gi)Tj -0.15 Tc 203.682 0 Td (ve)Tj 2.557 Tc 9.28984 0 Td (nc)Tj 0 Tc 11.9969 0 Td 2.557 Tw (ommit. Then)Tj 56.784 0 Td (mer)Tj 15.3699 0 Td 0.057 Tw (ge that back into the De-)Tj -297.123 -12 Td 0.961 Tw (bian branch and update the debian/patches directory \(i.e. mostly equi)Tj -0.25 Tc 284.179 0 Td (va)Tj 0 Tc 9.18984 0 Td (lent to check)Tj 52.9219 0 Td (out-patched,)Tj -346.291 -12 Td 0 Tw (git's cherry-pick, and update-patches\).)Tj /R36290528 10 Tf 28.8 TL T*[(--mer)10.0073(ge-only)]TJ /R35954040 10 Tf 36 -12 Td 0.012 Tw [(Only mer)17.998(ge the patched branch back into the Debian branch b)19.9854(ut do not update the patches)]TJ 12 TL 0 Tw T*[(directory \(Y)110(ou'll need to run update-patches later to get this done\).)]TJ /R36290528 10 Tf -36 -28.8 Td (-e)Tj /R35954040 10 Tf 10.2699 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--edit)Tj -0.15 Tc /R35954040 10 Tf 21.2301 -12 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to git's cherry-pick: edit the commit message pick)9.99023(ed.)]TJ /R36290528 10 Tf -45.85 -28.8 Td (-s)Tj /R35954040 10 Tf 9.71992 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--signoff)Tj -0.15 Tc /R35954040 10 Tf 21.7801 -12 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to git's cherry-pick: add a Signed-of)25.0073(f-by header)]TJ /R36290528 10 Tf -45.85 -28.8 Td (-x)Tj -0.15 Tc /R35954040 10 Tf 36 0 Td (Pa)Tj 0 Tc 9.85 0 Td [(ssed to git's cherry-pick: add a line describing what w)10(as pick)10(ed)]TJ /R36290528 10 Tf -45.85 -28.8 Td (-m)Tj /R35626152 10 Tf 14.1602 0 Td (num)Tj /R35954040 10 Tf 19.7199 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--mainline)Tj /R35626152 10 Tf 46.3898 0 Td (num)Tj -0.15 Tc /R35954040 10 Tf -48.7699 -12 Td (Pa)Tj 0 Tc 9.85 0 Td (ssed to git's cherry-pick: allo)Tj 2.5 Tc 116.4 0 Td (wp)Tj 0 Tc 14.7199 0 Td [(icking a mer)17.9834(ge by specifying the parent to look at.)]TJ /R36290528 10 Tf -176.97 -28.8 Td [(--r)18.0078(epick)]TJ /R35954040 10 Tf 36 -12 Td (Don't abort if the speciŒed commit is already contained.)Tj /R36290528 10 Tf -36 -28.8 Td [(--allo)10.0073(w-nonlinear)]TJ /R35954040 10 Tf 73.7898 0 Td (,)Tj /R36290528 10 Tf 5 0 Td [(--ignor)17.9834(e-deletions)]TJ /R35954040 10 Tf 74.8102 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (--dot-git-Œles=)Tj -0.15 Tc /R35954040 10 Tf -122.6 -12 Td (Pa)Tj 0 Tc 9.85 0 Td (ssed to update-patches, if called.)Tj -9.85 -24 Td [(passed to mer)17.9834(ge-patched-into-debian and update-patches.)]TJ /R36290528 10 Tf -36 -28.8 Td [(--k)10.0073(eep-branch)]TJ /R35954040 10 Tf 36 -12 Td (do not remo)Tj -0.15 Tc 48.1801 0 Td 0.3 Tw (ve t)Tj 0 Tc 14.5699 0 Td 0 Tw (he patched branch when it is no longer needed.)Tj /R36290528 10 Tf -98.75 -28.8 Td (--amend)Tj /R35954040 10 Tf 36 -12 Td [(passed to mer)17.9834(ge-patched-into-debian: amend the last commit in the Debian branch.)]TJ /R36290528 10 Tf -72 -28.8 Td (import-dsc)Tj /R35954040 10 Tf 36 -12 Td 0.832 Tw (Import a Debian source package from a .dsc Œle.)Tj 206.878 0 Td 0.831 Tw (This can be used to create a ne)Tj 3.331 Tc 128.027 0 Td (wp)Tj 0 Tc 15.5512 0 Td (roject or to)Tj -350.456 -12 Td 0 Tw [(import a source package into an e)14.9854(xisting project.)]TJ 24 TL 0.939 Tw (While a possible old state of a project is recorded as parent commit, the state of the old Debian)' 12 TL 0.339 Tw (branch is not tak)' 67.2969 0 Td 0.338 Tw [(en into account.)-533.806(Especially all Œle deletions and .gitignore Œles and the lik)]TJ 2.838 Tc 302.546 0 Td (en)Tj 0 Tc 12.2781 0 Td (eed)Tj -382.121 -12 Td 0.78 Tw (to be reapplied/re-added afterw)Tj 127.47 0 Td 3.281 Tw (ards. \(Assumption)Tj 79.8922 0 Td 0.781 Tw (is that ne)Tj 3.281 Tc 37.4219 0 Td (ws)Tj 0 Tc 14.391 0 Td [(ource package v)14.9951(ersions from out-)]TJ -259.175 -12 Td 0.125 Tw (side might change stuf)Tj 2.625 Tc 90.3949 0 Td (fs)Tj 0 Tc 9.84492 0 Td (igniŒcantly)Tj 2.625 Tc 44.9102 0 Td [(,s)262.515(oo)]TJ 0 Tc 21.6398 0 Td [(ld information might more lik)10(ely be outdated.)-512.5(And reap-)]TJ -166.79 -12 Td 0 Tw (plying it is easier then re)Tj -0.15 Tc 98.35 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rting such changes.\))Tj -107.64 -24 Td 1.479 Tw (First step is importing the)Tj /R36290528 10 Tf 112.685 0 Td [(.orig)15.0073(.tar)]TJ /R35954040 10 Tf 38.8188 0 Td (Œle and possible)Tj /R36290528 10 Tf 71.9371 0 Td (.orig-)Tj /R35626152 10 Tf 23.05 0 Td (component)Tj /R36290528 10 Tf 43.8801 0 Td (.tar)Tj /R35954040 10 Tf 19.2488 0 Td 3.98 Tw (Œles. Y)Tj 31.7699 0 Td 1.48 Tw (ou can either)Tj -341.39 -12 Td 1.02 Tw (specify a branch to use.)Tj 104.24 0 Td (Otherwise)Tj /R36290528 10 Tf 44.6199 0 Td (import-dsc)Tj /R35954040 10 Tf 50.1789 0 Td 1.019 Tw [(will look if the pre)25(vious state of this project al-)]TJ -199.039 -12 Td 0.207 Tw [(ready has the needed Œle so the old upstream branch can be reused.)-520.684(If there is non, the Œle will be)]TJ 0 Tw (imported as a ne)' 2.5 Tc 65.5699 0 Td (wc)Tj 0 Tc 14.1602 0 Td [(ommit, by def)10.0146(ault with a possible pre)25.0073(vious upstream branch as parent.)]TJ -79.7301 -24 Td (Then)Tj /R36290528 10 Tf 23.0648 0 Td (import-dsc)Tj /R35954040 10 Tf 49.175 0 Td 0.014 Tw (will try to import the source package in the state as)Tj /R36290528 10 Tf 206.514 0 Td (dpkg-sour)Tj 43.7199 0 Td (ce -x)Tj -0.1 Tc /R35954040 10 Tf 22.2379 0 Td (wo)Tj 0 Tc 12.1199 0 Td (uld create)Tj -428.832 -48 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (14)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2165 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1468,29 +1468,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 2.7 Tw (it. \(That)Tj 37.6199 0 Td 0.2 Tw (is applying the .dif)Tj 2.7 Tc 75.35 0 Td (fa)Tj 0 Tc 10.4699 0 Td (nd making)Tj /R12164640 10 Tf 45.4 0 Td (debian/rules)Tj -0.15 Tc /R11828152 10 Tf 55.4898 0 Td (exe)Tj 0 Tc 13.5801 0 Td (cutable for 1.0 format packages and re-)Tj -237.91 -12 Td 3.307 Tw (placing the)Tj /R12164640 10 Tf 53.2738 0 Td (debian)Tj /R11828152 10 Tf 34.7059 0 Td 3.306 Tw (directory with the contents of a .debian.tar and applying possible)Tj /R12164640 10 Tf 294.69 0 Td (de-)Tj -382.67 -12 Td (bian/patches/series)Tj /R11828152 10 Tf 83.0602 0 Td 0 Tw [(for 3.0 format packages\).)-500(This is later referred to as v)15.0098(erbatim import.)]TJ -83.0602 -24 Td 0.929 Tw (If it is a 1.0 source format package,)Tj /R12164640 10 Tf 151.282 0 Td (import-dsc)Tj /R11828152 10 Tf 50.0891 0 Td (then looks for a set of supported patch systems)Tj -201.371 -12 Td 0.539 Tw (and tries to apply those patches.)Tj 135.993 0 Td 0.538 Tw [(Those are then mer)18.0103(ged with the v)15.0098(erbatim state into the ne)]TJ 3.038 Tc 234.76 0 Td (wD)Tj 0 Tc 17.4781 0 Td (e-)Tj -388.231 -12 Td 0 Tw (bian branch.)Tj 24 TL (Then a)' /R12164640 10 Tf 29.9898 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 70.5699 0 Td (Œle is created and a possible old state of the project added as parent.)Tj -100.56 -24 Td 0.042 Tw (Note that)Tj /R12164640 10 Tf 39.5238 0 Td [(dpkg-sour)18.0078(ce)]TJ /R11828152 10 Tf 55.143 0 Td 0.043 Tw [(is not used to e)15.0122(xtract packages, b)20.0146(ut the)]TJ 2.543 Tc 154.221 0 Td (ya)Tj 0 Tc 11.9828 0 Td [(re e)14.9854(xtracted manually)]TJ 5.043 Tc 85.9262 0 Td (.E)Tj 0 Tc 13.6531 0 Td (specially)Tj /R12164640 10 Tf -360.45 -12 Td (git-apply)Tj /R11828152 10 Tf 41.5641 0 Td 0.724 Tw (is used instead of)Tj /R12164640 10 Tf 74.5559 0 Td (patch)Tj 5.723 Tc /R11828152 10 Tf 23.8898 0 Td (.W)Tj 0 Tc 17.6629 0 Td 0.723 Tw [(hile this generally w)10.0171(orks \(and)]TJ /R12164640 10 Tf 124.885 0 Td (git-dpm)Tj /R11828152 10 Tf 37.1129 0 Td (has some magic to)Tj -0.1 Tc -319.67 -12 Td (wo)Tj 0 Tc 12.1199 0 Td 0.088 Tw (rk around some of)Tj /R12164640 10 Tf 75.8922 0 Td (git-apply)Tj /R11828152 10 Tf 38.3398 0 Td 0.089 Tw ('s shortcomings\), unclean patches might sometimes need a)Tj /R12164640 10 Tf 238.182 0 Td (-C0)Tj /R11828152 10 Tf 18.1391 0 Td (op-)Tj -382.673 -12 Td 0 Tw [(tion and then in same cases be applied at dif)24.9854(ferent positions than where)]TJ /R12164640 10 Tf 287.2 0 Td (patch)Tj -0.1 Tc /R11828152 10 Tf 26.3898 0 Td (wo)Tj 0 Tc 12.1199 0 Td (uld apply them.)Tj -325.71 -24 Td (General options:)Tj /R12164640 10 Tf 16.8 TL (-b)' /R11828152 10 Tf 11.3898 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--branch)Tj /R11500264 10 Tf 39.7199 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R11828152 10 Tf -19.6098 -12 Td 0.218 Tw [(Don't look at the current HEAD, b)19.9951(ut import the package into the git-dpm project)]TJ /R11500264 10 Tf 328.641 0 Td [(br)15.0146(anc)15.0146(h-)]TJ -328.641 -12 Td (name)Tj /R11828152 10 Tf 24.1602 0 Td 0 Tw (or create a ne)Tj 2.5 Tc 53.3301 0 Td (wp)Tj 0 Tc 14.7199 0 Td [(roject \(if that branch does not yet e)15.0146(xist\).)]TJ /R12164640 10 Tf -128.21 -28.8 Td [(--v)9.98413(erbatim)]TJ /R11500264 10 Tf 47.9402 0 Td [(br)15.0159(anc)15.0146(h-name)]TJ /R11828152 10 Tf -11.9402 -12 Td (After)Tj /R12164640 10 Tf 23.7988 0 Td (import-dsc)Tj /R11828152 10 Tf 49.359 0 Td 0.199 Tw (has completed successfully)Tj 108.618 0 Td (,)Tj /R11500264 10 Tf 5.19883 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R11828152 10 Tf 55.7188 0 Td [(will contain the v)14.9805(erbatim im-)]TJ -242.693 -12 Td 1.08 Tw [(port of the .dsc Œle.)-607.993(If a branch of that name already e)14.9902(xists, the ne)]TJ 3.58 Tc 279.66 0 Td (wv)Tj 0 Tc 15.65 0 Td (erbatim commit)Tj -295.31 -12 Td 2.498 Tw (will also ha)Tj -0.15 Tc 50.9059 0 Td 2.798 Tw (ve t)Tj 0 Tc 17.068 0 Td 2.498 Tw (he old as parent.)Tj 80.5328 0 Td 2.499 Tw [(\(This also causes the v)15.0049(erbatim commit not being)]TJ -148.507 -12 Td 0 Tw (amended with other changes, which can result in more commits\).)Tj /R12164640 10 Tf -36 -28.8 Td (--use-changelog)Tj -0.15 Tc /R11828152 10 Tf 36 -12 Td (Pa)Tj 0 Tc 9.85 0 Td 1.408 Tw [(rse debian/changelog of the imported package.)-640.796(Use the description as commit mes-)]TJ -9.85 -12 Td 0.435 Tw (sages and the author and time as def)Tj 147.635 0 Td 0.436 Tw (ault for patches and import commits without that in-)Tj -147.635 -12 Td 2.5 Tw (formation. \(W)Tj 58.9102 0 Td 0 Tw (arning: may still contain some rough edges\).)Tj -94.9102 -24 Td (Options about creating the upstream branch:)Tj /R12164640 10 Tf T*[(--upstr)17.9846(eam-to-use)]TJ /R11500264 10 Tf 78.4102 0 Td (commit)Tj /R11828152 10 Tf -42.4102 -12 Td 0.059 Tw [(Do not import the .orig.tar nor try to reuse an old import, b)20.0049(ut al)]TJ -0.1 Tc 253.227 0 Td (wa)Tj 0 Tc 11.5602 0 Td (ys use the)Tj /R11500264 10 Tf 42.116 0 Td (commit)Tj /R11828152 10 Tf 31.998 0 Td (spec-)Tj -338.901 -12 Td (iŒed.)Tj 24 TL 0.167 Tw (It is your responsibility that this branch is similar enough to the .orig.tar Œle plus possible)' 12 TL 2.335 Tw (.orig-component.tar in their respecti)' -0.15 Tc 150.895 0 Td 2.635 Tw (ve d)Tj 0 Tc 19.125 0 Td 4.834 Tw (irectories. \(As)Tj 66.318 0 Td 2.334 Tw (usual, similar enough means:)Tj -236.338 -12 Td 0.676 Tw (Does not miss an)Tj 3.176 Tc 70.4879 0 Td (yŒ)Tj 0 Tc 13.7359 0 Td [(les that your patches touch or your b)19.9805(uild process requires \(or recre-)]TJ -84.2238 -12 Td 0.298 Tw (ates unless)Tj /R12164640 10 Tf 46.1461 0 Td (debian/rules clean)Tj /R11828152 10 Tf 80.6059 0 Td (remo)Tj -0.15 Tc 20.4 0 Td (ve)Tj 2.798 Tc 9.28984 0 Td (st)Tj 0 Tc 9.46797 0 Td (hem ag)Tj 29.4078 0 Td 2.797 Tw (ain\). Ev)Tj 34.307 0 Td 0.297 Tw [(ery Œle dif)25.0098(ferent than in .orig.tar)]TJ -229.625 -12 Td 0.309 Tw [(or not e)15.0024(xisting there you must delete in the resulting Debian branch. No patch may touch)]TJ 0 Tw (those Œles.\))' 24 TL 0.213 Tw T*[(Use with care.)-521.313(Nothing will w)10.0073(arn you e)]TJ -0.15 Tc 161.391 0 Td (ve)Tj 2.712 Tc 9.28984 0 Td [(ni)271.182(fy)]TJ 0 Tc 21.5344 0 Td 0.212 Tw (ou use the contents of a totally wrong up-)Tj -192.215 -12 Td 0 Tw [(stream v)14.9854(ersion.)]TJ /R12164640 10 Tf -36 -28.8 Td [(--detached-upstr)18.0078(eam)]TJ /R11828152 10 Tf 36 -12 Td 0.978 Tw (If importing a .orig.tar as ne)Tj 3.479 Tc 117.12 0 Td (wc)Tj 0 Tc 15.1391 0 Td 0.979 Tw (ommit, do not mak)Tj 3.479 Tc 78.957 0 Td [(ea)347.9(np)]TJ 0 Tc 25.8379 0 Td (ossible commit for an old up-)Tj -237.054 -12 Td 0 Tw [(stream v)14.9854(ersion parent.)]TJ -108 -84 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (15)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -384.34 -36 Td 2.7 Tw (it. \(That)Tj 37.6199 0 Td 0.2 Tw (is applying the .dif)Tj 2.7 Tc 75.35 0 Td (fa)Tj 0 Tc 10.4699 0 Td (nd making)Tj /R36290528 10 Tf 45.4 0 Td (debian/rules)Tj -0.15 Tc /R35954040 10 Tf 55.4898 0 Td (exe)Tj 0 Tc 13.5801 0 Td (cutable for 1.0 format packages and re-)Tj -237.91 -12 Td 3.307 Tw (placing the)Tj /R36290528 10 Tf 53.2738 0 Td (debian)Tj /R35954040 10 Tf 34.7059 0 Td 3.306 Tw (directory with the contents of a .debian.tar and applying possible)Tj /R36290528 10 Tf 294.69 0 Td (de-)Tj -382.67 -12 Td (bian/patches/series)Tj /R35954040 10 Tf 83.0602 0 Td 0 Tw [(for 3.0 format packages\).)-500(This is later referred to as v)15.0098(erbatim import.)]TJ -83.0602 -24 Td 0.929 Tw (If it is a 1.0 source format package,)Tj /R36290528 10 Tf 151.282 0 Td (import-dsc)Tj /R35954040 10 Tf 50.0891 0 Td (then looks for a set of supported patch systems)Tj -201.371 -12 Td 0.539 Tw (and tries to apply those patches.)Tj 135.993 0 Td 0.538 Tw [(Those are then mer)18.0103(ged with the v)15.0098(erbatim state into the ne)]TJ 3.038 Tc 234.76 0 Td (wD)Tj 0 Tc 17.4781 0 Td (e-)Tj -388.231 -12 Td 0 Tw (bian branch.)Tj 24 TL (Then a)' /R36290528 10 Tf 29.9898 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 70.5699 0 Td (Œle is created and a possible old state of the project added as parent.)Tj -100.56 -24 Td 0.042 Tw (Note that)Tj /R36290528 10 Tf 39.5238 0 Td [(dpkg-sour)18.0078(ce)]TJ /R35954040 10 Tf 55.143 0 Td 0.043 Tw [(is not used to e)15.0122(xtract packages, b)20.0146(ut the)]TJ 2.543 Tc 154.221 0 Td (ya)Tj 0 Tc 11.9828 0 Td [(re e)14.9854(xtracted manually)]TJ 5.043 Tc 85.9262 0 Td (.E)Tj 0 Tc 13.6531 0 Td (specially)Tj /R36290528 10 Tf -360.45 -12 Td (git-apply)Tj /R35954040 10 Tf 41.5641 0 Td 0.724 Tw (is used instead of)Tj /R36290528 10 Tf 74.5559 0 Td (patch)Tj 5.723 Tc /R35954040 10 Tf 23.8898 0 Td (.W)Tj 0 Tc 17.6629 0 Td 0.723 Tw [(hile this generally w)10.0171(orks \(and)]TJ /R36290528 10 Tf 124.885 0 Td (git-dpm)Tj /R35954040 10 Tf 37.1129 0 Td (has some magic to)Tj -0.1 Tc -319.67 -12 Td (wo)Tj 0 Tc 12.1199 0 Td 0.088 Tw (rk around some of)Tj /R36290528 10 Tf 75.8922 0 Td (git-apply)Tj /R35954040 10 Tf 38.3398 0 Td 0.089 Tw ('s shortcomings\), unclean patches might sometimes need a)Tj /R36290528 10 Tf 238.182 0 Td (-C0)Tj /R35954040 10 Tf 18.1391 0 Td (op-)Tj -382.673 -12 Td 0 Tw [(tion and then in same cases be applied at dif)24.9854(ferent positions than where)]TJ /R36290528 10 Tf 287.2 0 Td (patch)Tj -0.1 Tc /R35954040 10 Tf 26.3898 0 Td (wo)Tj 0 Tc 12.1199 0 Td (uld apply them.)Tj -325.71 -24 Td (General options:)Tj /R36290528 10 Tf 16.8 TL (-b)' /R35954040 10 Tf 11.3898 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--branch)Tj /R35626152 10 Tf 39.7199 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R35954040 10 Tf -19.6098 -12 Td 0.218 Tw [(Don't look at the current HEAD, b)19.9951(ut import the package into the git-dpm project)]TJ /R35626152 10 Tf 328.641 0 Td [(br)15.0146(anc)15.0146(h-)]TJ -328.641 -12 Td (name)Tj /R35954040 10 Tf 24.1602 0 Td 0 Tw (or create a ne)Tj 2.5 Tc 53.3301 0 Td (wp)Tj 0 Tc 14.7199 0 Td [(roject \(if that branch does not yet e)15.0146(xist\).)]TJ /R36290528 10 Tf -128.21 -28.8 Td [(--v)9.98413(erbatim)]TJ /R35626152 10 Tf 47.9402 0 Td [(br)15.0159(anc)15.0146(h-name)]TJ /R35954040 10 Tf -11.9402 -12 Td (After)Tj /R36290528 10 Tf 23.7988 0 Td (import-dsc)Tj /R35954040 10 Tf 49.359 0 Td 0.199 Tw (has completed successfully)Tj 108.618 0 Td (,)Tj /R35626152 10 Tf 5.19883 0 Td [(br)15.0146(anc)15.0146(h-name)]TJ /R35954040 10 Tf 55.7188 0 Td [(will contain the v)14.9805(erbatim im-)]TJ -242.693 -12 Td 1.08 Tw [(port of the .dsc Œle.)-607.993(If a branch of that name already e)14.9902(xists, the ne)]TJ 3.58 Tc 279.66 0 Td (wv)Tj 0 Tc 15.65 0 Td (erbatim commit)Tj -295.31 -12 Td 2.498 Tw (will also ha)Tj -0.15 Tc 50.9059 0 Td 2.798 Tw (ve t)Tj 0 Tc 17.068 0 Td 2.498 Tw (he old as parent.)Tj 80.5328 0 Td 2.499 Tw [(\(This also causes the v)15.0049(erbatim commit not being)]TJ -148.507 -12 Td 0 Tw (amended with other changes, which can result in more commits\).)Tj /R36290528 10 Tf -36 -28.8 Td (--use-changelog)Tj -0.15 Tc /R35954040 10 Tf 36 -12 Td (Pa)Tj 0 Tc 9.85 0 Td 1.408 Tw [(rse debian/changelog of the imported package.)-640.796(Use the description as commit mes-)]TJ -9.85 -12 Td 0.435 Tw (sages and the author and time as def)Tj 147.635 0 Td 0.436 Tw (ault for patches and import commits without that in-)Tj -147.635 -12 Td 2.5 Tw (formation. \(W)Tj 58.9102 0 Td 0 Tw (arning: may still contain some rough edges\).)Tj -94.9102 -24 Td (Options about creating the upstream branch:)Tj /R36290528 10 Tf T*[(--upstr)17.9846(eam-to-use)]TJ /R35626152 10 Tf 78.4102 0 Td (commit)Tj /R35954040 10 Tf -42.4102 -12 Td 0.059 Tw [(Do not import the .orig.tar nor try to reuse an old import, b)20.0049(ut al)]TJ -0.1 Tc 253.227 0 Td (wa)Tj 0 Tc 11.5602 0 Td (ys use the)Tj /R35626152 10 Tf 42.116 0 Td (commit)Tj /R35954040 10 Tf 31.998 0 Td (spec-)Tj -338.901 -12 Td (iŒed.)Tj 24 TL 0.167 Tw (It is your responsibility that this branch is similar enough to the .orig.tar Œle plus possible)' 12 TL 2.335 Tw (.orig-component.tar in their respecti)' -0.15 Tc 150.895 0 Td 2.635 Tw (ve d)Tj 0 Tc 19.125 0 Td 4.834 Tw (irectories. \(As)Tj 66.318 0 Td 2.334 Tw (usual, similar enough means:)Tj -236.338 -12 Td 0.676 Tw (Does not miss an)Tj 3.176 Tc 70.4879 0 Td (yŒ)Tj 0 Tc 13.7359 0 Td [(les that your patches touch or your b)19.9805(uild process requires \(or recre-)]TJ -84.2238 -12 Td 0.298 Tw (ates unless)Tj /R36290528 10 Tf 46.1461 0 Td (debian/rules clean)Tj /R35954040 10 Tf 80.6059 0 Td (remo)Tj -0.15 Tc 20.4 0 Td (ve)Tj 2.798 Tc 9.28984 0 Td (st)Tj 0 Tc 9.46797 0 Td (hem ag)Tj 29.4078 0 Td 2.797 Tw (ain\). Ev)Tj 34.307 0 Td 0.297 Tw [(ery Œle dif)25.0098(ferent than in .orig.tar)]TJ -229.625 -12 Td 0.309 Tw [(or not e)15.0024(xisting there you must delete in the resulting Debian branch. No patch may touch)]TJ 0 Tw (those Œles.\))' 24 TL 0.213 Tw T*[(Use with care.)-521.313(Nothing will w)10.0073(arn you e)]TJ -0.15 Tc 161.391 0 Td (ve)Tj 2.712 Tc 9.28984 0 Td [(ni)271.182(fy)]TJ 0 Tc 21.5344 0 Td 0.212 Tw (ou use the contents of a totally wrong up-)Tj -192.215 -12 Td 0 Tw [(stream v)14.9854(ersion.)]TJ /R36290528 10 Tf -36 -28.8 Td [(--detached-upstr)18.0078(eam)]TJ /R35954040 10 Tf 36 -12 Td 0.978 Tw (If importing a .orig.tar as ne)Tj 3.479 Tc 117.12 0 Td (wc)Tj 0 Tc 15.1391 0 Td 0.979 Tw (ommit, do not mak)Tj 3.479 Tc 78.957 0 Td [(ea)347.9(np)]TJ 0 Tc 25.8379 0 Td (ossible commit for an old up-)Tj -237.054 -12 Td 0 Tw [(stream v)14.9854(ersion parent.)]TJ -108 -84 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (15)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2759 │ │ │ │ │ +2760 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1527,29 +1527,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -384.34 -36 Td [(--upstr)17.9846(eam-par)18.0078(ent)]TJ /R11500264 10 Tf 81.0102 0 Td (commit)Tj /R11828152 10 Tf -45.0102 -12 Td (Add)Tj /R11500264 10 Tf 19.7199 0 Td (commit)Tj /R11828152 10 Tf 31.9398 0 Td 0 Tw (as \(additional\) parent if importing a ne)Tj 2.5 Tc 154.17 0 Td (wu)Tj 0 Tc 14.7199 0 Td [(pstream v)14.9854(ersion.)]TJ -220.55 -24 Td 0.374 Tw [(\(This can for e)14.9902(xample be used to mak)]TJ 2.873 Tc 153.168 0 Td (eu)Tj 0 Tc 12.3129 0 Td 0.373 Tw (pstream's git history part of your package's his-)Tj -165.481 -12 Td 0 Tw [(tory and thus help git when cherry-picking stuf)24.9927(f\).)]TJ /R12164640 10 Tf -36 -28.8 Td [(--allo)10.0073(w-no-par)17.9834(ent)]TJ /R11828152 10 Tf 36 -12 Td 1.97 Tw (If dpm.importW)Tj 67.1199 0 Td (ithoutP)Tj 28.75 0 Td (arent is set to f)Tj 66.6602 0 Td 1.971 Tw (alse via git conŒg, git-dpm will not allo)Tj 4.471 Tc 171.887 0 Td (wi)Tj 0 Tc 14.4711 0 Td (m-)Tj -348.888 -12 Td 0 Tw (port-dsc to be run without this option or at least on --upstream-parent option.)Tj /R12164640 10 Tf -36 -28.8 Td (--pristine-tar-commit)Tj /R11828152 10 Tf 93.5801 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (--ptc)Tj /R11828152 10 Tf -59.5801 -12 Td (Call)Tj /R12164640 10 Tf 20.1801 0 Td 1.01 Tw (pristine-tar commit)Tj /R11828152 10 Tf 88.1102 0 Td 1.009 Tw (for all tarballs imported after the rest of the import-dsc com-)Tj -108.29 -12 Td 0 Tw [(mand w)10.0146(as successful.)]TJ /R12164640 10 Tf -36 -28.8 Td (--no-pristine-tar-commit)Tj /R11828152 10 Tf 36 -12 Td (Do not call)Tj /R12164640 10 Tf 46.9398 0 Td (pristine-tar commit)Tj /R11828152 10 Tf 86.0898 0 Td (for all imported tarballs e)Tj -0.15 Tc 101.4 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.99(fc)]TJ 0 Tc 20.55 0 Td (onŒgured to do so by)Tj /R12164640 10 Tf -261.77 -12 Td [(git conŒg dpm.pristineT)92(arCommit true)]TJ /R11828152 10 Tf 169.35 0 Td (or by)Tj /R12164640 10 Tf -169.35 -12 Td (git conŒg branch.)Tj /R11828152 10 Tf 74.7301 0 Td (debianbranch)Tj /R12164640 10 Tf 53.8699 0 Td [(.dpmPristineT)91.9922(arCommit true)]TJ /R11828152 10 Tf 125.73 0 Td (.)Tj /R12164640 10 Tf -292.83 -28.8 Td [(--upstr)17.9846(eam-author)]TJ /R11500264 10 Tf 81.75 0 Td (author)Tj /R11828152 10 Tf -45.75 -12 Td (Used as the)Tj /R12164640 10 Tf 48.6 0 Td (--author)Tj /R11828152 10 Tf 38.05 0 Td [(ar)18.0151(gument to)]TJ /R12164640 10 Tf 50.3699 0 Td (git-dpm import-tar)Tj /R11828152 10 Tf 81.9301 0 Td (.)Tj /R12164640 10 Tf -254.95 -28.8 Td [(--upstr)17.9846(eam-date)]TJ /R11500264 10 Tf 71.1902 0 Td (date)Tj /R11828152 10 Tf -35.1902 -12 Td 0.606 Tw (Used as the)Tj /R12164640 10 Tf 50.4191 0 Td (--date)Tj /R11828152 10 Tf 28.0969 0 Td (ar)Tj 7.58984 0 Td 0.607 Tw (gument to)Tj /R12164640 10 Tf 43.9941 0 Td (git-dpm import-tar)Tj /R11828152 10 Tf 85.6441 0 Td (\(especially)Tj /R12164640 10 Tf 46.427 0 Td (auto)Tj /R11828152 10 Tf 21.9969 0 Td (is supported to e)Tj 67.5012 0 Td (x-)Tj -351.669 -12 Td 0 Tw (tract a date from the tar Œle\).)Tj /R12164640 10 Tf -36 -28.8 Td (--tar-exclude)Tj /R11500264 10 Tf 57.4801 0 Td (pattern)Tj /R11828152 10 Tf -21.4801 -12 Td 1.433 Tw (The gi)Tj -0.15 Tc 27.0129 0 Td (ve)Tj 3.933 Tc 9.28984 0 Td (np)Tj 0 Tc 13.9328 0 Td [(attern is passed to tar as e)14.9951(xclude pattern when unpacking tarŒles.)]TJ 280.282 0 Td 1.432 Tw (Can be)Tj -330.518 -12 Td (gi)Tj -0.15 Tc 7.53008 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (nm)Tj 0 Tc 15.2801 0 Td 0 Tw (ultiple times.)Tj -68.1 -36 Td (Options about applying patches:)Tj /R12164640 10 Tf 16.8 TL (-f)' /R11828152 10 Tf 9.16016 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td [(--f)25.0159(or)17.9846(ce-commit-r)17.9834(euse)]TJ /R11828152 10 Tf 22.3398 -12 Td 0.733 Tw (Only look at parent and tree and no longer at the description when trying to reuse com-)Tj 12 TL 0 Tw T*[(mits importing patches from pre)24.9927(vious package v)14.9927(ersions.)]TJ /R12164640 10 Tf -36 -28.8 Td (-C)Tj /R11500264 10 Tf 10.55 0 Td (num)Tj /R11828152 10 Tf 19.7199 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (--patch-context)Tj /R11500264 10 Tf 67.4801 0 Td (num)Tj -0.15 Tc /R11828152 10 Tf -66.25 -12 Td (Pa)Tj 0 Tc 9.85 0 Td (ssed as)Tj /R12164640 10 Tf 30.55 0 Td (-C)Tj /R11500264 10 Tf 10.55 0 Td (num)Tj /R11828152 10 Tf 19.7199 0 Td (to)Tj /R12164640 10 Tf 10.2801 0 Td (git-apply)Tj 5 Tc /R11828152 10 Tf 38.3398 0 Td (.S)Tj 0 Tc 13.0602 0 Td [(peciŒes the number of conte)14.9854(xt lines that must match.)]TJ /R12164640 10 Tf -168.35 -28.8 Td [(--dpatch-allo)10(w-empty)]TJ /R11828152 10 Tf 36 -12 Td [(Do not error out if a dpatch Œle does not change an)15.0073(ything when treated as patch.)]TJ 24 TL 0.472 Tw (As dpatch Œles can be arbitrary scripts,)' /R12164640 10 Tf 161.603 0 Td (git-dpm)Tj /R11828152 10 Tf 36.8609 0 Td 0.471 Tw (has some problems detecting if the)Tj 2.971 Tc 141.355 0 Td (ya)Tj 0 Tc 12.4109 0 Td (re)Tj -352.23 -12 Td 0.282 Tw [(really patches.)-528.184(\(It can only cope with patches\).)-528.188(If a script that is not a patch is treated as)]TJ 12 TL 0.612 Tw (patch that usually results in patch not modify an)' 196.956 0 Td 0.611 Tw (ything, thus those are forbidden without)Tj -196.956 -12 Td 0 Tw (this option.)Tj /R12164640 10 Tf -36 -28.8 Td (--patch-system)Tj /R11500264 10 Tf 65.2602 0 Td (mode)Tj /R11828152 10 Tf -29.2602 -12 Td (Specify what patch system is used for source format 1.0 packages.)Tj -108 -60 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (16)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -384.34 -36 Td [(--upstr)17.9846(eam-par)18.0078(ent)]TJ /R35626152 10 Tf 81.0102 0 Td (commit)Tj /R35954040 10 Tf -45.0102 -12 Td (Add)Tj /R35626152 10 Tf 19.7199 0 Td (commit)Tj /R35954040 10 Tf 31.9398 0 Td 0 Tw (as \(additional\) parent if importing a ne)Tj 2.5 Tc 154.17 0 Td (wu)Tj 0 Tc 14.7199 0 Td [(pstream v)14.9854(ersion.)]TJ -220.55 -24 Td 0.374 Tw [(\(This can for e)14.9902(xample be used to mak)]TJ 2.873 Tc 153.168 0 Td (eu)Tj 0 Tc 12.3129 0 Td 0.373 Tw (pstream's git history part of your package's his-)Tj -165.481 -12 Td 0 Tw [(tory and thus help git when cherry-picking stuf)24.9927(f\).)]TJ /R36290528 10 Tf -36 -28.8 Td [(--allo)10.0073(w-no-par)17.9834(ent)]TJ /R35954040 10 Tf 36 -12 Td 1.97 Tw (If dpm.importW)Tj 67.1199 0 Td (ithoutP)Tj 28.75 0 Td (arent is set to f)Tj 66.6602 0 Td 1.971 Tw (alse via git conŒg, git-dpm will not allo)Tj 4.471 Tc 171.887 0 Td (wi)Tj 0 Tc 14.4711 0 Td (m-)Tj -348.888 -12 Td 0 Tw (port-dsc to be run without this option or at least on --upstream-parent option.)Tj /R36290528 10 Tf -36 -28.8 Td (--pristine-tar-commit)Tj /R35954040 10 Tf 93.5801 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (--ptc)Tj /R35954040 10 Tf -59.5801 -12 Td (Call)Tj /R36290528 10 Tf 20.1801 0 Td 1.01 Tw (pristine-tar commit)Tj /R35954040 10 Tf 88.1102 0 Td 1.009 Tw (for all tarballs imported after the rest of the import-dsc com-)Tj -108.29 -12 Td 0 Tw [(mand w)10.0146(as successful.)]TJ /R36290528 10 Tf -36 -28.8 Td (--no-pristine-tar-commit)Tj /R35954040 10 Tf 36 -12 Td (Do not call)Tj /R36290528 10 Tf 46.9398 0 Td (pristine-tar commit)Tj /R35954040 10 Tf 86.0898 0 Td (for all imported tarballs e)Tj -0.15 Tc 101.4 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td [(ni)249.99(fc)]TJ 0 Tc 20.55 0 Td (onŒgured to do so by)Tj /R36290528 10 Tf -261.77 -12 Td [(git conŒg dpm.pristineT)92(arCommit true)]TJ /R35954040 10 Tf 169.35 0 Td (or by)Tj /R36290528 10 Tf -169.35 -12 Td (git conŒg branch.)Tj /R35954040 10 Tf 74.7301 0 Td (debianbranch)Tj /R36290528 10 Tf 53.8699 0 Td [(.dpmPristineT)91.9922(arCommit true)]TJ /R35954040 10 Tf 125.73 0 Td (.)Tj /R36290528 10 Tf -292.83 -28.8 Td [(--upstr)17.9846(eam-author)]TJ /R35626152 10 Tf 81.75 0 Td (author)Tj /R35954040 10 Tf -45.75 -12 Td (Used as the)Tj /R36290528 10 Tf 48.6 0 Td (--author)Tj /R35954040 10 Tf 38.05 0 Td [(ar)18.0151(gument to)]TJ /R36290528 10 Tf 50.3699 0 Td (git-dpm import-tar)Tj /R35954040 10 Tf 81.9301 0 Td (.)Tj /R36290528 10 Tf -254.95 -28.8 Td [(--upstr)17.9846(eam-date)]TJ /R35626152 10 Tf 71.1902 0 Td (date)Tj /R35954040 10 Tf -35.1902 -12 Td 0.606 Tw (Used as the)Tj /R36290528 10 Tf 50.4191 0 Td (--date)Tj /R35954040 10 Tf 28.0969 0 Td (ar)Tj 7.58984 0 Td 0.607 Tw (gument to)Tj /R36290528 10 Tf 43.9941 0 Td (git-dpm import-tar)Tj /R35954040 10 Tf 85.6441 0 Td (\(especially)Tj /R36290528 10 Tf 46.427 0 Td (auto)Tj /R35954040 10 Tf 21.9969 0 Td (is supported to e)Tj 67.5012 0 Td (x-)Tj -351.669 -12 Td 0 Tw (tract a date from the tar Œle\).)Tj /R36290528 10 Tf -36 -28.8 Td (--tar-exclude)Tj /R35626152 10 Tf 57.4801 0 Td (pattern)Tj /R35954040 10 Tf -21.4801 -12 Td 1.433 Tw (The gi)Tj -0.15 Tc 27.0129 0 Td (ve)Tj 3.933 Tc 9.28984 0 Td (np)Tj 0 Tc 13.9328 0 Td [(attern is passed to tar as e)14.9951(xclude pattern when unpacking tarŒles.)]TJ 280.282 0 Td 1.432 Tw (Can be)Tj -330.518 -12 Td (gi)Tj -0.15 Tc 7.53008 0 Td (ve)Tj 2.5 Tc 9.28984 0 Td (nm)Tj 0 Tc 15.2801 0 Td 0 Tw (ultiple times.)Tj -68.1 -36 Td (Options about applying patches:)Tj /R36290528 10 Tf 16.8 TL (-f)' /R35954040 10 Tf 9.16016 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td [(--f)25.0159(or)17.9846(ce-commit-r)17.9834(euse)]TJ /R35954040 10 Tf 22.3398 -12 Td 0.733 Tw (Only look at parent and tree and no longer at the description when trying to reuse com-)Tj 12 TL 0 Tw T*[(mits importing patches from pre)24.9927(vious package v)14.9927(ersions.)]TJ /R36290528 10 Tf -36 -28.8 Td (-C)Tj /R35626152 10 Tf 10.55 0 Td (num)Tj /R35954040 10 Tf 19.7199 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (--patch-context)Tj /R35626152 10 Tf 67.4801 0 Td (num)Tj -0.15 Tc /R35954040 10 Tf -66.25 -12 Td (Pa)Tj 0 Tc 9.85 0 Td (ssed as)Tj /R36290528 10 Tf 30.55 0 Td (-C)Tj /R35626152 10 Tf 10.55 0 Td (num)Tj /R35954040 10 Tf 19.7199 0 Td (to)Tj /R36290528 10 Tf 10.2801 0 Td (git-apply)Tj 5 Tc /R35954040 10 Tf 38.3398 0 Td (.S)Tj 0 Tc 13.0602 0 Td [(peciŒes the number of conte)14.9854(xt lines that must match.)]TJ /R36290528 10 Tf -168.35 -28.8 Td [(--dpatch-allo)10(w-empty)]TJ /R35954040 10 Tf 36 -12 Td [(Do not error out if a dpatch Œle does not change an)15.0073(ything when treated as patch.)]TJ 24 TL 0.472 Tw (As dpatch Œles can be arbitrary scripts,)' /R36290528 10 Tf 161.603 0 Td (git-dpm)Tj /R35954040 10 Tf 36.8609 0 Td 0.471 Tw (has some problems detecting if the)Tj 2.971 Tc 141.355 0 Td (ya)Tj 0 Tc 12.4109 0 Td (re)Tj -352.23 -12 Td 0.282 Tw [(really patches.)-528.184(\(It can only cope with patches\).)-528.188(If a script that is not a patch is treated as)]TJ 12 TL 0.612 Tw (patch that usually results in patch not modify an)' 196.956 0 Td 0.611 Tw (ything, thus those are forbidden without)Tj -196.956 -12 Td 0 Tw (this option.)Tj /R36290528 10 Tf -36 -28.8 Td (--patch-system)Tj /R35626152 10 Tf 65.2602 0 Td (mode)Tj /R35954040 10 Tf -29.2602 -12 Td (Specify what patch system is used for source format 1.0 packages.)Tj -108 -60 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (16)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2062 │ │ │ │ │ +2063 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1586,29 +1586,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -348.34 -36 Td (auto)Tj /R11828152 10 Tf 21.3898 0 Td 0 Tw [(\(this is the def)10.0146(ault\))]TJ -0.35 Tc 14.6102 -12 Td (Tr)Tj 2.814 Tc 9.08984 0 Td [(yt)281.387(od)]TJ 0 Tc 23.4082 0 Td 0.315 Tw (etermine what patch system is used by looking at)Tj /R12164640 10 Tf 201.985 0 Td (debian/rules)Tj /R11828152 10 Tf 55.6051 0 Td (\(and)Tj /R12164640 10 Tf 20.5852 0 Td (de-)Tj -310.673 -12 Td [(bian/contr)18.0078(ol)]TJ /R11828152 10 Tf 52.05 0 Td (\).)Tj /R12164640 10 Tf -88.05 -16.8 Td (none)Tj /R11828152 10 Tf 36 0 Td 0 Tw [(Those are not the patches you are looking for)55.0073(.)]TJ /R12164640 10 Tf -36 -16.8 Td (history)Tj /R11828152 10 Tf 36 0 Td 0.208 Tw (Don't try to Œnd an)Tj 2.708 Tc 77.902 0 Td (yp)Tj 0 Tc 12.7078 0 Td (atches in the .dif)Tj 2.707 Tc 66.4738 0 Td (f\()Tj 0 Tc 9.36719 0 Td [(lik)9.98535(e)]TJ /R12164640 10 Tf 17.607 0 Td (none)Tj /R11828152 10 Tf 20.5602 0 Td 2.707 Tw (\). If)Tj 20.4039 0 Td 0.207 Tw (if the project already e)Tj 90.648 0 Td (x-)Tj -315.67 -12 Td 0.362 Tw (ists and the upstream tarball is the same, create the patched state of the ne)Tj 2.862 Tc 299.478 0 Td (wo)Tj 0 Tc 15.082 0 Td (ne)Tj -314.56 -12 Td 0.678 Tw (by using the patches of the old one and adding a patch of top bringing it to the)Tj 12 TL (ne)' 2.5 Tc 9.18984 0 Td (ws)Tj 0 Tc 13.6102 0 Td (tate.)Tj -22.8 -24 Td 2.103 Tw (If you import multiple re)Tj 107.602 0 Td 2.104 Tw (visions of some package, where each ne)Tj 4.604 Tc 172.604 0 Td (wr)Tj -0.25 Tc 15.1539 0 Td (ev)Tj 0 Tc 9.18984 0 Td (ision)Tj -304.55 -12 Td 0.484 Tw (added at most a single change to upstream, this option allo)Tj 238.74 0 Td 0.483 Tw (ws you to almost au-)Tj -238.74 -12 Td 0 Tw (tomatically create a proper set of patches \(ideally only missing descriptions\).)Tj 24 TL 0.142 Tw (If there are same changes and re)' -0.15 Tc 129.432 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rts those will be visible in the patches created,)Tj -138.722 -12 Td 0 Tw [(so this mode is not v)14.9854(ery useful in that case.)]TJ /R12164640 10 Tf -36 -28.8 Td (quilt)Tj /R11828152 10 Tf 36 0 Td 0.02 Tw (Extract and apply a)Tj /R12164640 10 Tf 80.059 0 Td (debian/patches/series)Tj /R11828152 10 Tf 93.0789 0 Td 0.019 Tw (quilt lik)Tj 2.519 Tc 31.3191 0 Td (es)Tj 0 Tc 10.8488 0 Td (eries on top of possible up-)Tj -215.306 -12 Td 0 Tw (stream changes found in the .dif)Tj 2.5 Tc 128.06 0 Td (fŒ)Tj 0 Tc 11.3898 0 Td (le.)Tj /R12164640 10 Tf -175.45 -28.8 Td (quilt-Œrst)Tj /R11828152 10 Tf 36 -12 Td 1.306 Tw (As the)Tj /R12164640 10 Tf 30.943 0 Td (quilt)Tj /R11828152 10 Tf 23.8172 0 Td 1.307 Tw [(mode, b)20.0049(ut apply the patches to an unmodiŒed upstream Œrst and)]TJ -54.7602 -12 Td 0 Tw (then cherry-pick the changes found in the .dif)Tj 2.5 Tc 181.93 0 Td (fŒ)Tj 0 Tc 11.3898 0 Td (le.)Tj -193.32 -24 Td 1.017 Tw (As this is not the order in which patches are applied in a normal unpack/b)Tj 308.438 0 Td (uild)Tj -0.15 Tc -308.438 -12 Td (cy)Tj 0 Tc 9.28984 0 Td 0.855 Tw [(cle, this will f)10.0146(ail if those changes are not distinct enough \(for e)]TJ 260.25 0 Td 0.856 Tw (xample when)Tj -269.54 -12 Td 0 Tw [(patches depend on changes done in the .dif)24.9927(f\).)]TJ 0.67 Tw (But if the .dif)' 3.17 Tc 55.65 0 Td (fo)Tj 0 Tc 11.5 0 Td [(nly contains unrelated changes which v)25.0098(aries with each v)]TJ 229.91 0 Td (ersion,)Tj -297.06 -12 Td 0.78 Tw (this gi)Tj -0.15 Tc 25.2602 0 Td (ve)Tj 3.28 Tc 9.28984 0 Td (sam)Tj 0 Tc 22.6699 0 Td (uch nicer history)Tj 3.281 Tc 68.1199 0 Td [(,a)328.091(st)]TJ 0 Tc 20.1723 0 Td 0.781 Tw (he commits for the patches can more easily)Tj -145.512 -12 Td 0 Tw (be reused.)Tj /R12164640 10 Tf -36 -28.8 Td (quilt-applied)Tj /R11828152 10 Tf 36 -12 Td 0.646 Tw (As the)Tj /R12164640 10 Tf 29.6219 0 Td (quilt-Œrst)Tj /R11828152 10 Tf 43.7059 0 Td (mode, b)Tj 32.666 0 Td 0.645 Tw (ut assume the patches are already applied in the .dif)Tj 212.175 0 Td (f,)Tj -318.169 -12 Td 0.009 Tw (so apply them on top of an unmodiŒed upstream and then add a commit bringing)Tj 12 TL 0 Tw (it to the state in the .dif)' 92.25 0 Td 2.5 Tw (f. \(Or)Tj 27.2102 0 Td 0 Tw [(not if that patch w)10.0073(ould be empty\).)]TJ /R12164640 10 Tf -155.46 -28.8 Td (dpatch)Tj /R11828152 10 Tf 31.95 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (dpatch-Œrst)Tj /R11828152 10 Tf 52.5 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (dpatch-applied)Tj /R11828152 10 Tf -57.45 -12 Td (Lik)Tj 3.699 Tc 13.7898 0 Td (et)Tj 0 Tc 10.9191 0 Td (he)Tj /R12164640 10 Tf 13.1391 0 Td (quilt)Tj /R11828152 10 Tf 23.7078 0 Td (resp.)Tj /R12164640 10 Tf 22.8578 0 Td (quilt-Œrst)Tj /R11828152 10 Tf 44.2578 0 Td (resp.)Tj /R12164640 10 Tf 22.8578 0 Td (quilt-applied)Tj /R11828152 10 Tf 58.718 0 Td 1.198 Tw [(modes, b)20.0195(ut instead look for)]TJ -210.247 -12 Td 0 Tw (dpatch-style patches in)Tj /R12164640 10 Tf 94.15 0 Td (debian/patches/00list)Tj /R11828152 10 Tf 89.4602 0 Td (.)Tj -183.61 -24 Td (Note that only patches are supported and not dpatch running other commands.)Tj /R12164640 10 Tf -36 -28.8 Td (simple)Tj /R11828152 10 Tf 30.2801 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (simple-Œrst)Tj /R11828152 10 Tf 50.8301 0 Td (|)Tj /R12164640 10 Tf 4.5 0 Td (simple-applied)Tj /R11828152 10 Tf -54.1102 -12 Td (Lik)Tj 4.068 Tc 13.7898 0 Td (et)Tj 0 Tc 11.2879 0 Td (he)Tj /R12164640 10 Tf 13.5078 0 Td (quilt)Tj /R11828152 10 Tf 24.0781 0 Td (resp.)Tj /R12164640 10 Tf 23.2281 0 Td (quilt-Œrst)Tj /R11828152 10 Tf 44.6281 0 Td (resp.)Tj /R12164640 10 Tf 23.2281 0 Td (quilt-applied)Tj /R11828152 10 Tf 59.0879 0 Td 1.568 Tw [(modes, b)19.9854(ut instead assume)]TJ /R12164640 10 Tf -212.836 -12 Td (debian/patches/)Tj /R11828152 10 Tf 69.1801 0 Td 0 Tw (contains patches suitable for cdbs's)Tj /R12164640 10 Tf 144.14 0 Td (simple-patchsys.mk)Tj /R11828152 10 Tf 84.1699 0 Td (.)Tj /R12164640 10 Tf -369.49 -28.8 Td (--patch-author)Tj /R11828152 10 Tf 65.2699 0 Td (")Tj /R11500264 10 Tf 4.08008 0 Td (name)Tj /R11828152 10 Tf 24.1602 0 Td (<)Tj /R11500264 10 Tf 5.63984 0 Td (email)Tj /R11828152 10 Tf 22.2199 0 Td (>")Tj -85.3699 -12 Td (Set the author for all git commits importing patches.)Tj /R12164640 10 Tf -36 -16.8 Td (--patch-default-author)Tj /R11828152 10 Tf 98.6 0 Td (")Tj /R11500264 10 Tf 4.08008 0 Td (name)Tj /R11828152 10 Tf 24.1602 0 Td (<)Tj /R11500264 10 Tf 5.63984 0 Td (email)Tj /R11828152 10 Tf 22.2199 0 Td (>")Tj -118.7 -12 Td 0.282 Tw (Set an author for all patches not containing author information \(or where)Tj /R12164640 10 Tf 296.664 0 Td (git-dpm)Tj /R11828152 10 Tf 36.6719 0 Td (cannot)Tj -333.336 -12 Td 0 Tw (determine it\).)Tj -108 -40.8 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (17)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -348.34 -36 Td (auto)Tj /R35954040 10 Tf 21.3898 0 Td 0 Tw [(\(this is the def)10.0146(ault\))]TJ -0.35 Tc 14.6102 -12 Td (Tr)Tj 2.814 Tc 9.08984 0 Td [(yt)281.387(od)]TJ 0 Tc 23.4082 0 Td 0.315 Tw (etermine what patch system is used by looking at)Tj /R36290528 10 Tf 201.985 0 Td (debian/rules)Tj /R35954040 10 Tf 55.6051 0 Td (\(and)Tj /R36290528 10 Tf 20.5852 0 Td (de-)Tj -310.673 -12 Td [(bian/contr)18.0078(ol)]TJ /R35954040 10 Tf 52.05 0 Td (\).)Tj /R36290528 10 Tf -88.05 -16.8 Td (none)Tj /R35954040 10 Tf 36 0 Td 0 Tw [(Those are not the patches you are looking for)55.0073(.)]TJ /R36290528 10 Tf -36 -16.8 Td (history)Tj /R35954040 10 Tf 36 0 Td 0.208 Tw (Don't try to Œnd an)Tj 2.708 Tc 77.902 0 Td (yp)Tj 0 Tc 12.7078 0 Td (atches in the .dif)Tj 2.707 Tc 66.4738 0 Td (f\()Tj 0 Tc 9.36719 0 Td [(lik)9.98535(e)]TJ /R36290528 10 Tf 17.607 0 Td (none)Tj /R35954040 10 Tf 20.5602 0 Td 2.707 Tw (\). If)Tj 20.4039 0 Td 0.207 Tw (if the project already e)Tj 90.648 0 Td (x-)Tj -315.67 -12 Td 0.362 Tw (ists and the upstream tarball is the same, create the patched state of the ne)Tj 2.862 Tc 299.478 0 Td (wo)Tj 0 Tc 15.082 0 Td (ne)Tj -314.56 -12 Td 0.678 Tw (by using the patches of the old one and adding a patch of top bringing it to the)Tj 12 TL (ne)' 2.5 Tc 9.18984 0 Td (ws)Tj 0 Tc 13.6102 0 Td (tate.)Tj -22.8 -24 Td 2.103 Tw (If you import multiple re)Tj 107.602 0 Td 2.104 Tw (visions of some package, where each ne)Tj 4.604 Tc 172.604 0 Td (wr)Tj -0.25 Tc 15.1539 0 Td (ev)Tj 0 Tc 9.18984 0 Td (ision)Tj -304.55 -12 Td 0.484 Tw (added at most a single change to upstream, this option allo)Tj 238.74 0 Td 0.483 Tw (ws you to almost au-)Tj -238.74 -12 Td 0 Tw (tomatically create a proper set of patches \(ideally only missing descriptions\).)Tj 24 TL 0.142 Tw (If there are same changes and re)' -0.15 Tc 129.432 0 Td (ve)Tj 0 Tc 9.28984 0 Td (rts those will be visible in the patches created,)Tj -138.722 -12 Td 0 Tw [(so this mode is not v)14.9854(ery useful in that case.)]TJ /R36290528 10 Tf -36 -28.8 Td (quilt)Tj /R35954040 10 Tf 36 0 Td 0.02 Tw (Extract and apply a)Tj /R36290528 10 Tf 80.059 0 Td (debian/patches/series)Tj /R35954040 10 Tf 93.0789 0 Td 0.019 Tw (quilt lik)Tj 2.519 Tc 31.3191 0 Td (es)Tj 0 Tc 10.8488 0 Td (eries on top of possible up-)Tj -215.306 -12 Td 0 Tw (stream changes found in the .dif)Tj 2.5 Tc 128.06 0 Td (fŒ)Tj 0 Tc 11.3898 0 Td (le.)Tj /R36290528 10 Tf -175.45 -28.8 Td (quilt-Œrst)Tj /R35954040 10 Tf 36 -12 Td 1.306 Tw (As the)Tj /R36290528 10 Tf 30.943 0 Td (quilt)Tj /R35954040 10 Tf 23.8172 0 Td 1.307 Tw [(mode, b)20.0049(ut apply the patches to an unmodiŒed upstream Œrst and)]TJ -54.7602 -12 Td 0 Tw (then cherry-pick the changes found in the .dif)Tj 2.5 Tc 181.93 0 Td (fŒ)Tj 0 Tc 11.3898 0 Td (le.)Tj -193.32 -24 Td 1.017 Tw (As this is not the order in which patches are applied in a normal unpack/b)Tj 308.438 0 Td (uild)Tj -0.15 Tc -308.438 -12 Td (cy)Tj 0 Tc 9.28984 0 Td 0.855 Tw [(cle, this will f)10.0146(ail if those changes are not distinct enough \(for e)]TJ 260.25 0 Td 0.856 Tw (xample when)Tj -269.54 -12 Td 0 Tw [(patches depend on changes done in the .dif)24.9927(f\).)]TJ 0.67 Tw (But if the .dif)' 3.17 Tc 55.65 0 Td (fo)Tj 0 Tc 11.5 0 Td [(nly contains unrelated changes which v)25.0098(aries with each v)]TJ 229.91 0 Td (ersion,)Tj -297.06 -12 Td 0.78 Tw (this gi)Tj -0.15 Tc 25.2602 0 Td (ve)Tj 3.28 Tc 9.28984 0 Td (sam)Tj 0 Tc 22.6699 0 Td (uch nicer history)Tj 3.281 Tc 68.1199 0 Td [(,a)328.091(st)]TJ 0 Tc 20.1723 0 Td 0.781 Tw (he commits for the patches can more easily)Tj -145.512 -12 Td 0 Tw (be reused.)Tj /R36290528 10 Tf -36 -28.8 Td (quilt-applied)Tj /R35954040 10 Tf 36 -12 Td 0.646 Tw (As the)Tj /R36290528 10 Tf 29.6219 0 Td (quilt-Œrst)Tj /R35954040 10 Tf 43.7059 0 Td (mode, b)Tj 32.666 0 Td 0.645 Tw (ut assume the patches are already applied in the .dif)Tj 212.175 0 Td (f,)Tj -318.169 -12 Td 0.009 Tw (so apply them on top of an unmodiŒed upstream and then add a commit bringing)Tj 12 TL 0 Tw (it to the state in the .dif)' 92.25 0 Td 2.5 Tw (f. \(Or)Tj 27.2102 0 Td 0 Tw [(not if that patch w)10.0073(ould be empty\).)]TJ /R36290528 10 Tf -155.46 -28.8 Td (dpatch)Tj /R35954040 10 Tf 31.95 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (dpatch-Œrst)Tj /R35954040 10 Tf 52.5 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (dpatch-applied)Tj /R35954040 10 Tf -57.45 -12 Td (Lik)Tj 3.699 Tc 13.7898 0 Td (et)Tj 0 Tc 10.9191 0 Td (he)Tj /R36290528 10 Tf 13.1391 0 Td (quilt)Tj /R35954040 10 Tf 23.7078 0 Td (resp.)Tj /R36290528 10 Tf 22.8578 0 Td (quilt-Œrst)Tj /R35954040 10 Tf 44.2578 0 Td (resp.)Tj /R36290528 10 Tf 22.8578 0 Td (quilt-applied)Tj /R35954040 10 Tf 58.718 0 Td 1.198 Tw [(modes, b)20.0195(ut instead look for)]TJ -210.247 -12 Td 0 Tw (dpatch-style patches in)Tj /R36290528 10 Tf 94.15 0 Td (debian/patches/00list)Tj /R35954040 10 Tf 89.4602 0 Td (.)Tj -183.61 -24 Td (Note that only patches are supported and not dpatch running other commands.)Tj /R36290528 10 Tf -36 -28.8 Td (simple)Tj /R35954040 10 Tf 30.2801 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (simple-Œrst)Tj /R35954040 10 Tf 50.8301 0 Td (|)Tj /R36290528 10 Tf 4.5 0 Td (simple-applied)Tj /R35954040 10 Tf -54.1102 -12 Td (Lik)Tj 4.068 Tc 13.7898 0 Td (et)Tj 0 Tc 11.2879 0 Td (he)Tj /R36290528 10 Tf 13.5078 0 Td (quilt)Tj /R35954040 10 Tf 24.0781 0 Td (resp.)Tj /R36290528 10 Tf 23.2281 0 Td (quilt-Œrst)Tj /R35954040 10 Tf 44.6281 0 Td (resp.)Tj /R36290528 10 Tf 23.2281 0 Td (quilt-applied)Tj /R35954040 10 Tf 59.0879 0 Td 1.568 Tw [(modes, b)19.9854(ut instead assume)]TJ /R36290528 10 Tf -212.836 -12 Td (debian/patches/)Tj /R35954040 10 Tf 69.1801 0 Td 0 Tw (contains patches suitable for cdbs's)Tj /R36290528 10 Tf 144.14 0 Td (simple-patchsys.mk)Tj /R35954040 10 Tf 84.1699 0 Td (.)Tj /R36290528 10 Tf -369.49 -28.8 Td (--patch-author)Tj /R35954040 10 Tf 65.2699 0 Td (")Tj /R35626152 10 Tf 4.08008 0 Td (name)Tj /R35954040 10 Tf 24.1602 0 Td (<)Tj /R35626152 10 Tf 5.63984 0 Td (email)Tj /R35954040 10 Tf 22.2199 0 Td (>")Tj -85.3699 -12 Td (Set the author for all git commits importing patches.)Tj /R36290528 10 Tf -36 -16.8 Td (--patch-default-author)Tj /R35954040 10 Tf 98.6 0 Td (")Tj /R35626152 10 Tf 4.08008 0 Td (name)Tj /R35954040 10 Tf 24.1602 0 Td (<)Tj /R35626152 10 Tf 5.63984 0 Td (email)Tj /R35954040 10 Tf 22.2199 0 Td (>")Tj -118.7 -12 Td 0.282 Tw (Set an author for all patches not containing author information \(or where)Tj /R36290528 10 Tf 296.664 0 Td (git-dpm)Tj /R35954040 10 Tf 36.6719 0 Td (cannot)Tj -333.336 -12 Td 0 Tw (determine it\).)Tj -108 -40.8 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (17)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ 2400 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1645,29 +1645,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj /R12164640 10 Tf -384.34 -36 Td (--edit-patches)Tj -0.15 Tc /R11828152 10 Tf 36 -12 Td (Fo)Tj 2.5 Tc 10.4102 0 Td (re)Tj -0.15 Tc 10.0199 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0 Tw (ry patch imported, start an editor for the commit message.)Tj /R12164640 10 Tf -65.7199 -16.8 Td [(--r)18.0078(ecord-patch-category)]TJ /R11828152 10 Tf 36 -12 Td 1.837 Tw (Add a)Tj -0.1 Tc /R12164640 10 Tf 30.334 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Category:)Tj /R11828152 10 Tf 63.757 0 Td (Œeld to each imported patch that is in a subdirectory of)Tj /R12164640 10 Tf 241.568 0 Td (de-)Tj -346.669 -12 Td (bian/patches)Tj 5 Tc /R11828152 10 Tf 53.9 0 Td (.T)Tj 0 Tc 13.6102 0 Td 0 Tw (his causes)Tj /R12164640 10 Tf 42.7699 0 Td (update-patches)Tj /R11828152 10 Tf 67.5 0 Td [(to store it in the same subdirectory)65.0098(.)]TJ /R12164640 10 Tf -213.78 -16.8 Td [(--r)18.0078(ecord-patch-name)]TJ /R11828152 10 Tf 36 -12 Td 2.768 Tw (Add a)Tj -0.1 Tc /R12164640 10 Tf 32.1961 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R11828152 10 Tf 50.248 0 Td (Œeld to each imported patch with its name.)Tj 197.683 0 Td 2.767 Tw (This causes)Tj /R12164640 10 Tf 54.4141 0 Td (up-)Tj -345.551 -12 Td (date-patches)Tj /R11828152 10 Tf 56.3801 0 Td 0 Tw (to store it under its original name.)Tj -0.18 Tc /R12164640 10 Tf -128.38 -28.8 Td (re)Tj 0 Tc 8.7 0 Td (cord-dsc)Tj /R11828152 10 Tf 39.1602 0 Td ([)Tj /R11500264 10 Tf 3.33008 0 Td (options)Tj /R11828152 10 Tf 29.45 0 Td (])Tj /R11500264 10 Tf 5.83008 0 Td (commit .dsc-Œle)Tj /R11828152 10 Tf -50.4703 -12 Td (Store a pristine .dsc Œle in a)Tj /R12164640 10 Tf 113.88 0 Td (dscs)Tj /R11828152 10 Tf 20.2801 0 Td [(branch after storing the Œles it contains using pristine-tar)55.0146(.)]TJ -134.16 -24 Td 1.034 Tw (The Œrst ar)Tj 45.768 0 Td 1.035 Tw (gument is an tag or commit storing the)Tj /R12164640 10 Tf 165.5 0 Td (git-dpm)Tj /R11828152 10 Tf 37.425 0 Td (project in the state belonging to the)Tj /R12164640 10 Tf -248.693 -12 Td (.dsc)Tj /R11828152 10 Tf 19.4621 0 Td 0.572 Tw [(Œle and the second ar)18.0103(gument is the)]TJ /R12164640 10 Tf 145.194 0 Td (.dsc)Tj /R11828152 10 Tf 19.4621 0 Td (Œle itself.)Tj 43.9238 0 Td 0.571 Tw [(The Œles it references are e)15.0146(xpected in the)]TJ -228.042 -12 Td 0 Tw (same directory as the Œle itself \(if the)Tj 2.5 Tc 148.99 0 Td (ya)Tj 0 Tc 11.9398 0 Td (re needed\).)Tj -160.93 -24 Td 1.164 Tw (Some checks are done to mak)Tj 3.664 Tc 124.86 0 Td (es)Tj 0 Tc 11.9941 0 Td (ure the Œle and its contents are named properly and match the)Tj -136.854 -12 Td 0.848 Tw [(commit in question, b)20.0171(ut only cursory to a)]TJ -0.2 Tc 170.536 0 Td (vo)Tj 0 Tc 9.8 0 Td [(id ob)14.9878(vious mistak)10.0098(es \(for e)15.0146(xample only the v)15(ersion is)]TJ -180.336 -12 Td 0 Tw [(check)10.0073(ed, b)20.0159(ut .debian.tar is not unpack)10.0073(ed to check the Œles are really the same, for e)14.9902(xample\).)]TJ 24 TL (Options:)' /R12164640 10 Tf 16.8 TL T*[(--cr)17.9846(eate-branch)]TJ /R11828152 10 Tf 36 -12 Td [(Create a ne)24.9927(w)]TJ /R12164640 10 Tf 54.45 0 Td (dscs)Tj /R11828152 10 Tf 20.2801 0 Td (branch.)Tj /R12164640 10 Tf -110.73 -28.8 Td [(--allo)10.0073(w-unsigned)]TJ /R11828152 10 Tf 36 -12 Td (Allo)Tj 2.5 Tc 17.5301 0 Td (wr)Tj 0 Tc 13.05 0 Td (ecording a unsigned)Tj /R12164640 10 Tf 83.0398 0 Td (.dsc)Tj /R11828152 10 Tf 18.8898 0 Td 2.5 Tw (Œle. This)Tj 40.5602 0 Td 0 Tw (usually defeats the point of storing them at all.)Tj /R12164640 10.95 Tf -281.07 -28.8 Td (the debian/.git-dpm Œle)Tj -1.1 Tc /R11828152 10 Tf 36 -12 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (us)Tj 0 Tc 11.3898 0 Td (hould not need to kno)Tj 2.5 Tc 86.9699 0 Td (wa)Tj 0 Tc 14.1602 0 Td [(bout the contents if this Œle e)14.9854(xcept for deb)19.9854(ugging git-dpm.)]TJ -123.64 -24 Td [(The Œle contains 8 lines, b)20(ut future v)14.9854(ersion may contain more.)]TJ 24 TL (The Œrst line is hint what this Œle is about and ignored.)' (Then there are 4 git commit ids for the recorded states:)' 36 -24 Td (First the state of the patched branch when the patches in)Tj /R12164640 10 Tf 226.9 0 Td (debian/patches)Tj /R11828152 10 Tf 66.4 0 Td (were last updated.)Tj -293.3 -24 Td [(Then the state of the patched branch when it w)10(as last mer)18.0151(ged into the Debian branch.)]TJ T*[(Then the state upstream branch when the patched branch w)9.99268(as last mer)18.0176(ged.)]TJ (Finally the upstream branch.)' -36 -24 Td 0.699 Tw [(The follo)24.9939(wing 3 lines are the Œlename, the sha1 checksum and the size of the origtarball belonging to the)]TJ 12 TL 0 Tw (recorded upstream branch.)' /R12164640 10.95 Tf -36 -28.8 Td [(SHOR)40.0145(TCUTS)]TJ /R11828152 10 Tf 36 -12 Td (Most commands also ha)Tj -0.15 Tc 96.7398 0 Td 0.3 Tw (ve s)Tj 0 Tc 15.6801 0 Td 0 Tw (horter aliases, to a)Tj -0.2 Tc 72.5602 0 Td (vo)Tj 0 Tc 9.8 0 Td (id typing:)Tj -192.28 -24 Td 6.74 Tw (update-patches: up,)Tj 87 0 Td 0 Tw (u-p, ci)Tj -87 -12 Td 0.74 Tw (prepare: prep)Tj -38.5 -38.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (18)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj /R36290528 10 Tf -384.34 -36 Td (--edit-patches)Tj -0.15 Tc /R35954040 10 Tf 36 -12 Td (Fo)Tj 2.5 Tc 10.4102 0 Td (re)Tj -0.15 Tc 10.0199 0 Td (ve)Tj 0 Tc 9.28984 0 Td 0 Tw (ry patch imported, start an editor for the commit message.)Tj /R36290528 10 Tf -65.7199 -16.8 Td [(--r)18.0078(ecord-patch-category)]TJ /R35954040 10 Tf 36 -12 Td 1.837 Tw (Add a)Tj -0.1 Tc /R36290528 10 Tf 30.334 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Category:)Tj /R35954040 10 Tf 63.757 0 Td (Œeld to each imported patch that is in a subdirectory of)Tj /R36290528 10 Tf 241.568 0 Td (de-)Tj -346.669 -12 Td (bian/patches)Tj 5 Tc /R35954040 10 Tf 53.9 0 Td (.T)Tj 0 Tc 13.6102 0 Td 0 Tw (his causes)Tj /R36290528 10 Tf 42.7699 0 Td (update-patches)Tj /R35954040 10 Tf 67.5 0 Td [(to store it in the same subdirectory)65.0098(.)]TJ /R36290528 10 Tf -213.78 -16.8 Td [(--r)18.0078(ecord-patch-name)]TJ /R35954040 10 Tf 36 -12 Td 2.768 Tw (Add a)Tj -0.1 Tc /R36290528 10 Tf 32.1961 0 Td (Pa)Tj 0 Tc 11.0102 0 Td (tch-Name:)Tj /R35954040 10 Tf 50.248 0 Td (Œeld to each imported patch with its name.)Tj 197.683 0 Td 2.767 Tw (This causes)Tj /R36290528 10 Tf 54.4141 0 Td (up-)Tj -345.551 -12 Td (date-patches)Tj /R35954040 10 Tf 56.3801 0 Td 0 Tw (to store it under its original name.)Tj -0.18 Tc /R36290528 10 Tf -128.38 -28.8 Td (re)Tj 0 Tc 8.7 0 Td (cord-dsc)Tj /R35954040 10 Tf 39.1602 0 Td ([)Tj /R35626152 10 Tf 3.33008 0 Td (options)Tj /R35954040 10 Tf 29.45 0 Td (])Tj /R35626152 10 Tf 5.83008 0 Td (commit .dsc-Œle)Tj /R35954040 10 Tf -50.4703 -12 Td (Store a pristine .dsc Œle in a)Tj /R36290528 10 Tf 113.88 0 Td (dscs)Tj /R35954040 10 Tf 20.2801 0 Td [(branch after storing the Œles it contains using pristine-tar)55.0146(.)]TJ -134.16 -24 Td 1.034 Tw (The Œrst ar)Tj 45.768 0 Td 1.035 Tw (gument is an tag or commit storing the)Tj /R36290528 10 Tf 165.5 0 Td (git-dpm)Tj /R35954040 10 Tf 37.425 0 Td (project in the state belonging to the)Tj /R36290528 10 Tf -248.693 -12 Td (.dsc)Tj /R35954040 10 Tf 19.4621 0 Td 0.572 Tw [(Œle and the second ar)18.0103(gument is the)]TJ /R36290528 10 Tf 145.194 0 Td (.dsc)Tj /R35954040 10 Tf 19.4621 0 Td (Œle itself.)Tj 43.9238 0 Td 0.571 Tw [(The Œles it references are e)15.0146(xpected in the)]TJ -228.042 -12 Td 0 Tw (same directory as the Œle itself \(if the)Tj 2.5 Tc 148.99 0 Td (ya)Tj 0 Tc 11.9398 0 Td (re needed\).)Tj -160.93 -24 Td 1.164 Tw (Some checks are done to mak)Tj 3.664 Tc 124.86 0 Td (es)Tj 0 Tc 11.9941 0 Td (ure the Œle and its contents are named properly and match the)Tj -136.854 -12 Td 0.848 Tw [(commit in question, b)20.0171(ut only cursory to a)]TJ -0.2 Tc 170.536 0 Td (vo)Tj 0 Tc 9.8 0 Td [(id ob)14.9878(vious mistak)10.0098(es \(for e)15.0146(xample only the v)15(ersion is)]TJ -180.336 -12 Td 0 Tw [(check)10.0073(ed, b)20.0159(ut .debian.tar is not unpack)10.0073(ed to check the Œles are really the same, for e)14.9902(xample\).)]TJ 24 TL (Options:)' /R36290528 10 Tf 16.8 TL T*[(--cr)17.9846(eate-branch)]TJ /R35954040 10 Tf 36 -12 Td [(Create a ne)24.9927(w)]TJ /R36290528 10 Tf 54.45 0 Td (dscs)Tj /R35954040 10 Tf 20.2801 0 Td (branch.)Tj /R36290528 10 Tf -110.73 -28.8 Td [(--allo)10.0073(w-unsigned)]TJ /R35954040 10 Tf 36 -12 Td (Allo)Tj 2.5 Tc 17.5301 0 Td (wr)Tj 0 Tc 13.05 0 Td (ecording a unsigned)Tj /R36290528 10 Tf 83.0398 0 Td (.dsc)Tj /R35954040 10 Tf 18.8898 0 Td 2.5 Tw (Œle. This)Tj 40.5602 0 Td 0 Tw (usually defeats the point of storing them at all.)Tj /R36290528 10.95 Tf -281.07 -28.8 Td (the debian/.git-dpm Œle)Tj -1.1 Tc /R35954040 10 Tf 36 -12 Td (Yo)Tj 2.5 Tc 11.1199 0 Td (us)Tj 0 Tc 11.3898 0 Td (hould not need to kno)Tj 2.5 Tc 86.9699 0 Td (wa)Tj 0 Tc 14.1602 0 Td [(bout the contents if this Œle e)14.9854(xcept for deb)19.9854(ugging git-dpm.)]TJ -123.64 -24 Td [(The Œle contains 8 lines, b)20(ut future v)14.9854(ersion may contain more.)]TJ 24 TL (The Œrst line is hint what this Œle is about and ignored.)' (Then there are 4 git commit ids for the recorded states:)' 36 -24 Td (First the state of the patched branch when the patches in)Tj /R36290528 10 Tf 226.9 0 Td (debian/patches)Tj /R35954040 10 Tf 66.4 0 Td (were last updated.)Tj -293.3 -24 Td [(Then the state of the patched branch when it w)10(as last mer)18.0151(ged into the Debian branch.)]TJ T*[(Then the state upstream branch when the patched branch w)9.99268(as last mer)18.0176(ged.)]TJ (Finally the upstream branch.)' -36 -24 Td 0.699 Tw [(The follo)24.9939(wing 3 lines are the Œlename, the sha1 checksum and the size of the origtarball belonging to the)]TJ 12 TL 0 Tw (recorded upstream branch.)' /R36290528 10.95 Tf -36 -28.8 Td [(SHOR)40.0145(TCUTS)]TJ /R35954040 10 Tf 36 -12 Td (Most commands also ha)Tj -0.15 Tc 96.7398 0 Td 0.3 Tw (ve s)Tj 0 Tc 15.6801 0 Td 0 Tw (horter aliases, to a)Tj -0.2 Tc 72.5602 0 Td (vo)Tj 0 Tc 9.8 0 Td (id typing:)Tj -192.28 -24 Td 6.74 Tw (update-patches: up,)Tj 87 0 Td 0 Tw (u-p, ci)Tj -87 -12 Td 0.74 Tw (prepare: prep)Tj -38.5 -38.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (18)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -1986 │ │ │ │ │ +1987 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1704,29 +1704,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -417.84 -36 Td (check)Tj 23.2199 0 Td 32.29 Tw (out-patched: co,)Tj 99.2199 0 Td (c-p)Tj -122.44 -12 Td 6.75 Tw (rebase-patched: r-p)Tj 12 TL 19.51 Tw (apply-patch: a-p)' 26.17 Tw (import-tar: i-t)' (import-ne)' 39.1898 0 Td 16.32 Tw (w-upstream: i-n-u,)Tj 93.25 0 Td (inu)Tj -132.44 -12 Td (record-ne)Tj 38.0602 0 Td 17.45 Tw (w-upstream: r-n-u,)Tj 94.9301 0 Td (rnu)Tj -132.99 -12 Td 0 Tw [(mer)18.0078(ge-patched-in-debian: mer)18.0078(ge-patched)]TJ -2.5 -24 Td (record-ne)Tj 38.0602 0 Td 0.503 Tw (w-upstream is also a)Tj -0.25 Tc 83.2391 0 Td (va)Tj 0 Tc 9.18984 0 Td [(ilable under the old name ne)24.9927(w-upstream, though lik)10.0146(ely will be remo)]TJ -0.15 Tc 276.44 0 Td (ve)Tj 3.002 Tc 9.28984 0 Td (di)Tj 0 Tc 10.782 0 Td (n)Tj -427.001 -12 Td 0 Tw [(future v)14.9927(ersions \(to a)]TJ -0.2 Tc 79.9102 0 Td (vo)Tj 0 Tc 9.8 0 Td (id confusion\).)Tj /R12164640 10.95 Tf -125.71 -28.8 Td (BRANCHES)Tj /R11828152 10 Tf 36 -12 Td (the upstream branch \()Tj /R12164640 10 Tf 86.9199 0 Td [(upstr)18(eam)]TJ /R11828152 10 Tf 40.3699 0 Td (|)Tj /R12164640 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R11500264 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\))Tj -173.5 -12 Td 0.378 Tw (This branch contains the upstream sources.)Tj 179.459 0 Td 0.379 Tw (It contents need to be equal enough to the contents in)Tj -179.459 -12 Td 0 Tw (your upstream tarball.)Tj 24 TL 0.137 Tw (Equal enough means that dpkg-source should see no dif)' 224.146 0 Td 0.136 Tw (ference between your patched tree and and)Tj -224.146 -12 Td 0.464 Tw (original tarball unpackaged, the patched applied and)Tj /R12164640 10 Tf 214.869 0 Td 0.465 Tw (debian/rules clean)Tj /R11828152 10 Tf 80.9398 0 Td 2.965 Tw (run. Usually)Tj 55.3699 0 Td 0.465 Tw (it is easiest)Tj -351.179 -12 Td 0.654 Tw (to just store the v)Tj 71.3559 0 Td 0.653 Tw [(erbatim contents of your orig tarball here.)-565.286(Then you can also use it for pristine)]TJ -71.3559 -12 Td [(tar)55(.)]TJ 0 Tw (This branch may contain a debian/ subdirectory)' 2.5 Tc 189.87 0 Td (,w)Tj 0 Tc 12.2199 0 Td (hich will usually be just ignored.)Tj -1.1 Tc -202.09 -24 Td (Yo)Tj 3.165 Tc 11.1199 0 Td (uc)Tj 0 Tc 12.6051 0 Td 0.665 Tw (an either publish that branch or mak)Tj 3.165 Tc 148.31 0 Td [(ei)316.484(to)]TJ 0 Tc 21.3301 0 Td 0.666 Tw (nly implicitly visible via the)Tj /R12164640 10 Tf 118.62 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 71.2359 0 Td (Œle)Tj -383.221 -12 Td 0 Tw (in the Debian branch.)Tj 0.372 Tw T*[(While it usually mak)9.98291(es sense that ne)24.9902(wer upstream branches contain older ones, this is not needed.)]TJ -1.1 Tc 12 TL (Yo)' 3.847 Tc 11.1199 0 Td (us)Tj 0 Tc 12.7371 0 Td 1.347 Tw (hould be able to switch from one created yourself or by some foreign-vcs importing tool)Tj -23.857 -12 Td 0.942 Tw (generated one to an nati)Tj -0.15 Tc 99.048 0 Td 1.242 Tw (ve u)Tj 0 Tc 17.732 0 Td 0.942 Tw [(pstream branch or vice v)14.9878(ersa without problems.)-594.185(Note that since the)]TJ -116.78 -12 Td 1.131 Tw (Debian branch has the patched branch as ancestor and the patched branch the upstream branch,)Tj 0.775 Tw T*[(your upstream branches are part of the history of your Debian branch.)-577.49(Which has the adv)]TJ 369.895 0 Td (antage)Tj -369.895 -12 Td 0.197 Tw (that you can recreate the e)Tj 105.515 0 Td 0.198 Tw (xact state of your branches from your history directly \(lik)Tj 231.362 0 Td (e)Tj /R12164640 10 Tf 7.13789 0 Td (git check)Tj 38.098 0 Td (out)Tj -382.113 -12 Td 3.22 Tw (-b oldstate)Tj /R11500264 10 Tf 53.6602 0 Td [(myoldta)10.0073(gor)10.0146(shaofdebianbr)14.9927(anc)15.0146(hcommit)]TJ 5.72 Tc /R12164640 10 Tf 157.99 0 Td (;g)Tj 0 Tc 14.05 0 Td (it-dpm pr)Tj 44.4301 0 Td (epar)Tj 5.72 Tc 19.2602 0 Td (e;g)Tj 0 Tc 24.2102 0 Td [(it check)15.0098(out unsta-)]TJ -313.6 -12 Td (ble-oldstate)Tj 2.812 Tc /R11828152 10 Tf 49.4398 0 Td (\)b)Tj 0 Tc 10.9422 0 Td 0.312 Tw [(ut the disadv)25.0024(antage that to remo)]TJ -0.15 Tc 129.2 0 Td 0.612 Tw (ve t)Tj 0 Tc 14.882 0 Td 0.312 Tw (hose histories from your repository you ha)Tj -0.15 Tc 171.652 0 Td 0.613 Tw (ve t)Tj 0 Tc 14.8828 0 Td (o)Tj -390.999 -12 Td 0 Tw [(do some manual w)10.0073(ork.)]TJ -36 -28.8 Td (the patched branch \()Tj /R12164640 10 Tf 81.3602 0 Td (patched)Tj /R11828152 10 Tf 33.8898 0 Td (|)Tj /R12164640 10 Tf 2 0 Td (patched-)Tj /R11500264 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\))Tj -154.98 -12 Td 0.553 Tw [(This branch contains your patches to the upstream source.)-555.295(\(which of course means it is based on)]TJ 0 Tw (your upstream branch\).)' 24 TL T*[(Ev)14.9841(ery commit will be stored as a single patch in the resulting package.)]TJ -0.8 Tc 1.735 Tw (To h)' 0 Tc 17.9449 0 Td 0.135 Tw (elp git generate a linear patch series, this should ideal be a linear chain of commits, whose de-)Tj -17.9449 -12 Td 0 Tw (scription are helpful for other people.)Tj 1.829 Tw T*[(As this branch is re)14.9829(gularly rebase d, you should not publish it.)]TJ 274.838 0 Td 1.828 Tw (Instead you can recreate this)Tj -274.838 -12 Td 0 Tw (branch using)Tj /R12164640 10 Tf 53.8801 0 Td [(git-dpm check)14.9927(out-patched)]TJ /R11828152 10 Tf 114.29 0 Td (using the information stored in)Tj /R12164640 10 Tf 125.83 0 Td (debian/.git-dpm)Tj /R11828152 10 Tf 68.0699 0 Td (.)Tj -1.1 Tc -362.07 -24 Td (Yo)Tj 2.937 Tc 11.1199 0 Td (ua)Tj 0 Tc 12.377 0 Td 0.437 Tw [(re not allo)25.0171(wed to change the contents of the)]TJ /R12164640 10 Tf 180.593 0 Td (debian/)Tj /R11828152 10 Tf 34.618 0 Td 0.438 Tw (subdirectory in this branch.)Tj 116.182 0 Td (Renaming)Tj -354.89 -12 Td 0 Tw [(Œles or deleting Œles usually causes unnecessary lar)18.0078(ge patches.)]TJ -72 -86.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (19)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -417.84 -36 Td (check)Tj 23.2199 0 Td 32.29 Tw (out-patched: co,)Tj 99.2199 0 Td (c-p)Tj -122.44 -12 Td 6.75 Tw (rebase-patched: r-p)Tj 12 TL 19.51 Tw (apply-patch: a-p)' 26.17 Tw (import-tar: i-t)' (import-ne)' 39.1898 0 Td 16.32 Tw (w-upstream: i-n-u,)Tj 93.25 0 Td (inu)Tj -132.44 -12 Td (record-ne)Tj 38.0602 0 Td 17.45 Tw (w-upstream: r-n-u,)Tj 94.9301 0 Td (rnu)Tj -132.99 -12 Td 0 Tw [(mer)18.0078(ge-patched-in-debian: mer)18.0078(ge-patched)]TJ -2.5 -24 Td (record-ne)Tj 38.0602 0 Td 0.503 Tw (w-upstream is also a)Tj -0.25 Tc 83.2391 0 Td (va)Tj 0 Tc 9.18984 0 Td [(ilable under the old name ne)24.9927(w-upstream, though lik)10.0146(ely will be remo)]TJ -0.15 Tc 276.44 0 Td (ve)Tj 3.002 Tc 9.28984 0 Td (di)Tj 0 Tc 10.782 0 Td (n)Tj -427.001 -12 Td 0 Tw [(future v)14.9927(ersions \(to a)]TJ -0.2 Tc 79.9102 0 Td (vo)Tj 0 Tc 9.8 0 Td (id confusion\).)Tj /R36290528 10.95 Tf -125.71 -28.8 Td (BRANCHES)Tj /R35954040 10 Tf 36 -12 Td (the upstream branch \()Tj /R36290528 10 Tf 86.9199 0 Td [(upstr)18(eam)]TJ /R35954040 10 Tf 40.3699 0 Td (|)Tj /R36290528 10 Tf 2 0 Td [(upstr)18(eam-)]TJ /R35626152 10 Tf 43.7 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\))Tj -173.5 -12 Td 0.378 Tw (This branch contains the upstream sources.)Tj 179.459 0 Td 0.379 Tw (It contents need to be equal enough to the contents in)Tj -179.459 -12 Td 0 Tw (your upstream tarball.)Tj 24 TL 0.137 Tw (Equal enough means that dpkg-source should see no dif)' 224.146 0 Td 0.136 Tw (ference between your patched tree and and)Tj -224.146 -12 Td 0.464 Tw (original tarball unpackaged, the patched applied and)Tj /R36290528 10 Tf 214.869 0 Td 0.465 Tw (debian/rules clean)Tj /R35954040 10 Tf 80.9398 0 Td 2.965 Tw (run. Usually)Tj 55.3699 0 Td 0.465 Tw (it is easiest)Tj -351.179 -12 Td 0.654 Tw (to just store the v)Tj 71.3559 0 Td 0.653 Tw [(erbatim contents of your orig tarball here.)-565.286(Then you can also use it for pristine)]TJ -71.3559 -12 Td [(tar)55(.)]TJ 0 Tw (This branch may contain a debian/ subdirectory)' 2.5 Tc 189.87 0 Td (,w)Tj 0 Tc 12.2199 0 Td (hich will usually be just ignored.)Tj -1.1 Tc -202.09 -24 Td (Yo)Tj 3.165 Tc 11.1199 0 Td (uc)Tj 0 Tc 12.6051 0 Td 0.665 Tw (an either publish that branch or mak)Tj 3.165 Tc 148.31 0 Td [(ei)316.484(to)]TJ 0 Tc 21.3301 0 Td 0.666 Tw (nly implicitly visible via the)Tj /R36290528 10 Tf 118.62 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 71.2359 0 Td (Œle)Tj -383.221 -12 Td 0 Tw (in the Debian branch.)Tj 0.372 Tw T*[(While it usually mak)9.98291(es sense that ne)24.9902(wer upstream branches contain older ones, this is not needed.)]TJ -1.1 Tc 12 TL (Yo)' 3.847 Tc 11.1199 0 Td (us)Tj 0 Tc 12.7371 0 Td 1.347 Tw (hould be able to switch from one created yourself or by some foreign-vcs importing tool)Tj -23.857 -12 Td 0.942 Tw (generated one to an nati)Tj -0.15 Tc 99.048 0 Td 1.242 Tw (ve u)Tj 0 Tc 17.732 0 Td 0.942 Tw [(pstream branch or vice v)14.9878(ersa without problems.)-594.185(Note that since the)]TJ -116.78 -12 Td 1.131 Tw (Debian branch has the patched branch as ancestor and the patched branch the upstream branch,)Tj 0.775 Tw T*[(your upstream branches are part of the history of your Debian branch.)-577.49(Which has the adv)]TJ 369.895 0 Td (antage)Tj -369.895 -12 Td 0.197 Tw (that you can recreate the e)Tj 105.515 0 Td 0.198 Tw (xact state of your branches from your history directly \(lik)Tj 231.362 0 Td (e)Tj /R36290528 10 Tf 7.13789 0 Td (git check)Tj 38.098 0 Td (out)Tj -382.113 -12 Td 3.22 Tw (-b oldstate)Tj /R35626152 10 Tf 53.6602 0 Td [(myoldta)10.0073(gor)10.0146(shaofdebianbr)14.9927(anc)15.0146(hcommit)]TJ 5.72 Tc /R36290528 10 Tf 157.99 0 Td (;g)Tj 0 Tc 14.05 0 Td (it-dpm pr)Tj 44.4301 0 Td (epar)Tj 5.72 Tc 19.2602 0 Td (e;g)Tj 0 Tc 24.2102 0 Td [(it check)15.0098(out unsta-)]TJ -313.6 -12 Td (ble-oldstate)Tj 2.812 Tc /R35954040 10 Tf 49.4398 0 Td (\)b)Tj 0 Tc 10.9422 0 Td 0.312 Tw [(ut the disadv)25.0024(antage that to remo)]TJ -0.15 Tc 129.2 0 Td 0.612 Tw (ve t)Tj 0 Tc 14.882 0 Td 0.312 Tw (hose histories from your repository you ha)Tj -0.15 Tc 171.652 0 Td 0.613 Tw (ve t)Tj 0 Tc 14.8828 0 Td (o)Tj -390.999 -12 Td 0 Tw [(do some manual w)10.0073(ork.)]TJ -36 -28.8 Td (the patched branch \()Tj /R36290528 10 Tf 81.3602 0 Td (patched)Tj /R35954040 10 Tf 33.8898 0 Td (|)Tj /R36290528 10 Tf 2 0 Td (patched-)Tj /R35626152 10 Tf 37.2199 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\))Tj -154.98 -12 Td 0.553 Tw [(This branch contains your patches to the upstream source.)-555.295(\(which of course means it is based on)]TJ 0 Tw (your upstream branch\).)' 24 TL T*[(Ev)14.9841(ery commit will be stored as a single patch in the resulting package.)]TJ -0.8 Tc 1.735 Tw (To h)' 0 Tc 17.9449 0 Td 0.135 Tw (elp git generate a linear patch series, this should ideal be a linear chain of commits, whose de-)Tj -17.9449 -12 Td 0 Tw (scription are helpful for other people.)Tj 1.829 Tw T*[(As this branch is re)14.9829(gularly rebase d, you should not publish it.)]TJ 274.838 0 Td 1.828 Tw (Instead you can recreate this)Tj -274.838 -12 Td 0 Tw (branch using)Tj /R36290528 10 Tf 53.8801 0 Td [(git-dpm check)14.9927(out-patched)]TJ /R35954040 10 Tf 114.29 0 Td (using the information stored in)Tj /R36290528 10 Tf 125.83 0 Td (debian/.git-dpm)Tj /R35954040 10 Tf 68.0699 0 Td (.)Tj -1.1 Tc -362.07 -24 Td (Yo)Tj 2.937 Tc 11.1199 0 Td (ua)Tj 0 Tc 12.377 0 Td 0.437 Tw [(re not allo)25.0171(wed to change the contents of the)]TJ /R36290528 10 Tf 180.593 0 Td (debian/)Tj /R35954040 10 Tf 34.618 0 Td 0.438 Tw (subdirectory in this branch.)Tj 116.182 0 Td (Renaming)Tj -354.89 -12 Td 0 Tw [(Œles or deleting Œles usually causes unnecessary lar)18.0078(ge patches.)]TJ -72 -86.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (19)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -2442 │ │ │ │ │ +2443 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ @@ -1763,29 +1763,29 @@ │ │ │ │ │ │ │ │ │ │ Length │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R11500264 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R11500264 10 Tf 372.36 0 Td (GIT-DPM)Tj /R11828152 10 Tf 42 0 Td (\(1\))Tj -420.34 -36 Td 0 Tw (the Debian branch \()Tj /R12164640 10 Tf 79.1398 0 Td (master)Tj /R11828152 10 Tf 29.4301 0 Td (|)Tj /R11500264 10 Tf 2 0 Td [(whate)15.0146(ver)]TJ /R11828152 10 Tf 36.5098 0 Td (\))Tj -111.08 -12 Td (This is the primary branch.)Tj 24 TL (This branch contains the)' /R12164640 10 Tf 100.54 0 Td (debian/)Tj /R11828152 10 Tf 34.1801 0 Td [(directory and has the patched branch mer)18.0078(ged in.)]TJ -134.72 -24 Td [(Ev)14.9841(ery change not in)]TJ /R12164640 10 Tf 82.6102 0 Td (debian/)Tj /R11828152 10 Tf 31.6801 0 Td (,)Tj /R12164640 10 Tf 5 0 Td (.git)Tj /R11500264 10 Tf 13.6102 0 Td (*)Tj /R11828152 10 Tf 7.5 0 Td (or deleting Œles must be done in the patched branch.)Tj -176.4 -28.8 Td (alternati)Tj -0.15 Tc 32.5199 0 Td 0.3 Tw (ve b)Tj 0 Tc 16.7898 0 Td 0 Tw (ranch names)Tj -1.1 Tc -13.3098 -12 Td (Yo)Tj 3.453 Tc 11.1199 0 Td (uc)Tj 0 Tc 12.893 0 Td 0.952 Tw (an specify alternate branch names for upstream and patched branches of a speciŒc Debian)Tj -24.0129 -12 Td 0.509 Tw (branch, or force a branch to be a Debian branch that w)Tj 223.199 0 Td 0.51 Tw (ould normally be considered e.g. upstream)Tj -223.199 -12 Td 1.414 Tw (branch of another branch by adding)Tj /R12164640 10 Tf 153.443 0 Td [(dpmUpstr)17.9834(eamBranch)]TJ /R11828152 10 Tf 97.0633 0 Td (and)Tj /R12164640 10 Tf 18.3531 0 Td [(dpmP)9.98535(atchedBranch)]TJ /R11828152 10 Tf 89.373 0 Td (conŒgure)Tj -358.232 -12 Td 0 Tw (items for the Debian branch in question \(you need both, only one is treated as error\).)Tj T*[(The follo)25.0159(wing e)15.0146(xample is a no-op for all practical purposes:)]TJ /R12164640 10 Tf 2.5 -12 Td [(git conŒg branch.master)100(.dpmUpstr)17.9834(eamBranch upstr)18.0151(eam)]TJ 12 TL T*[(git conŒg branch.master)100(.dpmP)9.98535(atchedBranch patched)]TJ /R12164640 10.95 Tf -74.5 -28.8 Td (COPYRIGHT)Tj /R11828152 10 Tf 36 -12 Td [(Cop)10.0073(yright © 2009,2010 Bernhard R. Link)]TJ 1.34 Tw T*[(This is free softw)9.99268(are; see the source for cop)]TJ 184.91 0 Td 1.341 Tw [(ying conditions. There is NO w)9.99023(arranty; not e)]TJ -0.15 Tc 188.457 0 Td (ve)Tj 3.841 Tc 9.28984 0 Td (nf)Tj 0 Tc 12.1711 0 Td (or MER-)Tj -394.828 -12 Td 0 Tw [(CHANT)92.9846(ABILITY or FITNESS FOR A P)91.9922(AR)60.0146(TICULAR PURPOSE.)]TJ -36 -434.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (20)Tj ET Q Q │ │ │ │ │ +q 0.1 0 0 0.1 0 0 cm 0 g q 10 0 0 10 0 0 cm BT /R35626152 10 Tf 1 0 0 1 71.9801 793.89 Tm (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td 157.03 Tw (\(1\) GIT-DPM)Tj /R35626152 10 Tf 372.36 0 Td (GIT-DPM)Tj /R35954040 10 Tf 42 0 Td (\(1\))Tj -420.34 -36 Td 0 Tw (the Debian branch \()Tj /R36290528 10 Tf 79.1398 0 Td (master)Tj /R35954040 10 Tf 29.4301 0 Td (|)Tj /R35626152 10 Tf 2 0 Td [(whate)15.0146(ver)]TJ /R35954040 10 Tf 36.5098 0 Td (\))Tj -111.08 -12 Td (This is the primary branch.)Tj 24 TL (This branch contains the)' /R36290528 10 Tf 100.54 0 Td (debian/)Tj /R35954040 10 Tf 34.1801 0 Td [(directory and has the patched branch mer)18.0078(ged in.)]TJ -134.72 -24 Td [(Ev)14.9841(ery change not in)]TJ /R36290528 10 Tf 82.6102 0 Td (debian/)Tj /R35954040 10 Tf 31.6801 0 Td (,)Tj /R36290528 10 Tf 5 0 Td (.git)Tj /R35626152 10 Tf 13.6102 0 Td (*)Tj /R35954040 10 Tf 7.5 0 Td (or deleting Œles must be done in the patched branch.)Tj -176.4 -28.8 Td (alternati)Tj -0.15 Tc 32.5199 0 Td 0.3 Tw (ve b)Tj 0 Tc 16.7898 0 Td 0 Tw (ranch names)Tj -1.1 Tc -13.3098 -12 Td (Yo)Tj 3.453 Tc 11.1199 0 Td (uc)Tj 0 Tc 12.893 0 Td 0.952 Tw (an specify alternate branch names for upstream and patched branches of a speciŒc Debian)Tj -24.0129 -12 Td 0.509 Tw (branch, or force a branch to be a Debian branch that w)Tj 223.199 0 Td 0.51 Tw (ould normally be considered e.g. upstream)Tj -223.199 -12 Td 1.414 Tw (branch of another branch by adding)Tj /R36290528 10 Tf 153.443 0 Td [(dpmUpstr)17.9834(eamBranch)]TJ /R35954040 10 Tf 97.0633 0 Td (and)Tj /R36290528 10 Tf 18.3531 0 Td [(dpmP)9.98535(atchedBranch)]TJ /R35954040 10 Tf 89.373 0 Td (conŒgure)Tj -358.232 -12 Td 0 Tw (items for the Debian branch in question \(you need both, only one is treated as error\).)Tj T*[(The follo)25.0159(wing e)15.0146(xample is a no-op for all practical purposes:)]TJ /R36290528 10 Tf 2.5 -12 Td [(git conŒg branch.master)100(.dpmUpstr)17.9834(eamBranch upstr)18.0151(eam)]TJ 12 TL T*[(git conŒg branch.master)100(.dpmP)9.98535(atchedBranch patched)]TJ /R36290528 10.95 Tf -74.5 -28.8 Td (COPYRIGHT)Tj /R35954040 10 Tf 36 -12 Td [(Cop)10.0073(yright © 2009,2010 Bernhard R. Link)]TJ 1.34 Tw T*[(This is free softw)9.99268(are; see the source for cop)]TJ 184.91 0 Td 1.341 Tw [(ying conditions. There is NO w)9.99023(arranty; not e)]TJ -0.15 Tc 188.457 0 Td (ve)Tj 3.841 Tc 9.28984 0 Td (nf)Tj 0 Tc 12.1711 0 Td (or MER-)Tj -394.828 -12 Td 0 Tw [(CHANT)92.9846(ABILITY or FITNESS FOR A P)91.9922(AR)60.0146(TICULAR PURPOSE.)]TJ -36 -434.4 Td 176.5 Tw (git-dpm 2012-05-15)Tj 458 0 Td (20)Tj ET Q Q │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -1180 │ │ │ │ │ +1181 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -R12164640 │ │ │ │ │ +R36290528 │ │ │ │ │ │ │ │ │ │ -R11828152 │ │ │ │ │ +R35954040 │ │ │ │ │ │ │ │ │ │ -R11500264 │ │ │ │ │ +R35626152 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ @@ -1837,18 +1837,18 @@ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ Length │ │ │ │ │ -572 │ │ │ │ │ +571 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CMapType 2 def /CMapName/R10906120 def 1 begincodespacerange <00><ff> endcodespacerange 65 beginbfrange <20><20><0020> <22><22><0022> <25><25><0025> <26><26><0026> <29><29><0029> <2a><2a><002a> <2d><2d><002d> <2e><2e><002e> <2f><2f><002f> <30><30><0030> <31><31><0031> <3a><3a><003a> <3b><3b><003b> <3c><3c><003c> <3d><3d><003d> <3e><3e><003e> <41><41><0041> <42><42><0042> <43><43><0043> <44><44><0044> <45><45><0045> <46><46><0046> <47><47><0047> <48><48><0048> <49><49><0049> <4c><4c><004c> <4d><4d><004d> <4e><4e><004e> <4f><4f><004f> <50><50><0050> <52><52><0052> <53><53><0053> <54><54><0054> <55><55><0055> <56><56><0056> <57><57><0057> <58><58><0058> <59><59><0059> <5f><5f><005f> <61><61><0061> <62><62><0062> <63><63><0063> <64><64><0064> <65><65><0065> <66><66><0066> <67><67><0067> <68><68><0068> <69><69><0069> <6b><6b><006b> <6c><6c><006c> <6d><6d><006d> <6e><6e><006e> <6f><6f><006f> <70><70><0070> <71><71><0071> <72><72><0072> <73><73><0073> <74><74><0074> <75><75><0075> <76><76><0076> <77><77><0077> <78><78><0078> <79><79><0079> <7a><7a><007a> <8c><8c><fb01> endbfrange endcmap CMapName currentdict /CMap defineresource pop end end │ │ │ │ │ +/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CMapType 2 def /CMapName/R35032008 def 1 begincodespacerange <00><ff> endcodespacerange 65 beginbfrange <20><20><0020> <22><22><0022> <25><25><0025> <26><26><0026> <29><29><0029> <2a><2a><002a> <2d><2d><002d> <2e><2e><002e> <2f><2f><002f> <30><30><0030> <31><31><0031> <3a><3a><003a> <3b><3b><003b> <3c><3c><003c> <3d><3d><003d> <3e><3e><003e> <41><41><0041> <42><42><0042> <43><43><0043> <44><44><0044> <45><45><0045> <46><46><0046> <47><47><0047> <48><48><0048> <49><49><0049> <4c><4c><004c> <4d><4d><004d> <4e><4e><004e> <4f><4f><004f> <50><50><0050> <52><52><0052> <53><53><0053> <54><54><0054> <55><55><0055> <56><56><0056> <57><57><0057> <58><58><0058> <59><59><0059> <5f><5f><005f> <61><61><0061> <62><62><0062> <63><63><0063> <64><64><0064> <65><65><0065> <66><66><0066> <67><67><0067> <68><68><0068> <69><69><0069> <6b><6b><006b> <6c><6c><006c> <6d><6d><006d> <6e><6e><006e> <6f><6f><006f> <70><70><0070> <71><71><0071> <72><72><0072> <73><73><0073> <74><74><0074> <75><75><0075> <76><76><0076> <77><77><0077> <78><78><0078> <79><79><0079> <7a><7a><007a> <8c><8c><fb01> endbfrange endcmap CMapName currentdict /CMap defineresource pop end end │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ Encoding │ │ │ │ │ @@ -1865,18 +1865,18 @@ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ Length │ │ │ │ │ -639 │ │ │ │ │ +638 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CMapType 2 def /CMapName/R10906488 def 1 begincodespacerange <00><ff> endcodespacerange 77 beginbfrange <20><20><0020> <22><22><0022> <27><27><2019> <28><28><0028> <29><29><0029> <2c><2c><002c> <2d><2d><002d> <2e><2e><002e> <2f><2f><002f> <30><30><0030> <31><31><0031> <32><32><0032> <33><33><0033> <34><34><0034> <35><35><0035> <36><36><0036> <37><37><0037> <38><38><0038> <39><39><0039> <3a><3a><003a> <3b><3b><003b> <3c><3c><003c> <3e><3e><003e> <41><41><0041> <42><42><0042> <43><43><0043> <44><44><0044> <45><45><0045> <46><46><0046> <47><47><0047> <48><48><0048> <49><49><0049> <4c><4c><004c> <4d><4d><004d> <4e><4e><004e> <4f><4f><004f> <50><50><0050> <52><52><0052> <53><53><0053> <54><54><0054> <55><55><0055> <57><57><0057> <59><59><0059> <5b><5b><005b> <5d><5d><005d> <5f><5f><005f> <61><61><0061> <62><62><0062> <63><63><0063> <64><64><0064> <65><65><0065> <66><66><0066> <67><67><0067> <68><68><0068> <69><69><0069> <6a><6a><006a> <6b><6b><006b> <6c><6c><006c> <6d><6d><006d> <6e><6e><006e> <6f><6f><006f> <70><70><0070> <71><71><0071> <72><72><0072> <73><73><0073> <74><74><0074> <75><75><0075> <76><76><0076> <77><77><0077> <78><78><0078> <79><79><0079> <7a><7a><007a> <7c><7c><007c> <7e><7e><02dc> <8c><8c><fb01> <8d><8d><fb02> <a9><a9><00a9> endbfrange endcmap CMapName currentdict /CMap defineresource pop end end │ │ │ │ │ +/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CMapType 2 def /CMapName/R35032376 def 1 begincodespacerange <00><ff> endcodespacerange 77 beginbfrange <20><20><0020> <22><22><0022> <27><27><2019> <28><28><0028> <29><29><0029> <2c><2c><002c> <2d><2d><002d> <2e><2e><002e> <2f><2f><002f> <30><30><0030> <31><31><0031> <32><32><0032> <33><33><0033> <34><34><0034> <35><35><0035> <36><36><0036> <37><37><0037> <38><38><0038> <39><39><0039> <3a><3a><003a> <3b><3b><003b> <3c><3c><003c> <3e><3e><003e> <41><41><0041> <42><42><0042> <43><43><0043> <44><44><0044> <45><45><0045> <46><46><0046> <47><47><0047> <48><48><0048> <49><49><0049> <4c><4c><004c> <4d><4d><004d> <4e><4e><004e> <4f><4f><004f> <50><50><0050> <52><52><0052> <53><53><0053> <54><54><0054> <55><55><0055> <57><57><0057> <59><59><0059> <5b><5b><005b> <5d><5d><005d> <5f><5f><005f> <61><61><0061> <62><62><0062> <63><63><0063> <64><64><0064> <65><65><0065> <66><66><0066> <67><67><0067> <68><68><0068> <69><69><0069> <6a><6a><006a> <6b><6b><006b> <6c><6c><006c> <6d><6d><006d> <6e><6e><006e> <6f><6f><006f> <70><70><0070> <71><71><0071> <72><72><0072> <73><73><0073> <74><74><0074> <75><75><0075> <76><76><0076> <77><77><0077> <78><78><0078> <79><79><0079> <7a><7a><007a> <7c><7c><007c> <7e><7e><02dc> <8c><8c><fb01> <8d><8d><fb02> <a9><a9><00a9> endbfrange endcmap CMapName currentdict /CMap defineresource pop end end │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ Encoding │ │ │ │ │ @@ -1901,15 +1901,15 @@ │ │ │ │ │ │ │ │ │ │ Filter │ │ │ │ │ FlateDecode │ │ │ │ │ Length │ │ │ │ │ 472 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CMapType 2 def /CMapName/R10906856 def 1 begincodespacerange <00><ff> endcodespacerange 50 beginbfrange <20><20><0020> <28><28><0028> <29><29><0029> <2a><2a><002a> <2d><2d><002d> <2e><2e><002e> <30><30><0030> <3a><3a><003a> <3c><3c><003c> <3e><3e><003e> <41><41><0041> <42><42><0042> <43><43><0043> <44><44><0044> <45><45><0045> <47><47><0047> <48><48><0048> <49><49><0049> <4c><4c><004c> <4d><4d><004d> <4e><4e><004e> <50><50><0050> <52><52><0052> <54><54><0054> <55><55><0055> <61><61><0061> <62><62><0062> <63><63><0063> <64><64><0064> <65><65><0065> <66><66><0066> <67><67><0067> <68><68><0068> <69><69><0069> <6b><6b><006b> <6c><6c><006c> <6d><6d><006d> <6e><6e><006e> <6f><6f><006f> <70><70><0070> <72><72><0072> <73><73><0073> <74><74><0074> <75><75><0075> <76><76><0076> <77><77><0077> <78><78><0078> <79><79><0079> <7a><7a><007a> <8c><8c><fb01> endbfrange endcmap CMapName currentdict /CMap defineresource pop end end │ │ │ │ │ +/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CMapType 2 def /CMapName/R35032744 def 1 begincodespacerange <00><ff> endcodespacerange 50 beginbfrange <20><20><0020> <28><28><0028> <29><29><0029> <2a><2a><002a> <2d><2d><002d> <2e><2e><002e> <30><30><0030> <3a><3a><003a> <3c><3c><003c> <3e><3e><003e> <41><41><0041> <42><42><0042> <43><43><0043> <44><44><0044> <45><45><0045> <47><47><0047> <48><48><0048> <49><49><0049> <4c><4c><004c> <4d><4d><004d> <4e><4e><004e> <50><50><0050> <52><52><0052> <54><54><0054> <55><55><0055> <61><61><0061> <62><62><0062> <63><63><0063> <64><64><0064> <65><65><0065> <66><66><0066> <67><67><0067> <68><68><0068> <69><69><0069> <6b><6b><006b> <6c><6c><006c> <6d><6d><006d> <6e><6e><006e> <6f><6f><006f> <70><70><0070> <72><72><0072> <73><73><0073> <74><74><0074> <75><75><0075> <76><76><0076> <77><77><0077> <78><78><0078> <79><79><0079> <7a><7a><007a> <8c><8c><fb01> endbfrange endcmap CMapName currentdict /CMap defineresource pop end end │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Type │ │ │ │ │ Encoding │ │ │ │ │ @@ -1931,15 +1931,15 @@ │ │ │ │ │ Metadata │ │ │ │ │ Subtype │ │ │ │ │ XML │ │ │ │ │ Length │ │ │ │ │ 1175 │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?> <?adobe-xap-filters esc="CRLF"?> <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'> <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> <rdf:Description rdf:about="" xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 10.04.0'/> <rdf:Description rdf:about="" xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2021-01-03T12:42:28Z</xmp:ModifyDate> <xmp:CreateDate>2021-01-03T12:42:28Z</xmp:CreateDate> <xmp:CreatorTool>groff version 1.23.0</xmp:CreatorTool></rdf:Description> <rdf:Description rdf:about="" xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:b0047009-85dd-11f6-0000-2f938d1a7aad'/> <rdf:Description rdf:about="" xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> │ │ │ │ │ +<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?> <?adobe-xap-filters esc="CRLF"?> <x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'> <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'> <rdf:Description rdf:about="" xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 10.04.0'/> <rdf:Description rdf:about="" xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2021-01-03T12:42:28Z</xmp:ModifyDate> <xmp:CreateDate>2021-01-03T12:42:28Z</xmp:CreateDate> <xmp:CreatorTool>groff version 1.23.0</xmp:CreatorTool></rdf:Description> <rdf:Description rdf:about="" xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:b0047009-85dd-11f6-0000-4eab148719d2'/> <rdf:Description rdf:about="" xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description> </rdf:RDF> </x:xmpmeta> <?xpacket end='w'?> │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ Size │ │ │ │ │ 102