Merge branch 'master' into karmic

diff --git a/Makefile b/Makefile
index 0a6c30e4856fb96bf30de9d69c7535da44c709e2..72c3495adac0a5e16944b2e2b5d273c342b94a16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 # Change or override these values as necessary for each package release
 
 PKGVER  = 0.11.2
-DEBRELEASE = 4tmi
+DEBRELEASE = 5.2tmi
 
 
 # No need to change anything below this line
@@ -21,6 +21,8 @@ ifeq (,$(REPOID))
   $(error You much check the code out via svn, git-svn, or git)
 endif
 
+USER := $(shell whoami)
+REPOHOST := repo
 BUILD := build
 DEBDIST := $(shell lsb_release -cs)
 DEBVER := $(PKGVER)-$(DEBRELEASE)
@@ -32,6 +34,8 @@ DEBSRC := $(PACKAGE)-$(PKGVER)
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEBFILE := $(BUILD)/$(PACKAGE)_$(DEBVER)_$(ARCH).deb
 DEBSRCFILE := $(BUILD)/$(PACKAGE)_$(DEBVER).dsc
+CHANGESFILE := $(BUILD)/$(PACKAGE)_$(DEBVER)_$(ARCH).changes
+UPLOADFILE := $(BUILD)/$(PACKAGE)_$(DEBVER)_$(ARCH).upload
 
 
 source: $(DEBSRCFILE)
@@ -40,9 +44,24 @@ $(DEBSRCFILE): $(BUILD)/debian-stamp
        touch $@
 
 
+release: $(UPLOADFILE)
+$(UPLOADFILE): $(CHANGESFILE)
+       : # Requires ~/.dput.cf and upload server configured properly
+       dput $(REPOHOST) $(CHANGESFILE)
+
+
+pbuilder: $(CHANGESFILE)
+$(CHANGESFILE): $(DEBSRCFILE)
+       : # Requires ~/.dput.cf and upload server configured properly
+       sudo pbuilder build $(DEBSRCFILE)
+       sudo mv /var/cache/pbuilder/result/$(PACKAGE)_$(DEBVER)* $(BUILD)/
+       sudo chown $(USER) $(BUILD)/*
+       debsign $(CHANGESFILE)
+
+
 binary: $(DEBFILE)
 $(DEBFILE): $(BUILD)/debian-stamp
-       cd $(BUILD)/$(DEBSRC) && dpkg-buildpackage -sa -us -uc 
+       cd $(BUILD)/$(DEBSRC) && dpkg-buildpackage -sa
 
 
 $(BUILD)/src-stamp: Makefile.dkms dkms.conf $(wildcard src/*)
@@ -92,4 +111,4 @@ debug:
        @echo "DEBSRCFILE = $(BUILD)/$(PACKAGE)_$(DEBVER).dsc"
 
 
-.PHONY: clean binary source configure
+.PHONY: clean binary source configure pbuilder release

diff --git a/debian.in/changelog b/debian.in/changelog
index 6b0b8bc6987d6c84e94b145c12970757b876b416..ef28246d8fc06fc4328429be5ff60e04192d3f23 100644 (file)
--- a/debian.in/changelog
+++ b/debian.in/changelog
@@ -2,4 +2,4 @@ xxPACKAGExx (xxDEBVERxx) xxDEBDISTxx; urgency=low
 
   * Auto packaged
 
- -- R. Steve McKown <rsmckown@gmail.com>  xxRFC822DATExx
+ -- TMI Packages <pkgs@titaniummirror.com>  xxRFC822DATExx

diff --git a/debian.in/control b/debian.in/control
index 062f77ed1aa033f5d2e6be5cc6c95db11b85cc96..7cdc3e04c1fa543ef7b7ffd696c16a082988337f 100644 (file)
--- a/debian.in/control
+++ b/debian.in/control
@@ -1,9 +1,9 @@
 Source: xxPACKAGExx
 Section: devel
 Priority: optional
-Maintainer: R. Steve McKown <rsmckown@gmail.com>
+Maintainer: TMI Packages <pkgs@titaniummirror.com>
 Standards-Version: 3.7.2.0
-Build-Depends: dpkg-dev (>= 1.13.9)
+Build-Depends: dpkg-dev (>= 1.13.9), lsb-release
 
 Package: xxPACKAGExx
 Architecture: all

diff --git a/debian.in/postinst b/debian.in/postinst
index accd6fcfd09b3bc4201d7a2a577a5ea9c72e13cf..38105b49c8f9d88af9679ba40ba1ed3b30e42059 100755 (executable)
--- a/debian.in/postinst
+++ b/debian.in/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=xxPACKAGExx
-VERSION=xxPKGVERxx
+VERSION=xxDEBVERxx
 
 case "$1" in
     configure)

diff --git a/debian.in/postrm b/debian.in/postrm
index 9bf77b537947070fe2a117b70c5e964420741ed4..30f451d8534f5e630645e504a85375ad05a18a19 100755 (executable)
--- a/debian.in/postrm
+++ b/debian.in/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=xxPACKAGExx
-VERSION=xxPKGVERxx
+VERSION=xxDEBVERxx
 
 set -e
 

diff --git a/debian.in/prerm b/debian.in/prerm
index e7a02eca309effe5dfda2ca8d56004df45f338bf..9985327477610495c5e7ba89041fe3a5600ed89a 100755 (executable)
--- a/debian.in/prerm
+++ b/debian.in/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=xxPACKAGExx
-VERSION=xxPKGVERxx
+VERSION=xxDEBVERxx
 
 set -e
 

diff --git a/debian.in/rules b/debian.in/rules
index 4f324b6f2ac2e0699292ce0232ca4d274ed52c1e..719bceb549709cd7d619877b5ca5c2e23d7f1150 100755 (executable)
--- a/debian.in/rules
+++ b/debian.in/rules
@@ -10,7 +10,7 @@
 # This file may have to be extensively modified
 
 package = xxPACKAGExx
-inst_dir = debian/tmp/usr/src/xxPACKAGExx-xxPKGVERxx
+inst_dir = debian/tmp/usr/src/xxPACKAGExx-xxDEBVERxx
 
 install_dir    = install -d -m 755
 install_file   = install -m 644