* Now using simplier debian/install system instead of Makefile

* cron no longer crashes when package has been removed, but not purged
* Ignore .svn files

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index db2a165..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all:
-
-clean:
-
-install: all
-       mkdir -p $(DESTDIR)/usr/bin
-       mkdir -p $(DESTDIR)/usr/sbin
-       mkdir -p $(DESTDIR)/var
-       mkdir -p usr/share/lintian/overrides
-       cp -p curcy $(DESTDIR)/usr/bin
-       cp -p curcy-update $(DESTDIR)/usr/sbin
-       cp -p currencies $(DESTDIR)/var
-       cp -rp usr $(DESTDIR)

diff --git a/debian/changelog b/debian/changelog
index 158e02dd20873dcac5165af51755757a865963f7..61f2b5f374a1234624167c2ab5e0f5420f550082 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+curcy (0.1.4) UNRELEASED; urgency=low
+
+  * Now using simplier debian/install system instead of Makefile
+  * cron no longer crashes when package has been removed, but not purged
+  * Ignore .svn files
+
+ -- Nirgal Vourgère <jmv_deb@nirgal.com>  Mon, 10 Mar 2008 16:43:06 +0100
+
 curcy (0.1.3) UNRELEASED; urgency=low
 
   * Fixed man page encoding of non ascii characters

diff --git a/debian/control b/debian/control
index 2e05e51be6b57593032423dfca2cef1b6d2f222a..fabcfd0e62198c8e566c2cfe52c09a6cad77b4b8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Jean-Michel Vourgère <jmv_deb@nirgal.com>
 Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
 
 Package: curcy
 Section: misc

diff --git a/debian/cron.weekly b/debian/cron.weekly
index 2fbe83a51dd06d7a147039109246fbc1db81f4ce..c0ace30f326afc924435b9c6f19ed683f73a8151 100644 (file)
--- a/debian/cron.weekly
+++ b/debian/cron.weekly
@@ -1,2 +1,5 @@
 #!/bin/sh
-/usr/sbin/update-curcy
+
+# Test whether the file is still ok
+# It's not true when the package has been removed, but not purged
+test -x /usr/sbin/update-curcy && /usr/sbin/update-curcy

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..2cb9287
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,4 @@
+/curcy /usr/bin/
+/curcy-update /usr/sbin/
+/currencies /var
+/usr /

diff --git a/debian/rules b/debian/rules
index e8478eb365ad39b4d98ada7eecc49bda70c59bb5..1661a4a373119e04fe2b6db690f7fe0272f5a4cc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
+#CFLAGS = -g
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+#      CFLAGS += -O0
+#else
+#      CFLAGS += -O2
+#endif
 
 build: build-stamp
 build-stamp:
        dh_testdir
 
        # Add here commands to compile the package.
-       -$(MAKE)
+       #-$(MAKE)
        #docbook-to-man debian/gentoo.sgml > gentoo.1
 
        touch build-stamp
@@ -28,7 +28,7 @@ clean:
        rm -f build-stamp
 
        # Add here commands to clean up after the build process.
-       $(MAKE) clean
+       #$(MAKE) clean
 
        dh_clean
 
@@ -39,7 +39,7 @@ install: build
        dh_installdirs
        
        # Add here commands to install the package into debian/curcy.
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/curcy
+       #$(MAKE) install DESTDIR=$(CURDIR)/debian/curcy
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -49,6 +49,7 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
+       dh_install -X.svn
 #      dh_installdebconf
        dh_installdocs
        dh_installexamples