[Pkg-lyx-devel] svn commit: r511 - in /lyx/branches/lyx-1.6/debian: changelog lyx-common.dirs rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Wed Jul 23 20:46:29 2008
New Revision: 511

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=511
Log:
Misc improvements to debian/rules.

Added:
    lyx/branches/lyx-1.6/debian/lyx-common.dirs
Modified:
    lyx/branches/lyx-1.6/debian/changelog
    lyx/branches/lyx-1.6/debian/rules

Modified: lyx/branches/lyx-1.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.6/debian/changelog?rev=511&op=diff
==============================================================================
--- lyx/branches/lyx-1.6/debian/changelog (original)
+++ lyx/branches/lyx-1.6/debian/changelog Wed Jul 23 20:46:29 2008
@@ -8,6 +8,7 @@
   
   [ Per Olofsson ]
   * Use new features in debhelper v7 to shorten debian/rules.
+  * Misc improvements to debian/rules.
 
  -- Sven Hoexter <sven at timegate.de>  Sun, 20 Jul 2008 16:28:52 +0200
 

Added: lyx/branches/lyx-1.6/debian/lyx-common.dirs
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.6/debian/lyx-common.dirs?rev=511&op=file
==============================================================================
--- lyx/branches/lyx-1.6/debian/lyx-common.dirs (added)
+++ lyx/branches/lyx-1.6/debian/lyx-common.dirs Wed Jul 23 20:46:29 2008
@@ -1,0 +1,2 @@
+usr/share/texmf/tex/latex
+etc/bash_completion.d

Modified: lyx/branches/lyx-1.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/branches/lyx-1.6/debian/rules?rev=511&op=diff
==============================================================================
--- lyx/branches/lyx-1.6/debian/rules (original)
+++ lyx/branches/lyx-1.6/debian/rules Wed Jul 23 20:46:29 2008
@@ -15,7 +15,6 @@
 
 CONFIGURE_OPTIONS += \
 	--prefix=/usr \
-	--infodir=/usr/share/info \
 	--mandir=/usr/share/man \
 	--disable-dependency-tracking \
 	--disable-rpath \
@@ -28,8 +27,6 @@
 	--with-x \
 	--without-included-gettext \
 	--without-included-boost \
-
-CXXFLAGS ?= -g -O2
 
 ifeq ($(DEB_HOST_ARCH),hppa)
 	CXXFLAGS += -ffunction-sections
@@ -47,8 +44,7 @@
 	fi
 
 	test -d build-tree || mkdir build-tree
-	cd build-tree && CXXFLAGS="$(CXXFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" ../configure $(CONFIGURE_OPTIONS)
+	cd build-tree && ../configure $(CONFIGURE_OPTIONS)
 
 	touch configure-stamp
 
@@ -58,13 +54,12 @@
 	cd build-tree && $(MAKE)
 	touch build-stamp
 
-clean: clean1 unpatch
-clean1:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 
-	rm -rf build-tree
-	! [ -f config/config.sub.backup ] || \
+	! test -e build-tree || rm -r build-tree
+	! test -f config/config.sub.backup || \
 		mv config/config.sub.backup config/config.sub
 
 # clean out compiled python code left around after building
@@ -73,43 +68,40 @@
 	dh_clean
 
 install: build
+# hack: remove debhelper logs so that install target is idempotent
+	rm -f debian/*.log
+
 	dh_testdir
 	dh_testroot
 	dh_prep
 
-	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common/
+	cd build-tree && $(MAKE) install DESTDIR=`pwd`/../debian/lyx-common
 
 	dh_installdirs
 	dh_install
 
+# move binaries to arch package
 	mv debian/lyx-common/usr/bin debian/lyx/usr/bin
 	mv debian/lyx-common/usr/share/man debian/lyx/usr/share/man
 
-	mkdir -p debian/lyx-common/etc/bash_completion.d
-	cp debian/bash_completion debian/lyx-common/etc/bash_completion.d/lyx
-
+# remove profiling (why?)
 	rm debian/lyx-common/usr/share/lyx/lyx2lyx/profiling.py*
+# remove font directory as fonts are in the package latex-xft-fonts
 	rm -r debian/lyx-common/usr/share/lyx/fonts
 
-	mkdir -p debian/lyx-common/usr/share/texmf/tex/latex/lyx
-	mv debian/lyx-common/usr/share/lyx/tex/* \
-		debian/lyx-common/usr/share/texmf/tex/latex/lyx/
-	rmdir debian/lyx-common/usr/share/lyx/tex/
+	mv debian/lyx-common/usr/share/lyx/tex \
+		debian/lyx-common/usr/share/texmf/tex/latex/lyx
+	cp debian/bash_completion debian/lyx-common/etc/bash_completion.d/lyx
 
 	ln -s ../../../../lyx/images/lyx.xpm \
 		debian/lyx/usr/share/icons/hicolor/48x48/apps/lyx.xpm
 	cp debian/lyx-32x32.xpm \
 		debian/lyx/usr/share/icons/hicolor/32x32/apps/lyx.xpm
 
-	chmod +x debian/lyx-common/usr/share/lyx/scripts/*
-	chmod +x debian/lyx-common/usr/share/lyx/lyx2lyx/lyx2lyx
-
 	dh_pysupport /usr/share/lyx
 
+# now run the rest of the debhelper commands
 	dh install --after dh_install
-
-# remove compiled python files, if any
-	find debian/lyx-common -name '*.pyc' -exec rm -v {} \;
 
 binary-indep: build install
 	dh binary-indep --before builddeb
@@ -120,6 +112,3 @@
 	dh_builddeb -a -- -Z bzip2
 
 binary: binary-indep binary-arch
-
-.PHONY: build build-arch build-indep clean clean1 \
-	binary-indep binary-arch binary install configure