Merge branch 'master' of ssh://lxde.git.sourceforge.net/gitroot/lxde/gpicview
authorJulien Lavergne <julien.lavergne@gmail.com>
Thu, 23 Jun 2011 17:03:33 +0000 (19:03 +0200)
committerJulien Lavergne <julien.lavergne@gmail.com>
Thu, 23 Jun 2011 17:03:33 +0000 (19:03 +0200)
debian/manpages [new file with mode: 0644]
debian/rules

diff --git a/debian/manpages b/debian/manpages
new file mode 100644 (file)
index 0000000..66fe13b
--- /dev/null
@@ -0,0 +1 @@
+debian/gpicview.1
index cc09fcd..f819d6d 100755 (executable)
@@ -11,7 +11,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g -Wl,-z,defs
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
@@ -19,64 +19,9 @@ else
     CFLAGS += -O2
 endif
 
+%:
+       dh $@
 
-config.status: configure 
-       dh_testdir
+override_dh_auto_configure:
        ./autogen.sh
-       CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure \
-       --host=$(DEB_HOST_GNU_TYPE) \
-       --build=$(DEB_BUILD_GNU_TYPE) \
-       --prefix=/usr \
-       --mandir=\$${prefix}/share/man \
-       --infodir=\$${prefix}/share/info 
-
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
-       $(MAKE)
-
-       touch $@
-
-clean: 
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       [ ! -f Makefile ] || $(MAKE) distclean
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       $(MAKE) DESTDIR=$(CURDIR)/debian/gpicview install
-       sed 's/Application;//' gpicview.desktop.in > debian/gpicview/usr/share/applications/gpicview.desktop
-
-binary-indep: build install
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_install
-       dh_installman -A debian/gpicview.1
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+       dh_auto_configure