From 798c0e8109916b7e8cfbfc4f7e0b743a97b6e4a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 15 Apr 2010 13:15:29 +0000
Subject: [PATCH] bugfixes for debian, see #2

---
 configure.in                                     | 10 +++++++---
 debian/control                                   |  2 +-
 debian/{proxyface1.dirs => proxyface.dirs}       |  0
 debian/{proxyface1.install => proxyface.install} |  0
 debian/rules                                     |  2 +-
 proxyface/libproxyface.pc.in                     |  2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)
 rename debian/{proxyface1.dirs => proxyface.dirs} (100%)
 rename debian/{proxyface1.install => proxyface.install} (100%)

diff --git a/configure.in b/configure.in
index 9f61089..62bfced 100644
--- a/configure.in
+++ b/configure.in
@@ -4,9 +4,13 @@ AC_INIT([README])
 PACKAGENAME=proxyface
 MAJOR=1
 MINOR=0
-LEAST='$Revision$'
-LEAST=${LEAST#* }
-LEAST=${LEAST% *}
+LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+for path in . .. ../..; do
+  if svn info $path 2>&1 > /dev/null; then
+    LEAST=$(LANG= svn info $path | sed -n 's/Revision: //p')
+    break;
+  fi
+done
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
 
diff --git a/debian/control b/debian/control
index e818bb8..a55d745 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Description: C++ WPAD Interface for all Operating Systems
  .
  For more details, see: https://dev.marc.waeckerlin.org/projects/proxyface
 
-Package: proxyface1
+Package: proxyface
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/proxyface1.dirs b/debian/proxyface.dirs
similarity index 100%
rename from debian/proxyface1.dirs
rename to debian/proxyface.dirs
diff --git a/debian/proxyface1.install b/debian/proxyface.install
similarity index 100%
rename from debian/proxyface1.install
rename to debian/proxyface.install
diff --git a/debian/rules b/debian/rules
index e7a4a62..6f128b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,7 @@ binary-arch: install
 	dh_fixperms
 #	dh_perl
 #	dh_python
-#	dh_makeshlibs
+	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/proxyface/libproxyface.pc.in b/proxyface/libproxyface.pc.in
index 57b0500..756980b 100644
--- a/proxyface/libproxyface.pc.in
+++ b/proxyface/libproxyface.pc.in
@@ -1,4 +1,4 @@
-prefix=@PREFIX@
+prefix=@PACKAGENAME@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include