From 3f74c6c562699f32e124239ecdbf926ea73c1c9c Mon Sep 17 00:00:00 2001
From: gregor herrmann <gregoa@debian.org>
Date: Sat, 28 Nov 2009 20:34:18 +0100
Subject: [PATCH] Import Debian changes 1.3.0~svn316-2.1

libg15render (1.3.0~svn316-2.1) unstable; urgency=low

  * Non-maintainer upload.
  * Fix "fails to install, trying to overwrite other packages files"
    by adding a Replaces (closes: #543360).
  * debian/rules: s/rf/rm/.
---
 debian/changelog | 9 +++++++++
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f3fb91c..c43fcdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libg15render (1.3.0~svn316-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "fails to install, trying to overwrite other packages files"
+    by adding a Replaces (closes: #543360).
+  * debian/rules: s/rf/rm/.
+
+ -- gregor herrmann <gregoa@debian.org>  Sat, 28 Nov 2009 20:34:18 +0100
+
 libg15render (1.3.0~svn316-2) unstable; urgency=low
 
   * install also the fonts (Closes: #541048)
diff --git a/debian/control b/debian/control
index 68eb9ee..2370cfd 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Package: libg15render-dev
 Section: libdevel
 Architecture: any
 Depends: libg15render1 (= ${binary:Version}), ${misc:Depends}
+Replaces: libg15render1 (<< ${source:Version})
 Description: Library for interfacing with the Logitech G15 keyboards
  libg15 provides an API for low level control of the LCD display and
  the extra keys on some Logitech keyboards (G11, G15)
diff --git a/debian/rules b/debian/rules
index 9b9a67d..3e30ffe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ AUTOMAKE_REMOVE += libtool stamp-h1 .libs src/.libs
 UPSTREAM_DEBIANDIR_REMOVE := debian/dirs
 clean::
 	-rm -Rf $(AUTOMAKE_REMOVE)
-	-rf -f $(UPSTREAM_DEBIANDIR_REMOVE)
+	-rm -f $(UPSTREAM_DEBIANDIR_REMOVE)
 
 makebuilddir:: Makefile