[pkg-horde] GNU Arch repo created - working on horde 3.0.9
Ola Lundqvist
opal at debian.org
Sun Feb 19 14:03:50 UTC 2006
Hi
I have now imported imp4 to the archives as well. I hope I did the right
thing... Please correct me if I did it wrong in some way.
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ tla archive-setup -A pkg-horde-hackers at lists.alioth.debian.org--2006 imp--sid--4
* creating version pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ tla archive-setup -A pkg-horde-hackers at lists.alioth.debian.org--2006 imp--upstream--4
* creating version pkg-horde-hackers at lists.alioth.debian.org--2006/imp--upstream--4
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ tla init-tree -A pkg-horde-hackers at lists.alioth.debian.org--2006 imp--upstream--4
# Manually added source ^\.htaccess$ to \{arch\}/\=tagging-method file
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ tla inventory --names --both --source | xargs tla add-id
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ emacs `tla make-log`
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ tla import
* imported pkg-horde-hackers at lists.alioth.debian.org--2006/imp--upstream--4
ola at tigereye:~/rcs/tla/horde/imp-h3-4.0.4$ tla tag pkg-horde-hackers at lists.alioth.debian.org--2006/imp--upstream--4--base-0 pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4
... some minor things ...
ola at tigereye:~/rcs/tla/horde$ tla get pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4
* from pristine cache: pkg-horde-hackers at lists.alioth.debian.org--2006/imp--upstream--4--base-0
* patching for revision: pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4--base-0
* making pristine copy
* tree version set pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4
ola at tigereye:~/rcs/tla/horde/imp--sid--4--base-0$ tla_load_dirs --summary='Import debian changes for imp4-4.0.4-1' ../imp4-4.0.4
TLACMD: tla
LOGTEXT Imported imp4-4.0.4
into pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4
A/ debian
A/ debian/.arch-ids
A debian/.arch-ids/=id
A debian/.arch-ids/README.Debian.id
A debian/.arch-ids/changelog.id
A debian/.arch-ids/compat.id
A debian/.arch-ids/control.id
A debian/.arch-ids/copyright.id
A debian/.arch-ids/dirs.id
A debian/.arch-ids/docs.id
A debian/.arch-ids/examples.id
A debian/.arch-ids/rules.id
A debian/.arch-ids/watch.id
A debian/README.Debian
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/dirs
A debian/docs
A debian/examples
A debian/rules
A debian/watch
M templates/menu.inc
M lib/IMP.php
* update pristine tree (pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4--base-0 => imp--sid--4--patch-1)
* committed pkg-horde-hackers at lists.alioth.debian.org--2006/imp--sid--4--patch-1
I think this will be the right thing to do... Now I'll hack on. :)
Regards,
// Ola
On Sun, Dec 18, 2005 at 01:43:00PM +0100, Lionel Elie Mamane wrote:
> On Sun, Dec 18, 2005 at 12:12:05PM +0100, Lionel Elie Mamane wrote:
> > On Sun, Dec 18, 2005 at 11:20:24AM +0100, Lionel Elie Mamane wrote:
>
> >> I'm going to work on packaging horde 3.0.9 now.
>
> > Which you did two days ago. OK, I'll go in "shadow" mode then.
>
> I've imported upstream's 3.0.7 and 3.0.9, as well as 3.0.7-1 and
> 3.0.9-2 into our GNU Arch (tla) repository. I've also made a small
> change, as much for the value of the example as because it is a change
> that should be part of the next upload.
>
> Here's a (a bit commented) log of what I did:
>
> master at capsaicin:~/src/horde$ tar xfz horde3_3.0.7.orig.tar.gz
> master at capsaicin:~/src/horde$ cd horde-3.0.7/
> # This archive is still unknown on this machine, so register it
> master at capsaicin:~/src/horde/horde-3.0.7$ tla register-archive sftp://lmamane@arch.debian.org/arch/pkg-horde/
> Registering archive: pkg-horde-hackers at lists.alioth.debian.org--2006
> # create the branch for debian versions uploaded to unstable
> master at capsaicin:~/src/horde/horde-3.0.7$ tla archive-setup -A pkg-horde-hackers at lists.alioth.debian.org--2006 horde--sid--3
> * creating version pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3
> # create the branch for tracking upstream
> master at capsaicin:~/src/horde/horde-3.0.7$ tla archive-setup -A pkg-horde-hackers at lists.alioth.debian.org--2006 horde--upstream--3
> * creating version pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3
> # I could have used tla_load_dirs, but for the educational value I did
> # the initial import by hand.
> # So, the current tree will go into horde--upstream--3
> master at capsaicin:~/src/horde/horde-3.0.7$ tla init-tree -A pkg-horde-hackers at lists.alioth.debian.org--2006 horde--upstream--3
> # Only "problem", tla thinks that files that start with . are not
> # source. Tell it that for this project, .htaccess is a source, too.
> master at capsaicin:~/src/horde/horde-3.0.7$ cp \{arch\}/\=tagging-method BAK
> master at capsaicin:~/src/horde/horde-3.0.7$ gnuclient \{arch\}/\=tagging-method
> master at capsaicin:~/src/horde/horde-3.0.7$ diff -u BAK \{arch\}/\=tagging-method
> --- BAK 2005-12-18 12:19:15.157697248 +0100
> +++ {arch}/=tagging-method 2005-12-18 12:19:38.875370899 +0100
> @@ -159,6 +159,7 @@
> # Traversal _does_ descend into source directories:
>
> source ^[_=a-zA-Z0-9].*$
> +source ^\.htaccess$
>
> # Any files not classified by the above rules are classified as unrecognized.
> # Traversal does not descend into unrecognized directories.
> master at capsaicin:~/src/horde/horde-3.0.7$ rm BAK
> # Now, register all source files and directories with tla
> # --both means files AND directories
> # "tla inventory" lists the files tla knows about and
> # "tla inventory --names" the files matched by the naming rules
> master at capsaicin:~/src/horde/horde-3.0.7$ tla inventory --names --both --source | xargs tla add-id
> master at capsaicin:~/src/horde/horde-3.0.7$ gnuclient `tla make-log`
> master at capsaicin:~/src/horde/horde-3.0.7$ cat ++log.horde--upstream--3--pkg-horde-hackers at lists.alioth.debian.orrg--2006
> Summary: import upstream horde 3.0.7
> Keywords:
>
> #Let's check that all files are registered with tla
> master at capsaicin:~/src/horde/horde-3.0.7$ find * | fgrep -v '.arch-ids' | sort > ../foo1
> master at capsaicin:~/src/horde/horde-3.0.7$ diff -u ../foo0 ../foo1
> --- ../foo0 2005-12-18 12:23:53.903610215 +0100
> +++ ../foo1 2005-12-18 12:24:30.955426945 +0100
> @@ -22,6 +22,15 @@
> admin/sqlshell.php
> admin/templates.php
> admin/user.php
> +{arch}
> +{arch}/.arch-project-tree
> +{arch}/++default-version
> +{arch}/horde
> +{arch}/horde/horde--upstream
> +{arch}/horde/horde--upstream/horde--upstream--3
> +{arch}/horde/horde--upstream/horde--upstream--3/pkg-horde-hackers at lists.alioth.debian.org--2006
> +{arch}/horde/horde--upstream/horde--upstream--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log
> +{arch}/=tagging-method
> config
> config/conf.php.dist
> config/conf.xml
> @@ -659,6 +668,7 @@
> locale/zh_TW/help.xml
> locale/zh_TW/LC_MESSAGES
> locale/zh_TW/LC_MESSAGES/horde.mo
> +++log.horde--upstream--3--pkg-horde-hackers at lists.alioth.debian.org--2006
> login.php
> po
> po/ar_SY.po
> #Good!
> master at capsaicin:~/src/horde/horde-3.0.7$ rm ../foo*
> # Go on, commit the "base-0" revision of this branch
> master at capsaicin:~/src/horde/horde-3.0.7$ tla import
> * imported pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3
> master at capsaicin:~/src/horde/horde-3.0.7$ cd ..
> #Now, I need to get the recently uploaded 3.0.9-2
> master at capsaicin:~/src/horde$ sudo aptitude update
> master at capsaicin:~/src/horde$ apt-get source horde3
> dpkg-source: extracting horde3 in horde3-3.0.9
> dpkg-source: unpacking horde3_3.0.9.orig.tar.gz
> dpkg-source: applying ./horde3_3.0.9-2.diff.gz
> master at capsaicin:~/src/horde$ tar xfz horde3_3.0.9.orig.tar.gz
> master at capsaicin:~/src/horde$ cd horde-3.0.7
> # Going back to our tla working dir and using tla_load_dirs to get the
> # changes in upstream between 3.0.7 and 3.0.9
> master at capsaicin:~/src/horde/horde-3.0.7$ tla_load_dirs ../horde-3.0.9/
> TLACMD: tla
> LOGTEXT Imported horde-3.0.9
> into pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3
>
>
>
> M lib/Horde/Browser/imode.php
> M docs/CHANGES
> M lib/Horde/Tree/select.php
> M lib/Horde/UI/VarRenderer.php
> M lib/Horde/UI/VarRenderer/html.php
> M docs/RELEASE_NOTES
> M lib/version.php
> M lib/Block/weatherdotcom.php
> M services/prefs.php
> M templates/data/csvinfo.inc
> M templates/data/csvmap.inc
> M templates/data/date.inc
> M templates/data/datemap.inc
> M templates/data/datetime.inc
> M templates/data/time.inc
> M templates/data/tsvinfo.inc
> M templates/portal/menu.inc
> M templates/prefs/categorymanagement.inc
> M templates/prefs/enum.inc
> M templates/prefs/identityselect.inc
> M templates/prefs/multienum.inc
> M templates/prefs/number.inc
> M templates/prefs/password.inc
> M templates/prefs/select.inc
> M templates/rpcsum/rpcsum.inc
> M templates/shares/edit.inc
> * update pristine tree (pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--base-0 => horde--upstream--3--patch-1)
> * committed pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--patch-1
> master at capsaicin:~/src/horde/horde-3.0.7$ cd ..
> master at capsaicin:~/src/horde$ rm -rf horde-3.0.9/
> master at capsaicin:~/src/horde$ mkdir arch
> master at capsaicin:~/src/horde$ mv horde-3.0.7/ arch/horde--upstream--3
> master at capsaicin:~/src/horde$ cd arch/
> # I make horde--sid--3 be a branch from horde--upstream--3--base-0;
> # base-0 contains 3.0.7
> # Note that "tla tag" does something very different from "cvs tag"!
> # It makes the latest revision of its second argument be equal to its
> # first argument. It _branches_ its first argument into its second
> # argument.
> master at capsaicin:~/src/horde/arch$ tla tag pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--base-0 pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3
> # check-out the just created branch
> master at capsaicin:~/src/horde/arch$ tla get pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3
> * from import revision: pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--base-0
> * patching for revision: pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--base-0
> * making pristine copy
> * tree version set pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3
> master at capsaicin:~/src/horde/arch$ cd horde--sid--3/
> master at capsaicin:~/src/horde/arch/horde--sid--3$ cd ../..
> master at capsaicin:~/src/horde$ rm -rf horde3-3.0.7/
> # Get the pristine Debian 3.0.7-1 ...
> master at capsaicin:~/src/horde$ dpkg-source -x horde3_3.0.7-1.dsc
> dpkg-source: extracting horde3 in horde3-3.0.7
> dpkg-source: unpacking horde3_3.0.7.orig.tar.gz
> dpkg-source: applying ./horde3_3.0.7-1.diff.gz
> master at capsaicin:~/src/horde$ cd arch/horde--sid--3/
> # and use tla_load_dirs to commit it; use "-v" to see what happens
> # behind the scene
> master at capsaicin:~/src/horde/arch/horde--sid--3$ tla_load_dirs -v --summary='Import horde3 3.0.7-1' ../../horde3-3.0.7/
> TLACMD: tla
> Running: tla ['tree-version']
> Running: tla ['-V']
> Running: tla ['-V']
> Running: tla ['-V']
> Running: tla ['id-tagging-method']
> Scanning upstream tree...
> Scanning working copy tree...
> Calculating changes...
> *** Processing changes.
> Deleting 0 files
> Copying upstream directory to working copy...
> Running: tar ['-cSpf', '-', '.']
> Running: tar ['-xSpf', '-']
> Adding 13 files
> Adding debian/
> Running: tla ['add-id', 'debian']
> Adding debian/README.Debian
> Running: tla ['add-id', 'debian/README.Debian']
> Adding debian/changelog
> Running: tla ['add-id', 'debian/changelog']
> Adding debian/compat
> Running: tla ['add-id', 'debian/compat']
> Adding debian/control
> Running: tla ['add-id', 'debian/control']
> Adding debian/copyright
> Running: tla ['add-id', 'debian/copyright']
> Adding debian/cron.d
> Running: tla ['add-id', 'debian/cron.d']
> Adding debian/dirs
> Running: tla ['add-id', 'debian/dirs']
> Adding debian/docs
> Running: tla ['add-id', 'debian/docs']
> Adding debian/examples
> Running: tla ['add-id', 'debian/examples']
> Adding debian/logrotate
> Running: tla ['add-id', 'debian/logrotate']
> Adding debian/rules
> Running: tla ['add-id', 'debian/rules']
> Adding debian/watch
> Running: tla ['add-id', 'debian/watch']
> Running: tla ['tree-version']
> Running: tla ['make-log']
> LOGTEXT Imported horde3-3.0.7
> into pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3
>
>
>
> Committing changes
> Running: tla ['commit']
> A/ debian
> A/ debian/.arch-ids
> A debian/.arch-ids/=id
> A debian/.arch-ids/README.Debian.id
> A debian/.arch-ids/changelog.id
> A debian/.arch-ids/compat.id
> A debian/.arch-ids/control.id
> A debian/.arch-ids/copyright.id
> A debian/.arch-ids/cron.d.id
> A debian/.arch-ids/dirs.id
> A debian/.arch-ids/docs.id
> A debian/.arch-ids/examples.id
> A debian/.arch-ids/logrotate.id
> A debian/.arch-ids/rules.id
> A debian/.arch-ids/watch.id
> A debian/README.Debian
> A debian/changelog
> A debian/compat
> A debian/control
> A debian/copyright
> A debian/cron.d
> A debian/dirs
> A debian/docs
> A debian/examples
> A debian/logrotate
> A debian/rules
> A debian/watch
> M config/conf.php.dist
> M config/mime_drivers.php.dist
> M config/nls.php.dist
> * update pristine tree (pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--base-0 => horde--sid--3--patch-1)
> * committed pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-1
> #Now merge the changes that happened in horde--upstream--3 since the
> #point we branched from; this means merge the changes between 3.0.7
> #and 3.0.9.
> master at capsaicin:~/src/horde/arch/horde--sid--3$ tla star-merge pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3
> * star-merge by delta(pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--base-0,pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--patch-1)[/home/master/src/horde/arch/horde--sid--3]
> * build reference tree for pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--base-0
> * from import revision: pkg-horde-hackers at lists.alioth.debian.org--2006/horde--upstream--3--base-0
> * applying changeset
> A {arch}/horde/horde--upstream/horde--upstream--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
> M docs/CHANGES
> M docs/RELEASE_NOTES
> M lib/Block/weatherdotcom.php
> M lib/Horde/Browser/imode.php
> M lib/Horde/Tree/select.php
> M lib/Horde/UI/VarRenderer.php
> M lib/Horde/UI/VarRenderer/html.php
> M lib/version.php
> M services/prefs.php
> M templates/data/csvinfo.inc
> M templates/data/csvmap.inc
> M templates/data/date.inc
> M templates/data/datemap.inc
> M templates/data/datetime.inc
> M templates/data/time.inc
> M templates/data/tsvinfo.inc
> M templates/portal/menu.inc
> M templates/prefs/categorymanagement.inc
> M templates/prefs/enum.inc
> M templates/prefs/identityselect.inc
> M templates/prefs/multienum.inc
> M templates/prefs/number.inc
> M templates/prefs/password.inc
> M templates/prefs/select.inc
> M templates/rpcsum/rpcsum.inc
> M templates/shares/edit.inc
> #And finally, get the changes made for its Debian packaging.
> # In a "normal" work-flow, these wouldn't be gotten through
> # tla_load_dirs, but made directly in this work dir and then
> # committed with "$EDITOR `tla make-log`" and "tla commit"
> master at capsaicin:~/src/horde/arch/horde--sid--3$ tla_load_dirs --summary='Import horde3 3.0.9-2
> TLACMD: tla
> LOGTEXT Imported horde3-3.0.9
> into pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3
>
>
>
> A {arch}/horde/horde--upstream/horde--upstream--3/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
> M lib/Horde/Browser/imode.php
> M config/conf.php.dist
> M docs/CHANGES
> M lib/Horde/Tree/select.php
> M lib/Horde/UI/VarRenderer.php
> M lib/Horde/UI/VarRenderer/html.php
> M docs/RELEASE_NOTES
> M lib/version.php
> M lib/Block/weatherdotcom.php
> M services/prefs.php
> M templates/data/csvinfo.inc
> M templates/data/csvmap.inc
> M templates/data/date.inc
> M templates/data/datemap.inc
> M templates/data/datetime.inc
> M templates/data/time.inc
> M templates/data/tsvinfo.inc
> M templates/portal/menu.inc
> M templates/prefs/categorymanagement.inc
> M templates/prefs/enum.inc
> M templates/prefs/identityselect.inc
> M templates/prefs/multienum.inc
> M templates/prefs/number.inc
> M templates/prefs/password.inc
> M templates/prefs/select.inc
> M templates/rpcsum/rpcsum.inc
> M templates/shares/edit.inc
> M debian/README.Debian
> M debian/changelog
> M debian/control
> * update pristine tree (pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-1 => horde--sid--3--patch-2)
> * committed pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-2
> # Now make a real change
> master at capsaicin:~/src/horde/arch/horde--sid--3$ cd ..
> master at capsaicin:~/src/horde/arch$ cd horde--sid--3/debian/
> master at capsaicin:~/src/horde/arch/horde--sid--3/debian$ gnuclient control
> master at capsaicin:~/src/horde/arch/horde--sid--3/debian$ tla changes --diffs
> * looking for pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-2 to compare with
> * comparing to pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-2
> M debian/control
>
> * modified files
>
> --- orig/debian/control
> +++ mod/debian/control
> @@ -1,8 +1,8 @@
> Source: horde3
> Section: web
> Priority: optional
> -Maintainer: Ola Lundqvist <opal at debian.org>
> -Uploaders: Jose Carlos Medeiros <jose at psabs.com.br>
> +Maintainer: Horde Maintainers <pkg-horde-hackers at lists.alioth.debian.org>
> +Uploaders: Ola Lundqvist <opal at debian.org>, Jose Carlos Medeiros <jose at psabs.com.br>, Lionel Elie Mamane <lionel at mamane.lu>
> Build-Depends-Indep: debhelper (>= 4.1.16)
> Standards-Version: 3.6.2
>
>
>
>
> master at capsaicin:~/src/horde/arch/horde--sid--3/debian$ gnuclient $(tla make-log)
> master at capsaicin:~/src/horde/arch/horde--sid--3/debian$ cat ../++log.horde--sid--3--pkg-horde-hackers at lists.aliothh.debian.org--2006
> Summary: Set maintainer to ML
> Keywords:
>
> Set maintainer to
> Horde Maintainers <pkg-horde-hackers at lists.alioth.debian.org
> and Uploaders to
> Ola Lundqvist <opal at debian.org>
> Jose Carlos Medeiros <jose at psabs.com.br>
> Lionel Elie Mamane <lionel at mamane.lu>
> master at capsaicin:~/src/horde/arch/horde--sid--3/debian$ tla commit
> M debian/control
> * update pristine tree (pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-2 => horde--sid--3--patch-3)
> * committed pkg-horde-hackers at lists.alioth.debian.org--2006/horde--sid--3--patch-3
> master at capsaicin:~/src/horde/arch/horde--sid--3/debian$ exit
>
>
> Done! If you have any questions, shoot.
>
> --
> Lionel
>
> _______________________________________________
> pkg-horde-hackers mailing list
> pkg-horde-hackers at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-horde-hackers
>
--
--------------------- Ola Lundqvist ---------------------------
/ opal at debian.org Annebergsslingan 37 \
| opal at lysator.liu.se 654 65 KARLSTAD |
| +46 (0)54-10 14 30 +46 (0)70-332 1551 |
| http://www.opal.dhs.org UIN/icq: 4912500 |
\ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 /
---------------------------------------------------------------
More information about the pkg-horde-hackers
mailing list