Scott Howard <[email protected]> writes: > On Wed, Nov 3, 2010 at 3:00 AM, Charles Plessy <[email protected]> wrote: >> Le Tue, Nov 02, 2010 at 01:02:25PM +0100, Daniel Lombraña González a écrit : >>> >>> After that, I kept reading about git-buildpackage and it seems that it >>> should be more easy to maintain those differences between the upstream >>> version and the deb one using patches. However, I don't know how I >>> have to do this, as I have been trying it out, and as far as I have >>> get is to create the debian/patches folder (using gbp-pq) with a patch >>> that removes that instruction. However, when building the package >>> using git-buildpackage in the master branch (not in >>> patch-queue/master) the resulting package does not have applied the >>> patch, which is wrong. Is it possible to apply automatically those >>> patches when building the package? (FYI I have tried the 3.0 version, >>> and I don't get it working either, probably because I'm doing >>> something wrong). >> > > Paul is right, it's best to get upstream to make a change so you don't > need patches, but in case they don't the easiest way is to use source > 3.0 (quilt) format [1]. That should automatically apply and keep track > of packages for you with no need to change rules files or add depends. > > I don't know what problem you're having, but the following command: > mkdir debian/source ; echo '3.0 (quilt)' > debian/source/format > > would create a file named "format" in debian/source in your package. > The content of the file should be '3.0 (quilt)'. Now you should just > use quilt normally. > > For example > quilt new my_new_patch.patch > quilt add src/file_i_want_to_change.c > [edit the file] > quilt refresh
That won't work, at least not the verry first time. The verry first time you need to use 'QUILT_PATCHES=debian/patches quilt ...'. When you unpack a source with dpkg-source it does this for you. An alternative way to create a new patch and from my point of view easier is to - just edit files - debuild / dpkg-buildpackage till you are happy + creates debian/patches/debian-changes-version - quilt rename [-P debian-changes-version] my-cool-new-feature.patch - $EDITOR debian/patches/my-cool-new-feature.patch + add patch description to the premade header > you now should have your patch in debian/patches along with a file > named "series" in debian/patches that contains the name of your patch. > > You can find better how tos on the internet, but that should be it. > > [1] http://wiki.debian.org/Projects/DebSrc3.0 And if you want to have patches unapplied add "unapply-patches" to debian/source/local-options. MfG Goswin -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
