[Pkg-xfce-commits] r3586 - desktop/trunk/exo/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2009-10-17 13:10:37 +0000 (Sat, 17 Oct 2009)
New Revision: 3586

Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/rules
Log:
* debian/rules:
  - simplify rules file.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2009-10-17 12:51:08 UTC (rev 3585)
+++ desktop/trunk/exo/debian/changelog	2009-10-17 13:10:37 UTC (rev 3586)
@@ -7,8 +7,10 @@
       versionned dir.
   * add a new libexo-common packages containing mount options file,
     documentation, helper files.
+  * debian/rules:
+    - simplify rules file.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 Oct 2009 14:34:41 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 Oct 2009 15:10:25 +0200
 
 exo (0.3.104-2) unstable; urgency=low
 

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2009-10-17 12:51:08 UTC (rev 3585)
+++ desktop/trunk/exo/debian/rules	2009-10-17 13:10:37 UTC (rev 3586)
@@ -6,43 +6,11 @@
 
 include /usr/share/quilt/quilt.make
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-# determine current exo version
-EXOVERS=$(shell sed -ne 's/^Package: libexo-\([0-9]\{1,\}\.[0-9]\{1,\}\)-[0-9]\{1,\}/\1/p' debian/control)
-
-# determine python version in use
-#PYVERS=$(shell sed -ne 's/^Build-Depends:.*python\([0-9]\{1,\}\.[0-9]\{1,\}\)-dev.*/\1/p' debian/control)
-
-# determine library package name
-LIBRARY_PKGNAME=$(shell sed -ne 's/^Package: \(libexo-[0-9]\{1,\}\.[0-9]\{1,\}-[0-9]\{1,\}\)/\1/p' debian/control)
-
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls exo/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls exo/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python --enable-notifications
+	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python --enable-notifications
 
-
 build: patch build-stamp
 build-stamp:  config.status
 	dh_testdir
@@ -71,18 +39,6 @@
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	# rename the exo gtk-docs directory to avoid conflicting -dev
-	# packages
-	#(cd $(CURDIR)/debian/tmp/usr/share/gtk-doc/html \
-	# && mv exo exo-$(EXOVERS))
-
-	# move the pyexo.py away, will be managed as an alternative
-	#-(cd $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages \
-	#&& mv pyexo.py pyexo.py.python$(PYVERS)-exo$(EXOVERS))
-
-	# delete unused static library
-	-rm -f $(CURDIR)/debian/tmp/usr/lib/python$(PYVERS)/site-packages/exo-$(EXOVERS)/_exo.a
-
 	# delete the unneeded .a and .la files
 	rm -f debian/tmp/usr/lib/libexo-hal-0.3.la
 	rm -f debian/tmp/usr/lib/libexo-0.3.la
@@ -92,9 +48,6 @@
 		-e 's/TerminalEmulator=.*/TerminalEmulator=debian-x-terminal-emulator/' \
 		debian/tmp/etc/xdg/xfce4/helpers.rc
 
-	# delete all pre-compiled python files
-	#-find $(CURDIR)/debian/tmp -name '*.py[co]' -exec rm -f '{}' ';'
-
 	chrpath -d -k debian/tmp/usr/bin/exo-csource \
 		debian/tmp/usr/bin/exo-desktop-item-edit \
 		debian/tmp/usr/bin/exo-open \
@@ -126,10 +79,9 @@
 	dh_strip --dbg-package=libexo-0.3-0-dbg
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -p$(LIBRARY_PKGNAME)
-	#dh_python
+	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps -L $(LIBRARY_PKGNAME) -l debian/$(LIBRARY_PKGNAME)/usr/lib
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb