[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy/debian
From:       Ralf Nolden <nolden () kde ! org>
Date:       2003-02-20 14:13:56
[Download RAW message or body]

CVS commit by rnolden: 

hmpf, adding changes again that got lost...


  M +13 -13    rules   1.107


--- qt-copy/debian/rules  #1.106:1.107
@@ -28,5 +28,5 @@
 # build variables (directorys)
 DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libqt3c102
+P_LIBS = $(DEBIAN)/libqt3
 P_DOC = $(DEBIAN)/qt3-doc
 P_DEV = $(DEBIAN)/libqt3-dev
@@ -46,5 +46,5 @@
                 -plugin-style-motifplus -I/usr/include/mysql \
                -I/usr/include/freetype2 \
                 -I/usr/include/postgresql -I/usr/include/postgresql/server \
-                -lfontconfig -no-stl $(XINERAMA) -system-nas-sound -cups -xft \
+                -no-stl $(XINERAMA) -system-nas-sound -cups -xft \
                 -sm -no-exceptions -platform linux-g++ -fast
 
@@ -277,6 +277,12 @@
         cp -ax examples `pwd`/debian/doc/qt3-examples
         cp -ax tutorial `pwd`/debian/doc/qt3-examples
-        cp -ax tools/designer/examples \
                `pwd`/debian/doc/qt3-examples/tools/designer/examples
-        cp -ax tools/linguist/tutorial \
`pwd`/debian/doc/qt3-examples/tools/linguist/tutorial +        cp -ax \
tools/designer/examples `pwd`/debian/doc/qt3-examples/tools/designer/ +        cp -ax \
tools/linguist/tutorial `pwd`/debian/doc/qt3-examples/tools/linguist/ +        for a \
in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt1'`; \
do rm -f "$$a"; done +        for a in `cd $(DEBIAN)/doc/qt3-examples/ && find \
$(DEBIAN)/doc/qt3-examples/ -name 'tt2'`; do rm -f "$$a"; done +        for a in `cd \
$(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt3'`; do rm \
-f "$$a"; done +        for a in `cd $(DEBIAN)/doc/qt3-examples/ && find \
$(DEBIAN)/doc/qt3-examples/ -name '.moc'`; do rm -rf "$$a"; done +        for a in \
`cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.obj'`; do \
rm -rf "$$a"; done +        for a in `cd $(DEBIAN)/doc/qt3-examples/ && find \
                $(DEBIAN)/doc/qt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
         install -D `pwd`/debian/maintain/build-examples.sh \
`pwd`/debian/doc/qt3-examples/build-examples  chmod 755 \
`pwd`/debian/doc/qt3-examples/build-examples @@ -299,7 +305,4 @@
         dh_shlibdeps -i
 
-        # fix shlibdeps madness
-        for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs \
                (>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done
-
         dh_gencontrol -i
         dh_md5sums -i
@@ -400,8 +403,5 @@
         dh_installdeb -a
         dh_perl -a
-        dh_shlibdeps -a \
                -l`pwd`/debian/libqt3c102/usr/lib:`pwd`/debian/libqt3c102-mt/usr/lib
-        
-        # fix shlibdeps madness
-        for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs \
(>> 4.1.0)//g' > "$$a".new &&  mv "$$a.new" "$$a"; done +        dh_shlibdeps -a \
-l`pwd`/debian/libqt3/usr/lib:`pwd`/debian/libqt3-mt/usr/lib  
         dh_gencontrol


[prev in list] [next in list] [prev in thread] [next in thread]