r35621 - in /packages/z88/trunk/debian: changelog get-orig-source patches/00list patches/50_all_changes.dpatch rules

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Sun Apr 5 02:30:50 UTC 2009


Author: domibel-guest
Date: Sun Apr  5 02:30:49 2009
New Revision: 35621

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35621
Log:
repackaged

Modified:
    packages/z88/trunk/debian/changelog
    packages/z88/trunk/debian/get-orig-source
    packages/z88/trunk/debian/patches/00list
    packages/z88/trunk/debian/patches/50_all_changes.dpatch
    packages/z88/trunk/debian/rules

Modified: packages/z88/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/changelog?rev=35621&op=diff
==============================================================================
--- packages/z88/trunk/debian/changelog (original)
+++ packages/z88/trunk/debian/changelog Sun Apr  5 02:30:49 2009
@@ -1,3 +1,15 @@
+z88 (13.0.0+dfsg2-1) unstable; urgency=low
+
+  * New upstream version doesn't depend on libmotif-dev anymore. It's
+    using GTK+ instead. Because z88 doesn't depend on libmotif-dev
+    anymore the package can go from contrib to main.
+  * z88-data will be build only in build-indep not in build-arch anymore
+  * debian/get-orig-source: upstream's source package doesn't separate
+    source files, data files, documentaion files and build files.
+    debian/get-orig-source creates some subfolder for a better overview
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Sat, 04 Apr 2009 12:49:38 -0400
+
 z88 (13.0.0+dfsg1-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/z88/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/get-orig-source?rev=35621&op=diff
==============================================================================
--- packages/z88/trunk/debian/get-orig-source (original)
+++ packages/z88/trunk/debian/get-orig-source Sun Apr  5 02:30:49 2009
@@ -1,31 +1,31 @@
-VERSION=12.0.1
-VERSIONDFSG=12.0.1+dfsg1
+#!/bin/sh
+set -ex
 
-wget -c ftp://ftp.uni-bayreuth.de/pub/uni-bayreuth/LS-CAD/unix/z88src.tgz
-mkdir z88-$VERSIONDFSG
-cd z88-$VERSIONDFSG
-tar -xzf ../z88src.tgz
+VERSIONDFSG=13.0.0+dfsg2
+
+wget -c http://user.cs.tu-berlin.de/~domibel/z88/z88130.tar.gz
+mkdir z88-${VERSIONDFSG}
+cd z88-${VERSIONDFSG}
+tar -xzf ../z88130.tar.gz     # file doesn't contain folder
 chmod 644 *
-rm *.pdf
-#mkdir pdf
-#mv *.pdf pdf
 mkdir html
 mv *.htm html
 mv *.gif html
 mv *.jpg html
-rm -f *mk*
-rm -f COM*
 mkdir src
 mv *.c src/
 mv *.h src/
-rm z88.fcd.*
 mkdir data
 mv b* data/
 mv z88x.dxf data/
 mv z88*txt data/
+mkdir oldmake
+mv *mk* oldmake
+mv COMP* oldmake
+mv z88.fcd.linux oldmake/
 cd ..
 echo "Creating orig tarball."
-GZIP=-9 tar -czf z88_$VERSIONDFSG.orig.tar.gz z88-$VERSIONDFSG/
+GZIP=-9 tar -czf z88_${VERSIONDFSG}.orig.tar.gz z88-${VERSIONDFSG}/
 echo "Removing extracted directory."
-rm -rf z88-$VERSIONDFSG
-rm z88src.tgz
+rm -rf z88-${VERSIONDFSG}
+rm z88130.tar.gz

Modified: packages/z88/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/patches/00list?rev=35621&op=diff
==============================================================================
--- packages/z88/trunk/debian/patches/00list (original)
+++ packages/z88/trunk/debian/patches/00list Sun Apr  5 02:30:49 2009
@@ -1,1 +1,1 @@
-#50_all_changes.dpatch
+50_all_changes.dpatch

Modified: packages/z88/trunk/debian/patches/50_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/patches/50_all_changes.dpatch?rev=35621&op=diff
==============================================================================
--- packages/z88/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/z88/trunk/debian/patches/50_all_changes.dpatch Sun Apr  5 02:30:49 2009
@@ -2,53 +2,272 @@
 ## 50_all_changes.dpatch by  <domibel at sid1500>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: corrects some documentation paths
+## DP: This patch replaces old Makefiles by a cmake file,
+## DP: fixes some paths to the html documentation and
+## DP: adds a missing start script (taken from v12)
 
 @DPATCH@
-diff -urNad z88-12.0.1+dfsg1~/src/wrim88i.c z88-12.0.1+dfsg1/src/wrim88i.c
---- z88-12.0.1+dfsg1~/src/wrim88i.c	2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1+dfsg1/src/wrim88i.c	2009-02-27 15:16:48.000000000 -0500
-@@ -175,7 +175,7 @@
- dann starten Sie den Solver Part2: Z88I2\n");
+diff -urNad z88-13.0.0+dfsg2~/src/CMakeLists.txt z88-13.0.0+dfsg2/src/CMakeLists.txt
+--- z88-13.0.0+dfsg2~/src/CMakeLists.txt	1969-12-31 19:00:00.000000000 -0500
++++ z88-13.0.0+dfsg2/src/CMakeLists.txt	2009-04-04 22:06:03.000000000 -0400
+@@ -0,0 +1,96 @@
++# The name of our project is "Z88". CMakeLists files in this project can
++# refer to the root source directory of the project as ${Z88_SOURCE_DIR} and
++# to the root binary directory of the project as ${Z88_BINARY_DIR}.
++cmake_minimum_required (VERSION 2.6)
++project (Z88)
++
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFR_UNIX -DFR_XINT -DFR_XDOUB -DFR_LINUX -O3 -fomit-frame-pointer")
++
++#FIND_PACKAGE(GTK REQUIRED)
++#IF (GTK_FOUND)
++#  INCLUDE_DIRECTORIES (${GTK_INCLUDE_DIR} /usr/include/gtk-2.0/)
++#  LINK_LIBRARIES( ${GTK_LIBRARIES} )
++#ELSE (GTK_FOUND)
++#  MESSAGE( FATAL_ERROR "This application requires GTK. One of these components is missing. Please verify configuration")
++#ENDIF (GTK_FOUND)
++
++INCLUDE_DIRECTORIES ( /usr/include/gtk-2.0/ /usr/lib/gtk-2.0/include /usr/include/atk-1.0 /usr/include/cairo /usr/include/pango-1.0 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/pixman-1 /usr/include/freetype2 /usr/include/directfb /usr/include/libpng12 /usr/include/gtkglext-1.0 /usr/lib/gtkglext-1.0/include)
++LINK_LIBRARIES ( gtk-x11-2.0 gdk-x11-2.0 atk-1.0 pangoft2-1.0 gdk_pixbuf-2.0 m pangocairo-1.0 gio-2.0 cairo pango-1.0 freetype fontconfig gobject-2.0 gmodule-2.0 glib-2.0 GL GLU gtkglext-x11-1.0 gdkglext-x11-1.0)
++
++#  GTK_INCLUDE_DIR   - Directories to include to use GTK
++#  GTK_LIBRARIES     - Files to link against to use GTK
++#  GTK_FOUND         - GTK was found
++#  GTK_GL_FOUND   
++
++
++# Recurse into the "Hello" and "Demo" subdirectories. This does not actually
++# cause another cmake executable to run. The same process will walk through
++# the project's entire directory structure.
++#add_subdirectory (Hello)
++#add_subdirectory (Demo) 
++
++# Make sure the compiler can find include files from our library.
++include_directories (${Z88_SOURCE_DIR})
++
++# Make sure the linker can find the library once it is built.
++link_directories (${Z88_BINARY_DIR})
++
++add_executable ( z88f z88f.c ale88f dyn88f clr88 choy88 m1 m2 stop88f 
++   cshe88 hexa88 lqua88 qshe88 isod88 tetr88 spur88 
++   apla88 spla88 hpla88 ri188 who88f wlog88f prfl88 
++   bhexa88 btetr88 bqshe88 bspla88 bspur88 blqua88 bcshe88 
++   bapla88 bhpla88 ri588 wrim88f wria88f lan88f z88a z88b z88cc )
++target_link_libraries (z88f m)
++
++
++add_executable ( z88i1 z88i1.c ale88i dyn88i1 clr88 w4y88i stop88i ri188i
++   who88i1 wlog88i1 wrim88i wria88i lan88i1 z88ai )
++target_link_libraries (z88i1 m)
++
++add_executable ( z88i2 z88i2.c ale88i dyn88i2 clr88 jaco88 m1 m2 stop88i cshe88
++   hexa88 lqua88 qshe88 isod88 tetr88 spur88 apla88  spla88 hpla88 r4y88i r1y88i
++   who88i2 wlog88i2 prfl88 wrim88i lan88i2 z88bi z88ci ri588i bhexa88 btetr88
++   bqshe88 bspla88 bspur88 blqua88 bcshe88 bapla88 bhpla88 )
++target_link_libraries (z88i2 m)
++
++add_executable( z88e z88e.c ale88e dyn88e clr88 m1 m2 stop88e cshe88 
++   hexa88 lqua88 qshe88 isod88 tetr88 spur88 spla88 hpla88 apla88 riy88
++   forc88 who88e wlog88e wrim88e lan88e )
++target_link_libraries (z88e m) 
++
++add_executable( z88d z88d.c ale88d dyn88d clr88 m3 m4 fuvs88 stop88d scsh88
++   shex88 slqu88 sqsh88 siso88 stet88 sspu88 sapl88 sspl88 shpl88 riy88d
++   span88 who88d wlog88d wrim88d lan88d )
++target_link_libraries (z88d m)
++
++add_executable( z88n z88n.c ale88n dyn88n clr88 join88 subn88 stop88n mc188n
++   mc288n mc388n mc488n mc588n rni88 who88n wlog88n wrim88n lan88n )
++target_link_libraries (z88n m)
++
++add_executable( z88v z88v.c ale88v dyn88v clr88 stop88v fr_func vend88 g1i188
++   g2i188 g3i188 g4i188 g5i188 gxi288 g1i388 g1i488 gxi588 lan88v wlog88v who88v )
++target_link_libraries (z88v)
++
++add_executable( z88x z88x.c ale88x dyn88x clr88 koi88x rea88x stop88x sub88x
++   who88x wlog88x wria88x wrim88x z88fx z88tx lan88x )
++target_link_libraries (z88x m)
++
++add_executable( z88g z88g.c ale88g clr88 stop88g cosm88 nast88 dnas88 who88g wlog88g wrim88g lan88g )
++target_link_libraries (z88g)
++
++add_executable( z88h z88h.c ale88h clr88 stop88h who88h wlog88h wrim88h lan88h rdy88h )
++target_link_libraries (z88h)
++
++add_executable( z88o z88o.c cb88o lan88o dyn88o wlog88o ale88o rcoo88
++   m9 m10 m12 m15 oc88 m16 )
++
++add_executable( z88com z88com.c cb88c ale88c lan88c wlog88c rcol88c )
++
++
++#gcc -DFR_UNIX -DFR_LINUX -DFR_XDOUB -DFR_XLONG -I. -O3 -fomit-frame-pointer
++# `pkg-config --cflags --libs gtk+-2.0 gdkglext-1.0 gdkglext-x11-1.0 gtkglext-1.0 gtkglext-x11-1.0`    -c -o z88o.o z88o.c
++
++install(TARGETS z88f z88i1 z88i2 z88e z88d z88n z88v z88x z88g z88h z88com z88o
++    RUNTIME DESTINATION bin
++    )
++
+diff -urNad z88-13.0.0+dfsg2~/src/ale88c.c z88-13.0.0+dfsg2/src/ale88c.c
+--- z88-13.0.0+dfsg2~/src/ale88c.c	2008-11-23 11:02:07.000000000 -0500
++++ z88-13.0.0+dfsg2/src/ale88c.c	2009-04-04 22:07:25.000000000 -0400
+@@ -144,7 +144,7 @@
+ 
+   case AL_NOZ88F:
+     if(LANG == 1) strcpy(cmess,"Kann Z88F nicht starten!");
+-    if(LANG == 2) strcpy(cmess,"Cannot lauch Z88F!");
++    if(LANG == 2) strcpy(cmess,"Cannot launch Z88F!");
+   break;
+ 
+   case AL_NOZ88E:
+diff -urNad z88-13.0.0+dfsg2~/src/cb88c.c z88-13.0.0+dfsg2/src/cb88c.c
+--- z88-13.0.0+dfsg2~/src/cb88c.c	2009-04-04 22:03:34.000000000 -0400
++++ z88-13.0.0+dfsg2/src/cb88c.c	2009-04-04 22:06:03.000000000 -0400
+@@ -74,8 +74,8 @@
+ strcpy(command,CBROWSER);
+ strcat(command," ");
+ strcat(command,CPREFIX);
+-if(LANG == 1) strcat(command,"g88ge.htm");
+-if(LANG == 2) strcat(command,"e88ge.htm");
++if(LANG == 1) strcat(command,"g88ix.htm");
++if(LANG == 2) strcat(command,"e88ix.htm");
+ iret= system(command);
+ if(iret != 0) ale88c(AL_NOHELP);
+ }
+@@ -630,8 +630,8 @@
+   strcpy(command,CBROWSER);
+   strcat(command," ");
+   strcat(command,CPREFIX);
+-  if(LANG == 1) strcat(command,"g88ge.htm");
+-  if(LANG == 2) strcat(command,"e88ge.htm");
++  if(LANG == 1) strcat(command,"g88ix.htm");
++  if(LANG == 2) strcat(command,"e88ix.htm");
+   iret= system(command);
+   if(iret != 0) ale88c(AL_NOHELP);
+   }
+@@ -660,8 +660,8 @@
+   strcpy(command,CBROWSER);
+   strcat(command," ");
+   strcat(command,CPREFIX);
+-  if(LANG == 1) strcat(command,"g88ge.htm");
+-  if(LANG == 2) strcat(command,"e88ge.htm");
++  if(LANG == 1) strcat(command,"g88ix.htm");
++  if(LANG == 2) strcat(command,"e88ix.htm");
+   iret= system(command);
+   if(iret != 0) ale88c(AL_NOHELP);
+   }
+@@ -690,8 +690,8 @@
+   strcpy(command,CBROWSER);
+   strcat(command," ");
+   strcat(command,CPREFIX);
+-  if(LANG == 1) strcat(command,"g88ge.htm");
+-  if(LANG == 2) strcat(command,"e88ge.htm");
++  if(LANG == 1) strcat(command,"g88ix.htm");
++  if(LANG == 2) strcat(command,"e88ix.htm");
+   iret= system(command);
+   if(iret != 0) ale88c(AL_NOHELP);
+   }
+@@ -720,8 +720,8 @@
+   strcpy(command,CBROWSER);
+   strcat(command," ");
+   strcat(command,CPREFIX);
+-  if(LANG == 1) strcat(command,"g88ge.htm");
+-  if(LANG == 2) strcat(command,"e88ge.htm");
++  if(LANG == 1) strcat(command,"g88ix.htm");
++  if(LANG == 2) strcat(command,"e88ix.htm");
+   iret= system(command);
+   if(iret != 0) ale88c(AL_NOHELP);
+   }
+@@ -750,8 +750,8 @@
+   strcpy(command,CBROWSER);
+   strcat(command," ");
+   strcat(command,CPREFIX);
+-  if(LANG == 1) strcat(command,"g88ge.htm");
+-  if(LANG == 2) strcat(command,"e88ge.htm");
++  if(LANG == 1) strcat(command,"g88ix.htm");
++  if(LANG == 2) strcat(command,"e88ix.htm");
+   iret= system(command);
+   if(iret != 0) ale88c(AL_NOHELP);
+   }
+diff -urNad z88-13.0.0+dfsg2~/src/wrim88i.c z88-13.0.0+dfsg2/src/wrim88i.c
+--- z88-13.0.0+dfsg2~/src/wrim88i.c	2008-11-23 11:02:07.000000000 -0500
++++ z88-13.0.0+dfsg2/src/wrim88i.c	2009-04-04 22:07:04.000000000 -0400
+@@ -193,7 +193,7 @@
+ dann starten Sie den Solver Part 2:\nZ88I2 oder Z88PAR\n");
      if(LANG == 2) printf("Z88I1 done\n\
  you may now adjust Z88.DYN (MAXGS & MAXKOI)\n\
--then lauch the solver part2: Z88I2\n");
-+then launch the solver part2: Z88I2\n");
+-then lauch the solver part 2:\nZ88I2 or Z88PAR\n");
++then launch the solver part 2:\nZ88I2 or Z88PAR\n");
    break;
  
    case TX_GSERF:
-diff -urNad z88-12.0.1+dfsg1~/z88 z88-12.0.1+dfsg1/z88
---- z88-12.0.1+dfsg1~/z88	2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1+dfsg1/z88	2009-02-27 15:16:48.000000000 -0500
-@@ -44,9 +44,14 @@
- fi
- 
- echo "For further information consult" 
--echo "/usr/share/z88/README or /usr/share/z88/LIESMICH or"
--echo "/usr/share/doc/z88/z88mane.pdf (English) or"
--echo "/usr/share/doc/z88/z88mang.pdf (German)"
+diff -urNad z88-13.0.0+dfsg2~/z88 z88-13.0.0+dfsg2/z88
+--- z88-13.0.0+dfsg2~/z88	1969-12-31 19:00:00.000000000 -0500
++++ z88-13.0.0+dfsg2/z88	2009-04-04 22:06:03.000000000 -0400
+@@ -0,0 +1,55 @@
++#!/bin/sh
++# This script checks for the existence of the three very important Z88 
++# parameter files z88.fcd, z88.dyn and z88i4.txt and launches the
++# Z88 commander
++
++if ! test -f z88.dyn
++  then
++    cp /usr/share/z88/z88.dyn .
++fi
++
++if ! test -f z88.fcd
++  then
++    cp /usr/share/z88/z88.fcd .
++fi
++
++if ! test -f z88i4.txt
++  then
++    cp /usr/share/z88/z88i4.txt .
++fi
++
++if ! test -f z88i1.txt
++  then
++    if ! test -f z88ni.txt
++      then
++        if ! test -f z88x.dxf
++          then
++            if ! test -f z88g.cos
++              then
++                cp /usr/share/z88/b1_x.dxf z88x.dxf
++                cp /usr/share/z88/b1_2.txt z88i2.txt
++                cp /usr/share/z88/b1_3.txt z88i3.txt
++                echo "First Z88 example loaded"
++              else
++                echo "A Z88 input file z88g.cos exists"
++            fi
++          else 
++            echo "A Z88 input file z88x.dxf exists" 
++        fi
++      else
++        echo "A Z88 input file z88ni.txt exists"
++    fi
++  else
++    echo "A Z88 input file z88i1.txt exists"
++fi
++
++echo "For further information consult" 
 +echo "   /usr/share/doc/z88-doc/html/e88ix.htm  or"
-+echo "   /usr/share/z88/README  or"
-+echo "   http://z88.uni-bayreuth.de/download/z88mane.pdf"
 +echo "or in German:"
-+echo "   /usr/share/z88/LIESMICH  or"
-+echo "   http://z88.uni-bayreuth.de/download/z88mang.pdf"
-+#echo "/usr/share/doc/z88-doc/pdf/z88mane.pdf (English) or"
-+#echo "/usr/share/doc/z88-doc/pdf/z88mang.pdf (German)"
- echo "*** Starting the Z88 Finite Elements Analysis system ***"
- 
--z88com
-\ No newline at end of file
++echo "   /usr/share/doc/z88-doc/html/g88ix.htm"
++echo ""
++#echo "/usr/share/doc/z88/z88mane.pdf (English) or"
++#echo "/usr/share/doc/z88/z88mang.pdf (German)"
++echo "*** Starting the Z88 Finite Elements Analysis system ***"
++
 +z88com
-diff -urNad z88-12.0.1+dfsg1~/z88.fcd z88-12.0.1+dfsg1/z88.fcd
---- z88-12.0.1+dfsg1~/z88.fcd	2006-03-23 06:00:00.000000000 -0500
-+++ z88-12.0.1+dfsg1/z88.fcd	2009-02-27 15:16:48.000000000 -0500
+diff -urNad z88-13.0.0+dfsg2~/z88.fcd z88-13.0.0+dfsg2/z88.fcd
+--- z88-13.0.0+dfsg2~/z88.fcd	2009-04-04 22:03:34.000000000 -0400
++++ z88-13.0.0+dfsg2/z88.fcd	2009-04-04 22:06:03.000000000 -0400
 @@ -26,7 +26,7 @@
  
      Your HTML-or Internet Browser's prefix
      Prefix fuer Ihren HTML- oder Internet Browser
--    CPREFIX      file:///usr/share/z88/
+-    CPREFIX      file:///home/frank/z88130/
 +    CPREFIX      file:///usr/share/doc/z88-doc/html/
  
-     Volume of alert bell
-     Warnton-Staerke
+   WINDOW END
+ 

Modified: packages/z88/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/z88/trunk/debian/rules?rev=35621&op=diff
==============================================================================
--- packages/z88/trunk/debian/rules (original)
+++ packages/z88/trunk/debian/rules Sun Apr  5 02:30:49 2009
@@ -8,7 +8,7 @@
 
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=0
 
 # set the number of build jobs
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -25,14 +25,13 @@
               -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
               -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
               -DCMAKE_SKIP_RPATH:BOOL=ON \
-              -DCMAKE_BUILD_TYPE="Debug" \
+              -DCMAKE_BUILD_TYPE="Release" \
 
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
 	# Add here commands to configure the package.
 
-	cp debian/CMakeLists.txt src/
 	if [ ! -d $(BUILD_PATH) ]; then mkdir $(BUILD_PATH); fi
 	cd $(BUILD_PATH) \
             && cmake $(CURDIR)/src/ $(CMAKE_FLAGS)
@@ -40,30 +39,42 @@
 	touch $@
 
 
-build: build-stamp
+build: build-arch
 
-build-stamp: configure-stamp  
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
+        # Add here commands to compile the package.
+
+        # build shared libs and binaries
 	$(MAKE) $(JOBS) -C $(BUILD_PATH)
 
 	touch $@
+
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
+	dh_testdir
+
+	touch $@
+
 
 clean: clean-patched unpatch
 
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
 
-	rm -f src/CMakeLists.txt
 	# Add here commands to clean up after the build process.
 	rm -rf $(BUILD_PATH)
 
 	dh_clean 
 
-install: build
+
+install: install-indep install-arch
+
+install-arch: build-arch
 	dh_testdir
 	dh_testroot
 	dh_prep  
@@ -73,22 +84,23 @@
 	$(MAKE) $(JOBS) -C $(BUILD_PATH) install DESTDIR=$(CURDIR)/debian/tmp
 
 	dh_install -pz88        debian/tmp/usr/bin/* z88             usr/bin
-#       dh_install -pz88        z88.fcd z88.dyn LIESMICH README      usr/share/z88
 	dh_install -pz88        z88.fcd z88.dyn                      usr/share/z88
-	dh_install -pz88-data   data/*                               usr/share/z88
-
 	dh_install -pz88        debian/z88.desktop                   usr/share/applications
 
-        # lintian override (binary-without-manpage)
-	install -p -D -m644 debian/z88.lintian debian/z88/usr/share/lintian/overrides/z88
+install-indep: build-indep
+	dh_install -pz88-data   data/*                               usr/share/z88
 
 
 # Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
+binary-indep: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture-dependent files here.
-binary-arch: install
+binary-arch: install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+# Build architecture-dependent files here.
+binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
@@ -105,4 +117,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure




More information about the debian-science-commits mailing list