merged some changes of the new release v0.3.4.4 into trunk

clarified the release policy
partly reverted r959
This commit is contained in:
lars 2007-05-25 08:26:38 +00:00
parent 906b0f74c0
commit 8a0fb060e2
7 changed files with 55 additions and 31 deletions

1
README
View File

@ -177,6 +177,7 @@ rike - French translation
Fabrizio Tarizzo - Italian translation
kinneko - Japanese translation
Andrzej S. Kaznowski - Polish translation
Fadrique - Spanish translation
We also want to thank the numerous developers of the Free Software, the
CryptoBox depends on and that was used in development.

View File

@ -1,3 +1,6 @@
Version 0.3.4.4 - 05/23/02007
* added: Spanish translation provided by Fadrique
Version 0.3.4.3 - 04/01/02007
* added: Polish translation provided by Andrzej S. Kaznowski

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
cryptobox (0.3.4.4-1) unstable; urgency=low
* new upstream release: added Spanish translation provided by Fadrique
-- Henning <bagel@systemausfall.org> Wed, 23 May 2007 01:50:00 +0200
cryptobox (0.3.4.3-1) unstable; urgency=low
* new upstream release: added Polish translation provided by Andrzej S. Kaznowski

View File

@ -22,7 +22,7 @@
"""Unittests for cryptobox.core.tools
"""
__revision__ = "$Id"
__revision__ = "$Id$"
import cryptobox.core.tools as cbx_tools
@ -34,15 +34,6 @@ class CryptoBoxToolsTests(CommonTestClass):
"""All unittests for cryptoboxtools
"""
def test_get_absolute_devicename(self):
"""check the get_absolute_devicename function
"""
func = cbx_tools.get_absolute_devicename
self.assertTrue(func(os.path.basename(self.device)) == self.device)
self.assertTrue(func("loop0") == "/dev/loop0")
self.assertTrue(func(os.path.devnull) == os.path.devnull)
def test_find_major_minor_of_device(self):
"""check the find_major_minor_of_device function
"""

View File

@ -1,11 +0,0 @@
To release a new debian package for updated or added language files
do the following steps:
* log into thorax and commit the language changes (see pootle-updates.txt)
* add language to branches/translation-base-v0.3/conf-examples/cryptobox.conf
* add translator acknowledgement to README in branches/translation-base-v0.3
* svn cp branches/translation-base-v0.3 tags/v0.3.x.y (replace x and y)
* change into the new dir (tags/v0.3.x.y) and run: debchange -v 0.3.x.y
* run: ../make-deb.sh 0.3.x.y .
* check for errors by lintian

View File

@ -1,6 +1,37 @@
HOW TO UPLOAD A FRESH DEBIAN PACKAGE
1) update the debian changelog
1) tag the to-be-released version
Run:
svn cp BASE tags/v0.x.y
Replace 'BASE' with the version this release is based on (usually 'trunk').
Replace 'x' and 'y' with the numbers of your choosen release.
2) Apply the selected changes
This step is only suitable for releases that are not based on 'trunk', but are
just bugfix or language releases.
2a) Bugfix release
Apply the appropriate patch.
2b) Language release
Copy the choosen language files to the new tag directory.
Just an example for an update of the spanish ('es') translation:
cd branches/translation-base-x.y
find -type f -name \*.po | grep /intl/es/ | while read po_file
do svn cp "$po_file" "tags/v0.x.y/$po_file"
done
Add possible new languages to the "Languages" setting in
'conf-examples/cryptobox.conf'.
Add the acknowledgment for the contributor to the README file.
All changes must be merged into the 'trunk', too!
3) update the debian changelog
Run "debchange -i" to create a new changelog entry. Leave some useful notes.
BEWARE: all development releases must have the debian release no. "1" (the last
@ -12,21 +43,23 @@ inevitably mess up the package repository - and you know, who will have to
figure out, how to fix this :)
2) create the package
Change to the trunk directory of the project and run the followin:
../tags/make-deb.sh UPSTREAM_VERSION .
4) create the package
Change to the tag directory of the new release and run the following:
../make-deb.sh x.y.z .
(do not forget the final dot)
The UPSTREAM_VERSION is the one, that you were using for the new debian
changelog entry. Again: _never_ upload two different debian packages with the
same upstream version number or you will go to hell!
changelog entry (_before_ the hyphen, e.g. "0.3.4" instead of "0.3.4-1").
Again: _never_ upload two different debian packages with the same upstream
version number or you will surely go to hell!
The package files will get copied to ../tags/packages/debian/.
The version number in src/cryptobox/__init__.py gets updated automatically by
the make-deb.sh script.
3) double check the package
5) double check the package
Run the two testing programs "lintian" and "linda" with the new
package.
lintian ../tags/packages/debian/cryptobox-server...deb
@ -34,7 +67,8 @@ package.
Try to install the new package on a system with dpkg and see if it went fine.
4) upload the package
6) upload the package
You should use dupload - it is the preferred uploading program for debian
packages:
apt-get install dupload
@ -64,7 +98,7 @@ To upload the latest debian package you could do the following:
(this will only use the latest changes-file)
5) import the package into the repository
7) import the package into the repository
It would be nice, if the web interface would work - but it does not.
Please wait for etch - then we will update reprepro.

View File

@ -16,7 +16,7 @@ The usual steps before commit:
2) release a new version
- follow the instructions in "debian-package-policy.txt"
- follow the instructions in "debian-package_policy.txt"
- upload the tar/deb/iso to codecoop
- update the website: index and download
- announce the release on freshmeat: http://freshmeat.net/projects/cryptobox