From 287bb27077bd340bec440028d047656f9ffc7b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 8 Apr 2010 07:54:33 +0000
Subject: [PATCH] Debian Packages can now be created, see #2

---
 ChangeLog                          |  2 +-
 configure.in                       |  3 ++-
 debian/{changelog => changelog.in} |  2 +-
 debian/rules                       | 18 +++++-------------
 makefile.am                        |  4 ++++
 proxyface/libproxyface.pc.in       | 11 +++++++++++
 proxyface/makefile.am              |  8 ++++++++
 7 files changed, 32 insertions(+), 16 deletions(-)
 rename debian/{changelog => changelog.in} (76%)
 create mode 100644 proxyface/libproxyface.pc.in

diff --git a/ChangeLog b/ChangeLog
index 13e3efe..6deddef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1 @@
-$Log$
+See Trac and Subversion: https://dev.marc.waeckerlin.org/projects/proxyface
diff --git a/configure.in b/configure.in
index cefdfeb..69de248 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,8 @@ AC_MSG_WARN(LEAST=$LEAST)
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
 
-AC_CONFIG_FILES([makefile proxyface/makefile])
+AC_CONFIG_FILES([makefile proxyface/makefile
+                 proxyface/libproxyface.pc debian/changelog])
 
 # programs
 AC_PROG_CXX
diff --git a/debian/changelog b/debian/changelog.in
similarity index 76%
rename from debian/changelog
rename to debian/changelog.in
index dc99398..ea0b968 100644
--- a/debian/changelog
+++ b/debian/changelog.in
@@ -1,4 +1,4 @@
-proxyface (1.0.34-1) unstable; urgency=low
+@PACKAGE@ (@VERSION@-1) unstable; urgency=low
 
   * See https://dev.marc.waeckerlin.org/projects/proxyface for changes
 
diff --git a/debian/rules b/debian/rules
index e3964b9..e7a4a62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,34 +34,28 @@ major=2
 
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"
+# does not work: LDFLAGS="-Wl,-z,defs"
 
 
 build: build-stamp
 build-stamp:  config.status 
 	dh_testdir
-
-	# Add here commands to compile the package.
 	$(MAKE)
-
 	touch $@
 
 clean: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f [Mm]akefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess
-
 	dh_clean 
 
 install: build
@@ -69,8 +63,6 @@ install: build
 	dh_testroot
 	dh_prep  
 	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
 
 
@@ -85,7 +77,7 @@ binary-arch: install
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
-#	dh_install
+	dh_install
 #	dh_installmenu
 #	dh_installdebconf
 #	dh_installlogrotate
@@ -95,7 +87,7 @@ binary-arch: install
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman
+#	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/makefile.am b/makefile.am
index 869858a..ff105c3 100644
--- a/makefile.am
+++ b/makefile.am
@@ -1,5 +1,9 @@
 SUBDIRS = proxyface
 
+EXTRA_DIST = bootstrap.sh debian
+
+DISTCLEANFILES = debian/changelog
+
 maintainer-clean-local:
 	- find . -name '*~' | xargs rm
 	- rm -r autom4te.cache
diff --git a/proxyface/libproxyface.pc.in b/proxyface/libproxyface.pc.in
new file mode 100644
index 0000000..57b0500
--- /dev/null
+++ b/proxyface/libproxyface.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: @PACKAGENAME@
+Description: C++/Qt/libproxy/WinHTTP GUI/WPAD Proxy Interface
+Version: @VERSION@
+Libs: -L${libdir} -lproxyface
+Libs.private: 
+Cflags: -I${includedir} 
diff --git a/proxyface/makefile.am b/proxyface/makefile.am
index e3da294..2dde3c0 100644
--- a/proxyface/makefile.am
+++ b/proxyface/makefile.am
@@ -3,9 +3,16 @@ MOCHEADER  = proxy.hxx autoproxy.hxx
 LANGUAGES  = proxy_de.qm proxy_en.qm proxy_fr.qm proxy_it.qm
 LANG_TS = proxy_de.ts proxy_en.ts proxy_fr.ts proxy_it.ts
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libproxyface.pc
+pkgconfig2dir = $(datarootdir)/pkgconfig
+pkgconfig2_DATA = libproxyface.pc
+
 UIHEADER   = ui_proxy.hxx
 MOCSOURCES = moc_proxy.cxx moc_autoproxy.cxx
 
+EXTRA_DIST = ${UISOURCES} $(pkgconfig_DATA).in
+
 BUILT_SOURCES = ${UIHEADER} ${MOCSOURCES} ${LANGUAGES}
 
 proxyfacedir = ${includedir}/proxyface
@@ -33,6 +40,7 @@ ui_%.hxx: %.ui
 	${LRELEASE} $< -qm $@
 
 CLEANFILES = ${UIHEADER} ${MOCSOURCES}
+DISTCLEANFILES = $(pkgconfig_DATA)
 
 maintainer-clean-local:
 	- find . -name '*~' | xargs rm