...

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

diff --git a/Makefile b/Makefile
index 45ac40f4beb273d13d7ecc5064796e99d58ba69c..98df0556f8b89c52aa7464e2e9e942255b7e0c4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ main: prometheus
 deb: main
        arch=`dpkg-architecture -qDEB_HOST_ARCH`
        maintainer="gandalf <gandalf@arachne.cz>"
 deb: main
        arch=`dpkg-architecture -qDEB_HOST_ARCH`
        maintainer="gandalf <gandalf@arachne.cz>"

-       #patch -Nl <deb/prometheus.patch
-       sed -e "s/__ARCHITECTURE__/$(arch)/" -e "s/__VERSION__/($VERSION)/" -e "s/__PACKAGE__/($PACKAGE)/" -e "s/__MAINTAINER__/$(maintainer)/" deb/prometheus.control > deb/control
+       #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

        dpkg-buildpackage
 
 tgz: clean
        dpkg-buildpackage
 
 tgz: clean

diff --git a/debian/changelog b/deb/changelog
similarity index 100%
rename from debian/changelog
rename to deb/changelog

diff --git a/debian/compat b/deb/compat
similarity index 100%
rename from debian/compat
rename to deb/compat

diff --git a/debian/conffiles b/deb/conffiles
similarity index 100%
rename from debian/conffiles
rename to deb/conffiles

diff --git a/debian/copyright b/deb/copyright
similarity index 100%
rename from debian/copyright
rename to deb/copyright

diff --git a/debian/dirs b/deb/dirs
similarity index 100%
rename from debian/dirs
rename to deb/dirs

diff --git a/debian/postinst b/deb/postinst
similarity index 100%
rename from debian/postinst
rename to deb/postinst

diff --git a/debian/postrm b/deb/postrm
similarity index 100%
rename from debian/postrm
rename to deb/postrm

diff --git a/debian/preinst b/deb/preinst
similarity index 100%
rename from debian/preinst
rename to deb/preinst

diff --git a/debian/prometheus.control b/deb/prometheus.control
similarity index 100%
rename from debian/prometheus.control
rename to deb/prometheus.control

diff --git a/debian/rules b/deb/rules
similarity index 100%
rename from debian/rules
rename to deb/rules

diff --git a/debian-alt/prometheus.conffiles b/debian-alt/prometheus.conffiles
deleted file mode 100644 (file)
index 9627fc8..0000000
--- a/debian-alt/prometheus.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/prometheus/prometheus.conf
-/etc/prometheus/hosts
-/etc/cron.d/prometheus

diff --git a/debian-alt/prometheus.control b/debian-alt/prometheus.control
deleted file mode 100644 (file)
index 239150b..0000000
--- a/debian-alt/prometheus.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: __PACKAGE__
-Version: __VERSION__
-Architecture: __ARCHITECTURE__
-Depends: iptables, iproute
-Maintainer: __MAINTAINER__
-Description: Prometheus QoS (traffic shaper replacement for ISPs)