Debian Packages can now be created, see #2
This commit is contained in:
		| @@ -1 +1 @@ | |||||||
| $Log$ | See Trac and Subversion: https://dev.marc.waeckerlin.org/projects/proxyface | ||||||
|   | |||||||
| @@ -12,7 +12,8 @@ AC_MSG_WARN(LEAST=$LEAST) | |||||||
|  |  | ||||||
| AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org]) | 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 | # programs | ||||||
| AC_PROG_CXX | AC_PROG_CXX | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								debian/changelog → debian/changelog.in
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/changelog → debian/changelog.in
									
									
									
									
										vendored
									
									
								
							| @@ -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 |   * See https://dev.marc.waeckerlin.org/projects/proxyface for changes | ||||||
| 
 | 
 | ||||||
							
								
								
									
										18
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								debian/rules
									
									
									
									
										vendored
									
									
								
							| @@ -34,34 +34,28 @@ major=2 | |||||||
|  |  | ||||||
| config.status: configure | config.status: configure | ||||||
| 	dh_testdir | 	dh_testdir | ||||||
| 	# Add here commands to configure the package. |  | ||||||
| ifneq "$(wildcard /usr/share/misc/config.sub)" "" | ifneq "$(wildcard /usr/share/misc/config.sub)" "" | ||||||
| 	cp -f /usr/share/misc/config.sub config.sub | 	cp -f /usr/share/misc/config.sub config.sub | ||||||
| endif | endif | ||||||
| ifneq "$(wildcard /usr/share/misc/config.guess)" "" | ifneq "$(wildcard /usr/share/misc/config.guess)" "" | ||||||
| 	cp -f /usr/share/misc/config.guess config.guess | 	cp -f /usr/share/misc/config.guess config.guess | ||||||
| endif | 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: build-stamp | ||||||
| build-stamp:  config.status  | build-stamp:  config.status  | ||||||
| 	dh_testdir | 	dh_testdir | ||||||
|  |  | ||||||
| 	# Add here commands to compile the package. |  | ||||||
| 	$(MAKE) | 	$(MAKE) | ||||||
|  |  | ||||||
| 	touch $@ | 	touch $@ | ||||||
|  |  | ||||||
| clean:  | clean:  | ||||||
| 	dh_testdir | 	dh_testdir | ||||||
| 	dh_testroot | 	dh_testroot | ||||||
| 	rm -f build-stamp  | 	rm -f build-stamp  | ||||||
|  | 	[ ! -f [Mm]akefile ] || $(MAKE) distclean | ||||||
| 	# Add here commands to clean up after the build process. |  | ||||||
| 	[ ! -f Makefile ] || $(MAKE) distclean |  | ||||||
| 	rm -f config.sub config.guess | 	rm -f config.sub config.guess | ||||||
|  |  | ||||||
| 	dh_clean  | 	dh_clean  | ||||||
|  |  | ||||||
| install: build | install: build | ||||||
| @@ -69,8 +63,6 @@ install: build | |||||||
| 	dh_testroot | 	dh_testroot | ||||||
| 	dh_prep   | 	dh_prep   | ||||||
| 	dh_installdirs | 	dh_installdirs | ||||||
|  |  | ||||||
| 	# Add here commands to install the package into debian/tmp |  | ||||||
| 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install | 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -85,7 +77,7 @@ binary-arch: install | |||||||
| 	dh_installchangelogs ChangeLog | 	dh_installchangelogs ChangeLog | ||||||
| 	dh_installdocs | 	dh_installdocs | ||||||
| 	dh_installexamples | 	dh_installexamples | ||||||
| #	dh_install | 	dh_install | ||||||
| #	dh_installmenu | #	dh_installmenu | ||||||
| #	dh_installdebconf | #	dh_installdebconf | ||||||
| #	dh_installlogrotate | #	dh_installlogrotate | ||||||
| @@ -95,7 +87,7 @@ binary-arch: install | |||||||
| #	dh_installinit | #	dh_installinit | ||||||
| #	dh_installcron | #	dh_installcron | ||||||
| #	dh_installinfo | #	dh_installinfo | ||||||
| 	dh_installman | #	dh_installman | ||||||
| 	dh_link | 	dh_link | ||||||
| 	dh_strip | 	dh_strip | ||||||
| 	dh_compress | 	dh_compress | ||||||
|   | |||||||
| @@ -1,5 +1,9 @@ | |||||||
| SUBDIRS = proxyface | SUBDIRS = proxyface | ||||||
|  |  | ||||||
|  | EXTRA_DIST = bootstrap.sh debian | ||||||
|  |  | ||||||
|  | DISTCLEANFILES = debian/changelog | ||||||
|  |  | ||||||
| maintainer-clean-local: | maintainer-clean-local: | ||||||
| 	- find . -name '*~' | xargs rm | 	- find . -name '*~' | xargs rm | ||||||
| 	- rm -r autom4te.cache | 	- rm -r autom4te.cache | ||||||
|   | |||||||
							
								
								
									
										11
									
								
								proxyface/libproxyface.pc.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								proxyface/libproxyface.pc.in
									
									
									
									
									
										Normal file
									
								
							| @@ -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}  | ||||||
| @@ -3,9 +3,16 @@ MOCHEADER  = proxy.hxx autoproxy.hxx | |||||||
| LANGUAGES  = proxy_de.qm proxy_en.qm proxy_fr.qm proxy_it.qm | 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 | 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 | UIHEADER   = ui_proxy.hxx | ||||||
| MOCSOURCES = moc_proxy.cxx moc_autoproxy.cxx | MOCSOURCES = moc_proxy.cxx moc_autoproxy.cxx | ||||||
|  |  | ||||||
|  | EXTRA_DIST = ${UISOURCES} $(pkgconfig_DATA).in | ||||||
|  |  | ||||||
| BUILT_SOURCES = ${UIHEADER} ${MOCSOURCES} ${LANGUAGES} | BUILT_SOURCES = ${UIHEADER} ${MOCSOURCES} ${LANGUAGES} | ||||||
|  |  | ||||||
| proxyfacedir = ${includedir}/proxyface | proxyfacedir = ${includedir}/proxyface | ||||||
| @@ -33,6 +40,7 @@ ui_%.hxx: %.ui | |||||||
| 	${LRELEASE} $< -qm $@ | 	${LRELEASE} $< -qm $@ | ||||||
|  |  | ||||||
| CLEANFILES = ${UIHEADER} ${MOCSOURCES} | CLEANFILES = ${UIHEADER} ${MOCSOURCES} | ||||||
|  | DISTCLEANFILES = $(pkgconfig_DATA) | ||||||
|  |  | ||||||
| maintainer-clean-local: | maintainer-clean-local: | ||||||
| 	- find . -name '*~' | xargs rm | 	- find . -name '*~' | xargs rm | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user