File: HOWTO.sgml

package info (click to toggle)
svn-buildpackage 0.6.16etch1
  • links: PTS
  • area: main
  • in suites: etch, etch-m68k
  • size: 260 kB
  • ctags: 42
  • sloc: perl: 1,399; makefile: 76; sh: 26
file content (936 lines) | stat: -rw-r--r-- 34,696 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
<!doctype debiandoc system>
<!-- similar to linuxdoc -->

<book>
<title>svn-buildpackage - maintaining Debian packages with Subversion</title>
<author>Eduard Bloch</author>
<version>
$LastChangedDate: 2005-09-23 16:17:33 +0200 (Fr, 23 Sep 2005) $
<!-- date-->
</version>

<copyright>
svn-buildpackage, all associated scripts and programs, this manual,
and all build scripts are Copyright &copy; 2003 Eduard Bloch.
<p>
See <ref id="copyright"> for details.
</copyright>

<toc sect>

<chapt id="intro">Introduction

<sect id="pur">Purpose
<p>
This short document is only intended to give a short help in
converting packages to Subversion management. It is primarily intended
for developers not really familiar with Subversion or CVS management
and/or converting from maintaining their packages using common tools
(dpkg-dev, devscripts) only to version control system Subversion.
</sect>

<sect id="why">Why a version control system?
<p>
But the first question may be: why use a version control system at all?
Look at how the source is handled by the Debian package. First, we have
the pure upstream source, which is often maintained by another person.
The upstream author has his own development line and releases the source
in snapshots (often called releases or program versions).
<p>
The Debian maintainer adds an own set of modifications, leading to an
own version of the upstream package. The difference set between this two
version finally ends in Debian's .diff.gz files, and this patchset is
often appliable to future upstream versions in order to get the "Debian
versions".
<p>
So the obvious way to deal with source upgrades/changes is using local
copies, patch, different patchutils and scripts to automate all this,
eg. uupdate. However, it often becomes nasty and uncomfortable, and
there is no way to undo changes that you may do by mistakes.
<p>
At this point, the Subversion system can be used to simplify that work.
It does the same things that you normaly would do by-hand but keeps it
in an own archive (a repository). It stores the development lines of
Upstream and Debian source, keeping them in different directories
(different branches). The branches are wired internally (the VCS "knows"
the history of the file and tracks the differences between the Upstream
and Debian versions). When a new upstream version is installed, the
differences between the old and new upstream versions and the Debian
version are merged together.
<p>
You can create snapshots of your Debian version ("tag" it) and switch
back to a previous state, or see the changes done in the files. You can
store when commiting the file to the repository or place custom tags on
the files ("properties") serving various purposes.
</sect>

<sect id="feat">Features
<p>
  svn-buildpackage and other scripts around it has been created to do
  follow things:
<p>
<list>
  <item>
    keep Debian package under revision control, which means storing
    different versions of files in a Subversion repository
  <item>
   allow easy walking back trough time using svn command
  <item>
   easy retrieval of past versions
  <item>
   keep track of upstream source versions and modified Debian versions
  <item>
   easy installation of new upstream versions, merging the Debian
   changes into it when needed (similar to the uupdate program)
  <item>
   automated package building in clean environment, notifying about
   uncommited changes
  <item>create version tags when requested to do the final build and
   update changelog when needed
  <item>allow co-work of multiple Debian developers on the same project
  <item>auto-configure the repository layout, making it easy to use by
  people without knowing much about Subversion usage (mostly you need only the
  add, rm and mv commands of svn)
  <item>allow to store only the Debian specific changes in the
  repository and merge them into the upstream source in the build area
  (which nicely completes build systems like dpatch or dbs)
  <item>If wished, keep the upstream tarballs inside of the repository
</list>
</sect>

<sect id="over">Contents overview
<p>
There are currently three scripts provided by the svn-buildpackage
package: 
<list>
<item>
svn-inject: script used to insert an existing Debian package into a
Subversion repository, creating the repository layout as needed.
<item>svn-buildpackage: exports the contents of the directory associated
with the starting directory from the Subversion repository to the clean
environment and build the package there
<item>svn-upgrade: similar to uupdate, upgrades the trunk to a new
upstream version, preserving and merging Debian specific changes
</list>
</sect>
<sect>Popular repository layouts
<p>
There are different ways to store the packages in the repositories (or
in multiple repositories at your choice). <tt>svn-buildpackage</tt>
normaly expects a directory structure similar to the one well described in the
Subversion Book, which looks like:
<example>
packageA/
   trunk/
   branches/
   branches/upstream
   tags/

projectB/
   trunk/
   branches/
   branches/developerFoo
   tags/
</example>
packageA above may be a typical upstream-based source package and a
projectB may be a Debian native package with a separate branch created
by developerFoo for his own experiments. See <url name="Subversion
Book/Branches"
id="http://svnbook.red-bean.com/html-chunk/ch04s02.html"> for more
details about using Subversion branches.
<p>
Also note that Tags work quite different than those in CVS. Subversion
does not maintain magic tags associated with some files. Instead, it
tracks the file state and moves, so Tagging something means creating a
copy (inside of the Repository, harddisk-space efficient) of a certain
version of the file set. So the Debian branch of the released package
source is contained in <tt>trunk/</tt> and is tagged by copying
(mirroring) the trunk tree to <tt>tags/DEBIAN-REVISION</tt>. The same
happens for the upstream releases. In addition, the most recent upstream
version is mirrored to <tt>branches/upstream/current</tt>. After few
package upgrade cycles, the directory tree may look so:
<example>
# svn ls -R file:///home/user/svn-repo/dev/translucency 
branches/
branches/upstream/
branches/upstream/0.5.9/
branches/upstream/0.5.9/AUTHORS
branches/upstream/0.5.9/COPYING
...
branches/upstream/0.6.0/
branches/upstream/0.6.0/AUTHORS
branches/upstream/0.6.0/COPYING
...
branches/upstream/current/
branches/upstream/current/AUTHORS
branches/upstream/current/COPYING
... same stuff as in 0.6.0 ...
tags/
tags/0.5.9-1/
...
tags/0.5.9-1/debian/
tags/0.5.9-1/debian/README.Debian
...
tags/0.6.0-1/
tags/0.6.0-1/AUTHORS
...
tags/0.6.0-1/debian/
tags/0.6.0-1/debian/README.Debian
tags/0.6.0-1/debian/changelog
...
trunk/
trunk/AUTHORS
trunk/COPYING
... trunk where 0.6.0-2 is beeing prepared ...
</example>
<p>
svn-buildpackage also supports the second repository layout suggested in
the Subversion Book (function/package) but svn-inject prefers the one
documented above. Both svn-buildpackage and svn-upgrade should be able to
auto-detect the repository layout and the location of package files.
<p>
In theory, you do not have to follow that examples and place the trunk,
branches and tags directory on the locations you like more.
But svn-buildpackage and other scripts won't locate the files
automaticaly so you will need to edit the .svn/deb-layout file in your
working directory and set paths. See the old <url name="abstract"
id="file:///usr/share/doc/svn-buildpackage/CONFIG"> about how
auto-detection works and the <url name="config example"
id="file:///usr/share/doc/svn-buildpackage/examples/config.example">.
<p>
Finaly, the working directory structure on your development system may
look so:
<example>
dev/ # base directory, may be under version control or not
dev/foo # trunk directories of various packages
dev/bar # contents correspond to trunk, see above
dev/tarballs # where "orig" tarballs are stored, may be under VC or not
dev/build-area # where the packages are exported temporarily and built
</example>
</sect>
</chapt>
	
<chapt id="start">Getting started
<p>
Besides of the packages that are installed by dependencies when you
install <tt>svn-buildpackage</tt>, you may need <tt>ssh</tt> and the
obligatory tool chain: <tt>dpkg-dev</tt>, <tt>build-essential</tt> and
all the packages they pull into the system.

<sect id="quick">Quick guide
<p>
Here is a quick guide for those who wish to build an existing package
using an existing, public available SVN repository. To create own
repositories, skip this section and look for more details below.
<list>
<item>
svn co &lt;svn://server/path/to/trunk&gt; package
<item>
mkdir tarballs
<item>
cp dir-where-you-keep-the-source/package_version.orig.tar.gz tarballs/
<p>
NOTE: you need the upstream source tarballs, stored under a usual dpkg-source-compatible filename in tarballs/
<item>
cd package
<item>
svn-buildpackage -us -uc -rfakeroot
</list>
</sect>
<sect id="basics">Basic svn usage
<p>
You need only few commands to start using svn with svn-buildpackage
scripts. If you wish to learn more about it, read parts of the the 
<url name="Subversion Book"
id="http://svnbook.red-bean.com/html-chunk/">. The most used commands
are:
<list>
<item>
<tt>add</tt> -- put new files unto the revision contol
<item>
<tt>rm</tt> -- remove the files from the repository
<item>
<tt>mv</tt> -- move files around, leting revision control system know about it
<item>
<tt>commit</tt> -- commit your changes to the repository
<item>
<tt>resolved</tt> -- tell svn that you have resolved a conflict
<item>
<tt>diff</tt> -- creates a "diff -u" between two versions, specified by
file revision number or by date. See the <tt>diff --help</tt> output.
<item>
<tt>cat -r Revision</tt> -- useful to browse in some previous revision
of the file
</list>
If you are familiar with CVS you will probably know almost all you need.
</sect>

<sect id="svncreate">Creating Subversion repository
<p>
The main Subversion repository is easily created with:
<example>
svnadmin create repo-directory
</example>
For our example, we choose the name <tt>svn-deb-repo</tt> and put it in
<tt>/home/user</>. 
<p>
If you plan to keep many packages in the one
repository including upstream tarballs, consider to put it on a hard
disk with much free space and good performance (especially short disk
access times) since the repository will grow and the filesystem may
become fragmented over time.
</sect>


<sect id="multidev">Using by multiple developers
<p>
Multiple developers with local access to the repository may share it
using a common group. To do so, create a new group and add all
developers to it. Run "chgrp -R sharedGroup repdir ; chmod -R g+s
repdir" for the shared group and the repository directory. Now,
on local access to this repository everybody will create files with the
appropriate group setting. However, the developers will need to set a
liberal umask before using svn (like "0022").
<p>
If somebody resists to do
so, there is still a brute-force solution: fix the permissions with a
post-commit script. However, this is an "unsound" solution and may lead
to ALL KINDS OF PROBLEMS. MAKE SURE THAT YOU ARE AWARE OF THE POSSIBLE
CONSEQUENCES BEFORE YOU OPEN THE PANDORA BOX. See <url
id="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=240630"
name="Debian BTS"> for details. When you damage your repository, don't
blame me and remember that there is "svnadmin recover".
<p>
<example>
#!/bin/sh

# POST-COMMIT HOOK
# The following corrects the permissions of the repository files

REPOS="$1"
REV="$2"

chgrp -R sharedGroup $REPOS
# replace sharedGroup with your group
chmod -R g+r $REPOS
chmod -R g+w $REPOS
</example>

<sect1 id="svn-d-o">SVN over SSH
<p>
To run Subversion over SSH, you basically need a shell on the target
system and a subversion repository located there which is created
following the description above. The repository must be configured for
access by the system users of the remote system.
<p>
Assuming that your user name on the client system is the same as on the
server side, there is not much to configure. Just change the protocol
specificaton from <tt>file://</tt> to
<tt>svn+ssh://remoteusername@server-hostname</tt> in all examples showed
in this manual.
<p>
Note that during svn-buildpackage tools actions a lot of SSH calls can be made
and so the user is asked for his login data. The regular method to deal with
that is using an SSH key authentication method together with ssh-agent and
ssh-add to cache the passphrase in memory. Another approach, which also brings
a significant speed boost, is using a cached SSH connection. This can be done
with a new feature of OpenSSH (see <url name="GCC SSH connection caching howto" id="http://gcc.gnu.org/wiki/SSH%20connection%20caching">) or a third-party tool like <tt>fsh</tt>.
<p>
If you wish to use fsh over ssh you could specify a custom transport method in
subversions's configuration. To do so, edit the file
<tt>~/.subversion/config</tt> and add the section <tt>[tunnels]</tt> to it,
following by your custom transport definition.
Example:
<p>
<example>
# personal subversion config with custom ssh tunnel command
[tunnels]
# SSH account on svn.d.o
# compression is enabled in the ssh config
deb = fsh -l blade
# SSH account for NQ intranet, set fix username
nq = ssh -C -l zomb
</example>
You can use the new defined tunnels in a similar ways as described above
but replace <tt>svn+ssh</tt> with <tt>svn+tunnelname</tt>, so the final
URL looks like:
<example>svn+deb://svn.debian.org/svn/myproject/ourpackage/trunk</example>.
</sect1>
<sect1 id="anon">Anonymous access
<p>
You can allow outsiders to have anonymous (read-only) access using the
svnserve program, as described in the Subversion documentation.
<p>
Another method is using HTTP/WebDAV with Apache2. More about a such
setup can be found in the Subversion Book and the <url name="SubversionApache2SSL Howto" id="http://wiki.debian.net/?SubversionApache2SSLHowto">. <url
id="http://svn.debian.org/" name="svn.debian.org"> is an example site
granting anonymous access to some selected projects hosted there.
</sect1>
</sect>
</chapt>

<chapt id="import">Importing Debian packages
<p>
<sect>Importing from existing source package files
<p>
The <tt>svn-inject</tt> utility is intended to import already packaged source
packages into a new subdirectory of the repository, creating the
repository layout as needed. Normally, it takes two arguments: the
.dsc file of your package and the base URL of the Subversion
repository.

<example>
svn-inject translucency_*dsc file:///tmp/z
cp /tmp/translucency_0.6.0.orig.tar.gz /tmp/tarballs || true
mkdir -p translucency/branches/upstream
tar  -z -x -f /tmp/translucency_0.6.0.orig.tar.gz
mv * current
svn -q import -m"Installing original source version" translucency file:///tmp/z/translucency
svn -m Tagging upstream source version copy file:///tmp/z/translucency/branches/
upstream/current file:///tmp/z/translucency/branches/upstream/0.6.0 -q
svn -m Forking to Trunk copy file:///tmp/z/translucency/branches/upstream/current file:///tmp/z/translucency/trunk -q
dpkg-source -x /tmp/translucency_0.6.0-1.dsc
dpkg-source: extracting translucency in translucency-0.6.0
svn_load_dirs file:///tmp/z/translucency/trunk . *
...
Running /usr/bin/svn propset svn:executable  initscript
Running /usr/bin/svn propset svn:executable  debian/rules
Running /usr/bin/svn propset svn:executable  mounttest.sh
Running /usr/bin/svn propset svn:executable  mount.translucency
Running /usr/bin/svn propget svn:eol-style base.h
Running /usr/bin/svn propget svn:eol-style Makefile
Running /usr/bin/svn propget svn:eol-style translucency.8
Running /usr/bin/svn commit -m Load translucency-0.6.0 into translucency/trunk.

Running /usr/bin/svn update
Cleaning up /tmp/svn_load_dirs_jD7OenzVjI
Storing trunk copy in /tmp/translucency.
svn co file:///tmp/z/translucency/trunk /tmp/translucency -q
svn propset svn:executable 1 debian/rules -q
svn -m"Fixing debian/rules permissions" commit debian -q
Done! Removing tempdir.
Your working directory is /tmp/translucency - have fun!
</example>
<p>
If you omit the URL, <tt>svn-inject</tt> will try to use the URL of the
current directory as base URL. I would not rely on this, however.
</sect>

<sect>On-Build-Time merging
<p>
A special feature of svn-buildpackage is so called
mergeWithUpstream-mode. Many projects do not want to keep the whole upstream source under
revision control, eg. because of the large amount of required disc space
and process time. Sometimes it makes sense to keep only the
<tt>debian/</tt> directory any maybe few other files under revision
control.
<p>
The task of exporting the source from repository and adding
it to the upstream source before building becomes annoying the time. But
the <tt>svn-buildpackage</tt> tools automate most of this work for you:
they switch to so called mergeWithUpstream-mode if a special flag has
been detected: the mergeWithUpstream (Subversion) property of the
<tt>debian</tt> directory. <tt>svn-buildpackage</tt> will merge the trunk with
upstream source on build time and <tt>svn-upgrade</tt> will only update
the changed files in this case.
<p>
To enable this feature during the inital import of the source package,
simply add the <tt>-o</tt> switch to the <tt>svn-inject</tt> call and it
will prepare the source for with mergeWithUpstream-mode: reduce
the set of files to those modified for Debian and set the
mergeWithUpstream property.
<p>
But what, if you decide to switch to mergeWithUpstream-mode after the
package has been injected? To do this, checkout the whole repository,
remove the files not changed in the Debian package from both upstream
source and Debian branch (<tt>svn rm</tt>) and set the mergeWithUpstream property on <tt>debian</tt> in the
<tt>trunk</tt> directory with <tt>svn propset mergeWithUpstream 1 debian</tt>.
<p>
If you actually decide to stop using the mergeWithUpstream-mode, unset the
mergeWithUpstream property as follows: <tt>svn propdel mergeWithUpstream debian/</tt>.
<p>
If you don't want to store the upstream sources of all your packages in the
repository, you can pass the <tt>--no-branches</tt> switch to
<tt>svn-inject</tt>, which will prevent <tt>svn-inject</tt> from creating a
<tt>branches</tt> subdirectory.
</sect>

<!--sect>Importing directories
<p>
Importing directories is a special case and I do not recommend using
this feature. The implementation may be buggy and wreak random havoc.
You have been warned!
<p>
You can specify source directories as input for svn-inject and
svn-upgrade. This may be useful for two things:

<list>
   <item>
   Inserting pristine upstream source into the repository before running
   dh_make. You may wish to do so if you want to use Subversion from the
   beginning. If the version string cannot be extracted from the directory
   name, you will have to specify it manually with the
   <strong>-V</strong> option.
   <item>tracking a local version of a Debian package with custom
   changes if you are not the maintainer. So you can inject and upgrade
   from the debianized package source (extracted with "dpkg-source -x")
   but keep your personal changes in the <tt>trunk</tt>.
</list>
</sect-->
</chapt>

<chapt id="tasks">Common tasks
<p>
<sect id="checkout">Checkout
<p>
svn-inject will do the initial checkout for you. If you need another
working copy, run
<example>
svn co protocol://repository-base-url/yourpackage
</example>
</sect>
<sect id="build">Building the package
<p>
Change to your trunk directory and run:
<example>
svn-buildpackage -us -uc -rfakeroot
</example>
You may recognice the options above -- they are passed directly to the
build command (<tt>dpkg-buildpackage</tt> by default). Normaly, the
build is done in another directory (exporting the source with cp-la-like
method). If you wish the resulting packages to be placed in the
directory above, use the <tt>--svn-move</tt> option. To run Lintian
after the build, use <tt>--svn-lintian</tt> option. More options are
described in the manpage (<ref id="sbman">).
</sect>
<sect id="handlesoure">Working with source
<p>
Every time when you add or modify something, <tt>svn-buildpackage</tt>
won't let you proceed unless suspicious files are in the clean state
(unless you use the <tt>--svn-ignore</tt> switch).  You use the commands
described in <ref id="basics"> to register the new files (or move or
delete the old ones) and commit the changes to the repository.
</sect>
<sect>Handling new upstream versions
<p>
Upgrading with new upstream version normaly happens in two steps:
<list>
<item>
the <tt>current</tt> tree in the upstream branch is upgraded with the
source from the new upstream package (the old version is kept in
repository in <tt>branches/upstream/oldVersion</tt>).
<item>
The version in <tt>trunk/</tt> becomes upgraded by merging the changes
between the upstream versions into the <tt>trunk/</tt> directory.
</list>
The script <tt>svn-upgrade</tt> (formerly <tt>svn-uupdate</tt>) does
both things for you and also creates a new changelog entry. The first step
is done internaly by using a third party script (svn_load_dirs, see Subversion
book for documentation), the second step is done with the merge command
of svn. Just run <tt>svn-upgrade</tt> from you local working directory
(which corresponds the <tt>trunk/</tt> checkout product).
<p>
After running <tt>svn-upgrade</tt> some files may be in conflicting
state. This is naturaly happens if you have modified some files in the
upstream package and now upstream did something similar on the same
positions so <tt>svn merge</tt> was confused.
<p>
When <tt>svn-upgrade</tt> complains about files in conflicting state,
fix them manualy. When done, use the <tt>svn resolved</tt> command to
mark them as clean and <tt>svn commit</tt> to update the repository.
</sect>
<sect>Finalizing the Revision
<p>
When you are ready to upload a new revision of your package, everything
builds fine, the changelog is cleaned up and the package is tested, you
can do the final build and tag the end version. To do so, add
<tt>--svn-tag</tt> switch and after the package is built, it will be
tagged (by creating a copy of the <tt>trunk/</tt> directory as said above).
</sect>
</chapt>

<chapt id="reference">Command reference
<p>
<sect>svn-inject
<p>
<!-- perl man2debiandoc.pl svn-inject.1 -->







<sect1>NAME
<p>
svn-inject - puts a Debian source package into Subversion repository
</sect1>
<sect1>SYNOPSIS
<p>
<strong> svn-inject</strong>
[ <em>options</em> ]  <em>&lt;package&gt;.dsc</em>   <em>&lt;repository URL&gt;</em> 
<sect1>OPTIONS
<p>
<p>
 <em>-h</em> 
print this message
<p>
 <em>-v</em> 
Make the command verbose
<p>
 <em>-q</em> 
Hide less important messages.
<p>
 <em>-l</em> 
Layout type. 1 (default) means package/{trunk,tags,branches,...} scheme, 2
means the {trunk,tags,branches,...}/package scheme. 2 is not implemented
yet.
<p>
 <em>-t</em>  directory
Specify the directory where the .orig.tar.gz files are stored on the
local machine.
<p>
 <em>-d</em> ,  <em>--do-like=directory</em> 
Looks at the working directory of some other package and uses its base URL,
tarball storage directory and similar checkout target directory.
<p>
 <em>-c number</em> 
Checkout nothing (0), trunk directory (1) or everything (2) when the
work is done.
<p>
 <em>-o</em> 
Put only files that are actually touched in the .diff file under the
version control.
svn-inject sets the mergeWithUpstream property automaticaly, see HOWTO.
<p>
 <em>--no-branches</em> 
Do not create the `branches&#39; subdirectory. This is useful for repositories
that store lots of packages and where versioning the upstream sources would
consume lots of space.




</sect>

<sect id="sbman">svn-buildpackage
<p>
<!-- :r! perl man2debiandoc.pl < svn-buildpackage.1
-->




<sect1>NAME
<p>
svn-buildpackage - build Debian packages from SVN repository
</sect1>
<sect1>SYNOPSIS
<p>
<strong> svn-buildpackage</strong>
[  <em>OPTIONS</em> ... ] [  <em>OPTIONS for dpkg-buildpackage </em> ]
<sect1>DESCRIPTION
<p>
Builds Debian package within the SVN repository. The source code
repository must be in the format created by svn-inject, and this script
must be executed from the work directory (trunk/package).
<p>
By default, the working directory is used as the main source directory
(assuming the whole upstream source is beeing stored in the repository). The
alternative is so called &quot;merge mode&quot;. With this method, only the debian
directory (and maybe some other modified files) are stored in the repository.
At build time, the contents of the svn trunk are copied to the extracted
tarball contents (and can overwrite parts of it). To choose this working model,
set the svn property mergeWithUpstream on the Debian directory
(&quot;svn propset mergeWithUpstream 1 debian&quot;).
<p>
The default behaviour is following:

Check the working directory, complain on uncommited files (also see --svn-ignore-new)

Copy the orig tarball to the build area if neccessary (also see --svn-no-links)

Extract the tarball (in merge mode) or export the svn work directory to the build directory (also see below and --svn-no-links)

Build with dpkg-buildpackage (also see --svn-builder, --svn-lintian, etc.)

Create a changelog entry for the future version
</sect1>
<sect1>OPTIONS
<p>
<p>
 <em>-h</em> ,  <em>--help</em> 
Show the help message
<p>
 <em>--svn-verbose</em> 
More verbose program output
<p>
 <em>--svn-dont-clean</em> 
Don't run debian/rules clean (default: clean first)
<p>
 <em>--svn-dont-purge</em> 
Don't run remove the build directory when the build is done. (Default:
wipe after successfull build)
<p>
 <em>--svn-export</em> 
Just export the working directory and do neccessary code merge operations, then exit.
<p>
 <em>--svn-no-links</em> 
Don't use file links but try to export or do hard copies of the working
directory (default: use links where possible). This is useful if your package fails
to build because some files, empty directories, broken links, ...  cannot not
be transported with in the default link-copy mode.
<p>
 <em>--svn-ignore-new</em> 
Don't stop on svn conflicts or new/changed files
<p>
 <em>--svn-tag</em> 
Final build: Tag, export, build cleanly &amp; make
new changelog entry
<p>
 <em>--svn-tag-only, --svn-only-tag</em> 
Don't build the package, do only the tag copy
<p>
 <em>--svn-retag</em> 
If an existing target directory has been found while trying to create the tag
copy, remove the target directory first.
<p>
 <em>--svn-lintian</em> 
Run lintian in the build area when done
<p>
 <em>--svn-move</em> 
When done, move the created files (as listed in .changes) to the parent
directory, relativ to the one where svn-buildpackage was started.
<p>
 <em>--svn-move-to</em> =...
Specifies the target directory to move generated files to. 
<p>
 <em>--svn-pkg</em> =packagename
Overrides the detected package name, use with caution. May be set too late
during the processing (ie. still have the old value when expanding shell
variables).
<p>
 <em>--svn-override</em> =var=value,anothervar=value
Overrides any config variable that has been autodetected or found in .svn/deb-layout.
<p>
 <em>--svn-builder</em> =COMMAND
Specifies alternative build command instead of dpkg-buildpackage, eg.
debuild, pdebuild...  WARNING: shell quotation rules do not completely apply
here, better use wrappers for complex constructs. Using this option may break
--svn-lintian and --svn-move functionality.
<p>
 <em>--svn-pass-diff</em> 
Experimental function to generate the .diff.gz contents using svn and pass it
to dpkg-buildpackage. Requires a hacked dpkg-buildpackage script.
<p>
 <em> --svn-prebuild, --svn-postbuild, --svn-pretag, --svn-posttag</em> 
Commands (hooks) to be executed before/after the build/tag command invocations.
Examples to fetch the orig tarball from a local pool (trying pool/libX/... to):

<example>

svn-buildpackage --svn-prebuild='a=&quot;wget -c http://mymirror/debian/main/pool/&quot;;b=&quot;/$package/${package}_${upstream_version}.orig.tar.gz&quot;; $a$(echo $package|cut -c0-1)$b || $a$(echo $package | cut -c0-4)$b'

Multiple retries with a bashism:

svn-buildpackage --svn-prebuild='wget -c http://mymirror/debian/main/pool/{`echo $package | cut -c0-1`,`echo $package | cut -c0-4`}/$package/${package}_${upstream_version}.orig.tar.gz'

Or using a bounty, see below...

svn-b --svn-prebuild=&quot;wget http://mymirror/debian/main/pool/$guess_loc&quot;
</example>
<sect1>CONFIGURATION FILE
<p>
svn-buildpackage's behaviour can be modified using the file
 <em>~/.svn-buildpackage.conf</em> .
It is basicaly a list of the long command line options (without leading
minus signs), one argument per line (but without quotes embrassing
multi-word arguments). The variables are expanded with the system shell if
potential shell variables were found there. Avoid ~ sign because of unreliable
expansion, better use $HOME instead.
Example:
<example>

svn-builder=debuild -EPATH

svn-no-links

svn-override=origDir=$HOME/debian/upstream/$PACKAGE

# svn-ignore-new

#svn-lintian

</example>
</sect1>
<sect1>DIRECTORY LAYOUT HANDLING
<p>
By default, svn-buildpackage expects a configuration file with path/url
declaration, .svn/deb-layout. The values there can be overriden with the
 <em>--svn-override</em> 
option, see above. If a config file could not be found, the settings are
autodetected following the usual assumptions about local directories and
repository layout. In addition, the contents of a custom file
debian/svn-deblayout will be imported during the initial configuration. Package
maintainers can store this file in the repository to pass correct defaults to
new svn-buildpackage users. The format is the same as in the file .svn/deb-layout.
As an alternative to the debian/svn-deblayout file, maintainers can set
Subversion properties for the debian/ directory; any properties of debian/
which have a name of the form svn-bp:PROP will be the source of a PROP
setting which has the value indicated by the first line of the property value.

<sect1>ENVIRONMENT VARIABLES
<p>
Following environment variables are exported by  <em>svn-buildpackage</em>  and can
be used in hook commands or the package build system.
<p>
 <em>PACKAGE</em> ,  <em>package</em> 
The source package name
<p>
 <em>SVN_BUILDPACKAGE</em> 
Version of svn-buildpackage
<p>
 <em>TAG_VERSION</em> ,  <em>debian_version</em> 
The complete Debian version string, also used for the tag copy
<p>
 <em>non_epoch_version</em> 
Same as debian_version but without any epoch strings
<p>
 <em>upstream_version</em> 
Same as debian_version but without Debian extensions
<p>
 <em>guess_loc</em> 
Guessed upstream source package name in the pool, something like libm/libmeta-html-perl_3.2.1.0.orig.tar.gz
<p>
 <em>DIFFSRC</em> 
(experimental) shows the location of generated diff file

Following variables are understood by svn-buildpackage:
<p>
 <em>FORCETAG</em> 
Tells to ignore the signs for an incomplete changelog
<p>
 <em>FORCEEXPORT</em> 
Export upstream source from the repository even if mergeWithUpstream property is set

</sect1>
<sect1>RECOMMENDATIONS
<p>
First thing, using shell aliases makes sense. Example for the Bash:
<example>

alias svn-b=&quot;svn-buildpackage -us -uc -rfakeroot --svn-ignore&quot;
alias svn-br=&quot;svn-b --svn-dont-purge --svn-reuse&quot;
alias svn-bt=&quot;svn-buildpackage --svn-tag -rfakeroot&quot;

</example>
That simply has the meaning: &quot;just build no matter what&quot;, the same without
re-exporting on repeated builds and &quot;build for upload and tag&quot;.

To access remote repositories, the shell access (via ssh) is the easiest way to
create the link. However, it requires to enter the password and this happens
more often with svn-buildpackage. There are workarounds: use ssh key
without passphrase (insecure and still slow connection) or use the fsh tool
which keeps a persistent connection in background and behaves like a rsh/ssh
command. For details, see svn-buildpackage manual.

Another way to get a remote link is using the Subversion DAV module (with SSL
and Apache user authentication), see svn-buildpackage HOWTO manual for details.














</sect>

<sect>svn-upgrade
<p>
<!-- cat svn-upgrade.1 | perl man2debiandoc.pl > /tmp/tmp -->




<sect1>NAME
<p>
svn-upgrade - upgrade source package from a new upstream revision
</sect1>
<sect1>SYNOPSIS
<p>
<strong> svn-upgrade</strong>
 <em>newtarball </em> [  <em>OPTIONS</em> ... ]
<sect1>DESCRIPTION
<p>
svn-upgrade modifies a Debian package source located in a Subversion
repository, upgrading it to a new upstream release. The repository
filesystem tree must be in the format created by svn-inject.
<p>
 <em>-V</em> ,  <em>--version</em> 
STRING    Forces a different upstream version string
<p>
<p>
 <em>-c</em> ,  <em>---clean</em> 
Runs &quot;make clean&quot; and removed the debian/ directory in the new source.
<p>
 <em>-P</em> ,  <em>--packagename</em>  STRING
Forces a different package name
<p>
 <em>-v</em> ,  <em>--verbose</em> 
More verbose program output
<p>
 <em>-r</em> ,  <em>--replay-conflicting</em> 
Extra cleanup run: replaces all conflicting files with upstream
versions. Review of &quot;svn status&quot; output before doing that could make
sense.
<p>
Tarballs must be compressed with gzip or bzip2.
</sect>

</chapt>

<chapt id="misc">Further documentation
<sect>Various links
<p>
<list>
<item>
Subversion Homepage: <url id="http://subversion.tigris.org/"
name="http://subversion.tigris.org/">
<item>
The Subversion Book: <url 
id="http://svnbook.red-bean.com/" 
name="http://svnbook.red-bean.com/">
<item>
Subversion vs. CVS and others: <url name="http://better-scm.berlios.de/"
id="http://better-scm.berlios.de/">
</list>
</sect>
<sect id="copyright">Copyright
<p>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
<p>
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.
<p>
A copy of the GNU General Public License is available as <url
id="file:///usr/share/common-licenses/GPL"
name="/usr/share/common-licenses/GPL"> in the Debian GNU/Linux distribution or on the World Wide Web at 
<url name="http://www.gnu.org/copyleft/gpl.html"
id="http://www.gnu.org/copyleft/gpl.html">. You can also obtain it by
writing to the Free Software Foundation, Inc., 59 Temple Place, Suite
330, Boston, MA 02111-1307, USA.
</sect>
</chapt>
</book>