[med-svn] r6980 - trunk/packages/seaview/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2011-06-10 06:19:45 +0000 (Fri, 10 Jun 2011)
New Revision: 6980

Removed:
   trunk/packages/seaview/trunk/debian/patches/
Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/control
   trunk/packages/seaview/trunk/debian/rules
Log:
Simplified build system using CDBS to pass options through CFLAGS.

Finally, I did not use dh?\226?\128?\166


Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2011-06-10 00:05:32 UTC (rev 6979)
+++ trunk/packages/seaview/trunk/debian/changelog	2011-06-10 06:19:45 UTC (rev 6980)
@@ -3,6 +3,8 @@
   * New upstream versions.
   * Using Debhelper compatibility level 8 (debian/control, debian/compat).
   * Clean extra files through dh_clean (debian/clean, debian/rules).
+  * Simplified build system using CDBS to pass options through CFLAGS, removing
+    need for patching Makefile (debian/rules, debian/patches, debian/control).
 
  -- Charles Plessy <plessy at debian.org>  Wed, 25 May 2011 14:19:04 +0900
 

Modified: trunk/packages/seaview/trunk/debian/control
===================================================================
--- trunk/packages/seaview/trunk/debian/control	2011-06-10 00:05:32 UTC (rev 6979)
+++ trunk/packages/seaview/trunk/debian/control	2011-06-10 06:19:45 UTC (rev 6980)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper ( >= 8  ), quilt, libfltk1.1-dev, libjpeg-dev, libpng12-dev,
+Build-Depends: cdbs, debhelper ( >= 8  ), libfltk1.1-dev, libjpeg-dev, libpng12-dev,
  libxft-dev, libxext-dev,  zlib1g-dev
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/seaview/trunk/?rev=0&sc=0

Modified: trunk/packages/seaview/trunk/debian/rules
===================================================================
--- trunk/packages/seaview/trunk/debian/rules	2011-06-10 00:05:32 UTC (rev 6979)
+++ trunk/packages/seaview/trunk/debian/rules	2011-06-10 06:19:45 UTC (rev 6980)
@@ -1,28 +1,13 @@
 #!/usr/bin/make -f
 
-CFLAGS+=-Wall
-CFLAGS += -O2
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) OPT="$(CFLAGS)                                                  \
-	        -DPHYMLNAME=\\\"phyml\\\"                                       \
-	        -DDEFAULT_HELPFILE=\\\"/usr/share/doc/seaview/seaview.html\\\"" \
-	        seaview                                                         \
-	        PNGJPEGLIBS='-lpng -ljpeg' FLTKLIBS='-lfltk -lfltk_images'
-	touch build-stamp
-	
-clean: clean-patched
-clean-patched:
-	dh clean
+# Same as upstream Makefile
+CFLAGS  += -DUSE_XFT -I/usr/include/freetype2 -DFLTK1 -Dunix -Icsrc -I. -DNO_PDF
 
-install: build
-	dh install
+# Link as needed
+CFLAGS  += -Wl,--as-needed
 
-binary-arch: build install
-	dh binary-arch
-
-binary-indep:
-
-binary: binary-indep binary-arch
+# Debian-specific names and paths
+CFLAGS  += -DDEFAULT_HELPFILE=\\\"/usr/share/seaview/seaview.html\\\" -DPHYMLNAME=\\\"phyml\\\"