[Pkg-ocaml-maint-commits] [SCM] libaio-ocaml packaging branch, master, updated. 8171635097ecb5ce0fbc33ec2b5f8a5b3d969e43

2012-03-10 Thread Goswin von Brederlow
The following commit has been merged in the master branch:
commit f692d13c4ec10d67a1780e2a23136610347a6e69
Author: Goswin von Brederlow goswin-...@web.de
Date:   Sat Mar 10 15:20:17 2012 +0100

Add distclean target.

diff --git a/Makefile b/Makefile
index ca42421..20c29cd 100644
--- a/Makefile
+++ b/Makefile
@@ -8,5 +8,9 @@ clean:
$(MAKE) -C lib $@
$(MAKE) -C examples $@
 
+distclean:
+   $(MAKE) -C lib $@
+   $(MAKE) -C examples $@
+
 test:
$(MAKE) -C examples $@
diff --git a/examples/Makefile b/examples/Makefile
index 1376237..ad82570 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -22,4 +22,6 @@ clean:
rm -f *.cmx *.cmi *.cmo *.o
rm -f test.out testfile test.opt test.byte
 
+distclean: clean
+
 .NOTPARALLEL:

-- 
libaio-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] libaio-ocaml packaging branch, master, updated. 8171635097ecb5ce0fbc33ec2b5f8a5b3d969e43

2012-03-10 Thread Goswin von Brederlow
The following commit has been merged in the master branch:
commit cc3a71dcce51f916452cffc99efdcd54918b3c07
Author: Goswin von Brederlow goswin-...@web.de
Date:   Sat Mar 10 15:20:45 2012 +0100

Change to non-native version and 3.0 (quilt) format.

diff --git a/debian/changelog b/debian/changelog
index 9d8f80e..223214c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libaio-ocaml (1.0~rc4) experimental; urgency=low
+libaio-ocaml (1.0-1) experimental; urgency=low
 
   * Initial Release (Closes: 662763).
 
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

-- 
libaio-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] libaio-ocaml packaging branch, master, updated. 8171635097ecb5ce0fbc33ec2b5f8a5b3d969e43

2012-03-10 Thread Goswin von Brederlow
The following commit has been merged in the master branch:
commit c47dc4b76ded743e4c101cee0691877021c804d4
Author: Goswin von Brederlow goswin-...@web.de
Date:   Sat Mar 10 16:23:59 2012 +0100

Add release target.

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..6da3e3d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian export-ignore
diff --git a/debian/rules b/debian/rules
index 431b2a2..e9496ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,3 +32,38 @@ override_dh_auto_install:
 .PHONY: override_dh_install
 override_dh_install:
dh_install --fail-missing
+
+# Make a release
+release: SOURCE=$(shell dpkg-parsechangelog | awk '/^Source:/ { print $$2 }')
+release: VERSION=$(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2 }')
+release: UPSTREAM_VERSION=$(shell VERSION=$(VERSION); echo $${VERSION%-*})
+release: DIR=$(shell basename $$(pwd))
+release: ORIG_NAME=../$(SOURCE)_$(UPSTREAM_VERSION).orig.tar.gz
+release:
+   @if [ $(VERSION) = $(UPSTREAM_VERSION) ]; then\
+ echo Error: Missing debian revision in $(VERSION).; \
+ exit 1;   \
+   fi
+   @if [ -n $(shell git status --porcelain) ]; then  \
+ echo Error: Uncommited changed.;\
+ exit 1;   \
+   fi
+   @if [ ! $(shell git branch) = * master ]; then  \
+ echo Error: Not in master branch.;  \
+ exit 1;   \
+   fi
+   @if git tag | grep ^debian/$(VERSION)$$; then \
+ echo Error: Release $(VERSION) already exists.; \
+ exit 1;   \
+   fi
+   @if git tag | grep ^upsteam/$(UPSTREAM_VERSION)$$; then   \
+ echo Upstream $(UPSTREAM_VERSION) already exists.;  \
+   else\
+ echo Creating $(ORIG_NAME) ...; \
+ git archive --format=tar.gz --output=$(ORIG_NAME) \
+ --prefix=$(SOURCE)-$(UPSTREAM_VERSION)/   \
+ --worktree-attributes HEAD;   \
+ git-import-orig --no-merge --pristine-tar $(ORIG_NAME);   \
+   fi
+   @echo Tagging release debian/$(VERSION)
+   @git tag debian/$(VERSION)

-- 
libaio-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] libaio-ocaml packaging branch, master, updated. 8171635097ecb5ce0fbc33ec2b5f8a5b3d969e43

2012-03-10 Thread Goswin von Brederlow
The following commit has been merged in the master branch:
commit c390768e11cc4dd6d17ba96431259c32fefc0dd9
Author: Goswin von Brederlow goswin-...@web.de
Date:   Sat Mar 10 16:29:43 2012 +0100

Fix release target.

diff --git a/debian/rules b/debian/rules
index e9496ba..35c906f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,15 +48,15 @@ release:
  echo Error: Uncommited changed.;\
  exit 1;   \
fi
-   @if [ ! $(shell git branch) = * master ]; then  \
+   @if ! git branch | grep -q ^* master$$; then  \
  echo Error: Not in master branch.;  \
  exit 1;   \
fi
-   @if git tag | grep ^debian/$(VERSION)$$; then \
+   @if git tag | grep -q ^debian/$(VERSION)$$; then  \
  echo Error: Release $(VERSION) already exists.; \
  exit 1;   \
fi
-   @if git tag | grep ^upsteam/$(UPSTREAM_VERSION)$$; then   \
+   @if git tag | grep -q ^upsteam/$(UPSTREAM_VERSION)$$; then\
  echo Upstream $(UPSTREAM_VERSION) already exists.;  \
else\
  echo Creating $(ORIG_NAME) ...; \

-- 
libaio-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] libaio-ocaml packaging branch, master, updated. 8171635097ecb5ce0fbc33ec2b5f8a5b3d969e43

2012-03-10 Thread Goswin von Brederlow
The following commit has been merged in the master branch:
commit 8171635097ecb5ce0fbc33ec2b5f8a5b3d969e43
Author: Goswin von Brederlow goswin-...@web.de
Date:   Sat Mar 10 16:31:34 2012 +0100

Add upstream version to git-import-orig call.

diff --git a/debian/rules b/debian/rules
index 35c906f..9dc9e83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,9 @@ release:
  git archive --format=tar.gz --output=$(ORIG_NAME) \
  --prefix=$(SOURCE)-$(UPSTREAM_VERSION)/   \
  --worktree-attributes HEAD;   \
- git-import-orig --no-merge --pristine-tar $(ORIG_NAME);   \
+ git-import-orig --no-merge --pristine-tar \
+ --upstream-version=$(UPSTREAM_VERSION)\
+ $(ORIG_NAME); \
fi
@echo Tagging release debian/$(VERSION)
@git tag debian/$(VERSION)

-- 
libaio-ocaml packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits