make deb and make tgz works now (RPM directory not up-to date)

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@68 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/Makefile b/Makefile
index 98df0556f8b89c52aa7464e2e9e942255b7e0c4a..eb33db8cc99219cfdf1a56aeca7431d7246cb75f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,13 @@ CFLAGS=-std=c99 -Wall
 prefix=/usr
 mandir=$(prefix)/share/man
 sbindir=$(prefix)/sbin
-sysconfdir=/etc/
+sysconfdir=/etc
 
 main: prometheus
        $(CC) -o prometheus prometheus.c
 
 deb: main
-       arch=`dpkg-architecture -qDEB_HOST_ARCH`
-       maintainer="gandalf <gandalf@arachne.cz>"
-       #patch -Nl <debian/prometheus.patch
-       sed -e "s/__ARCHITECTURE__/$(arch)/" -e "s/__VERSION__/($VERSION)/" -e "s/__PACKAGE__/($PACKAGE)/" -e "s/__MAINTAINER__/$(maintainer)/" debian/prometheus.control > debian/control
+       debian/prometheus.debian
        dpkg-buildpackage
 
 tgz: clean
@@ -21,7 +18,7 @@ tgz: clean
        rm -rf ../$(PACKAGE)-$(VERSION)/.svn/
        rm -rf ../$(PACKAGE)-$(VERSION)/*/.svn/
        rm -rf ../$(PACKAGE)-$(VERSION)/*~ $(PACKAGE)-$(VERSION)/*/*~
-       tar -czf $(PACKAGE)-$(VERSION).tar.gz ../$(PACKAGE)-$(VERSION)
+       tar -czf ../$(PACKAGE)-$(VERSION).tar.gz ../$(PACKAGE)-$(VERSION)
        rm -rf ../$(PACKAGE)-$(VERSION)
 
 install: main

diff --git a/debian/changelog b/debian/changelog
index 9381195f580ec132640b1f52327c3e8ce7e71e46..3b1501010563207dd5913a7c2c9cb8335c393b38 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus (0.7.8-1) stable; urgency=low
+
+  * Experimental package from version 0.7.8
+
+ -- xChaos <xchaos@arachne.cz>  Thu,  02 Feg 2008 14:06:00 +0100
+
 prometheus (0.7.7-2) stable; urgency=low
 
   * Otestovani instalace a oprava chyb - prvni bastl ;-)

diff --git a/prometheus.debian b/debian/prometheus.debian
similarity index 53%
rename from prometheus.debian
rename to debian/prometheus.debian
index d5487e59e50610eb8e08e18a35aa7a68bbf7efce..c17d10c5cb819212c788f27bfac2fa3b94e55488 100755 (executable)
--- a/prometheus.debian
+++ b/debian/prometheus.debian
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 arch=`dpkg-architecture -qDEB_HOST_ARCH`
-version=`grep VERSION Makefile | gawk -F= '{ print $2 }'`
-package=`grep PACKAGE Makefile | gawk -F= '{ print $2 }'`
-maintainer='gandalf <gandalf@arachne.cz>'
+version=`grep VERSION= Makefile | cut -d = -f 2`
+package=`grep PACKAGE= Makefile | cut -d = -f 2`
+maintainer="gandalf <gandalf@arachne.cz>"
+control=debian/prometheus.control
 
 #patch -Nl <debian/prometheus.patch
 
@@ -11,7 +12,6 @@ sed     -e "s/__ARCHITECTURE__/$arch/" \
         -e "s/__VERSION__/$version/" \
         -e "s/__PACKAGE__/$package/" \
         -e "s/__MAINTAINER__/$maintainer/" \
-        debian/prometheus.control > debian/control
+        $control > debian/control
 
-dpkg-buildpackage
                                

diff --git a/debian/rules b/debian/rules
index 78ad66a2670544fb2f7436611855bd2fe352712b..6d9f2788e2f022f4165756e6f70a3e02b041f303 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ CFLAGS = -Wall -g
 bindir = /usr/sbin
 mandir = /usr/share/man
 sysconfdir = /etc
-destdir = $(CURDIR)/deb/prometheus
+destdir = $(CURDIR)/debian/prometheus
 docdir = /usr/share/doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))