[Pkg-erlang-commits] r1155 - in wings3d/trunk/debian: . lintian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-12-22 20:57:47 +0000 (Tue, 22 Dec 2009)
New Revision: 1155

Added:
   wings3d/trunk/debian/lintian/
   wings3d/trunk/debian/lintian/wings3d
Removed:
   wings3d/trunk/debian/lintian-override
Modified:
   wings3d/trunk/debian/changelog
   wings3d/trunk/debian/compat
   wings3d/trunk/debian/control
   wings3d/trunk/debian/install
   wings3d/trunk/debian/rules
Log:
[wings3d]
  * Switched from cdbs to debhelper 7 with quilt.
  * Removed all unneeded README files from plugins subdirectories.


Modified: wings3d/trunk/debian/changelog
===================================================================
--- wings3d/trunk/debian/changelog	2009-12-20 11:46:32 UTC (rev 1154)
+++ wings3d/trunk/debian/changelog	2009-12-22 20:57:47 UTC (rev 1155)
@@ -1,8 +1,9 @@
 wings3d (1.0.2-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Switched from cdbs to debhelper 7 with quilt.
+  * Removed all unneeded README files from plugins subdirectories.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 30 Sep 2009 15:32:46 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 22 Dec 2009 23:56:51 +0300
 
 wings3d (1.0.2-1) unstable; urgency=low
 

Modified: wings3d/trunk/debian/compat
===================================================================
--- wings3d/trunk/debian/compat	2009-12-20 11:46:32 UTC (rev 1154)
+++ wings3d/trunk/debian/compat	2009-12-22 20:57:47 UTC (rev 1155)
@@ -1 +1 @@
-5
+7

Modified: wings3d/trunk/debian/control
===================================================================
--- wings3d/trunk/debian/control	2009-12-20 11:46:32 UTC (rev 1154)
+++ wings3d/trunk/debian/control	2009-12-22 20:57:47 UTC (rev 1155)
@@ -4,7 +4,7 @@
 Section: graphics
 Priority: optional
 Standards-Version: 3.8.3
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, grep-dctrl,
+Build-Depends: debhelper (>= 7.2.5), quilt (>= 0.46-7), grep-dctrl,
  erlang-dev (>= 1:13.b), erlang-esdl-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libjpeg62-dev
 Homepage: http://www.wings3d.com

Modified: wings3d/trunk/debian/install
===================================================================
--- wings3d/trunk/debian/install	2009-12-20 11:46:32 UTC (rev 1154)
+++ wings3d/trunk/debian/install	2009-12-22 20:57:47 UTC (rev 1155)
@@ -1,4 +1,5 @@
-debian/bin             /usr/
+debian/bin/wings3d     /usr/bin/
+debian/lintian/wings3d /usr/share/lintian/overrides/
 debian/wings3d.xpm     /usr/share/icons/
 debian/wings3d.desktop /usr/share/applications/
 debian/wings3d.rc      /etc/

Copied: wings3d/trunk/debian/lintian/wings3d (from rev 1093, wings3d/trunk/debian/lintian-override)
===================================================================
--- wings3d/trunk/debian/lintian/wings3d	                        (rev 0)
+++ wings3d/trunk/debian/lintian/wings3d	2009-12-22 20:57:47 UTC (rev 1155)
@@ -0,0 +1,2 @@
+wings3d: image-file-in-usr-lib
+wings3d: virtual-package-depends-without-real-package-depends


Property changes on: wings3d/trunk/debian/lintian/wings3d
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: wings3d/trunk/debian/lintian-override
===================================================================
--- wings3d/trunk/debian/lintian-override	2009-12-20 11:46:32 UTC (rev 1154)
+++ wings3d/trunk/debian/lintian-override	2009-12-22 20:57:47 UTC (rev 1155)
@@ -1,2 +0,0 @@
-wings3d: image-file-in-usr-lib
-wings3d: virtual-package-depends-without-real-package-depends

Modified: wings3d/trunk/debian/rules
===================================================================
--- wings3d/trunk/debian/rules	2009-12-20 11:46:32 UTC (rev 1154)
+++ wings3d/trunk/debian/rules	2009-12-22 20:57:47 UTC (rev 1155)
@@ -1,48 +1,42 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 -include vsn.mk
 
-export ESDL_PATH := /usr/lib/esdl
 export HOME := $(CURDIR)/debian
-export DH_ALWAYS_EXCLUDE := .cvsignore:Makefile:.erl:.xcf
+export ESDL_PATH := /usr/lib/esdl
+DIR := debian/wings3d
 LIBDIR := /usr/lib/erlang/lib/wings-$(WINGS_VSN)
 LINTIANDIR := /usr/share/lintian/overrides
 SUBDIRS := ebin fonts plugins shaders textures
-DEB_QUILT_PATCHDIR_LINK := qpatches
 
-clean::
+%:
+	dh --with quilt $@
+
+override_dh_clean:
 	rm -rf plugins/accel
 	rm -rf plugins/jpeg
 	find plugins -name '*.lang' -exec rm -f \{\} \;
 	rm -f ebin/*.lang
 	rm -f src/wings_en.lang
 	rm -f plugins_src/autouv/autouv_en.lang
-	rm -f vsn.mk
-	dh_clean install-stamp erl_crash.dump '*.beam' '*.so'
+	dh_clean vsn.mk erl_crash.dump '*.beam' '*.so'
 
-build/wings3d::
+override_dh_auto_build:
+	dh_auto_build
 	make lang
 
-install/wings3d:: install-stamp
-install-stamp:
-	# Add here commands to install the package into $(DEB_DESTDIR).
-	dh_install $(SUBDIRS) $(LIBDIR)
-	install -m 755 -d $(DEB_DESTDIR)$(LINTIANDIR)
-	install -m 644 -T debian/lintian-override $(DEB_DESTDIR)$(LINTIANDIR)/wings3d
+override_dh_install:
+	dh_install -XREADME $(SUBDIRS) $(LIBDIR)
 	# Remove errant executable flags to please lintian
-	find $(DEB_DESTDIR)$(LIBDIR) -type f -exec chmod a-x \{\} \;
+	find $(DIR)$(LIBDIR) -type f -exec chmod a-x \{\} \;
 	# prepare substvars file
 	erlang-depends
 	grep-status -s Version -PX erlang-esdl | \
 	    sed -e's!^Version: \(.*\)-.*!erlang-esdl:Depends=erlang-esdl (>= \1)!' \
 	    >> debian/wings3d.substvars
-	# touch the make target
-	touch $@
 
 get-orig-source:
 	wget -O - http://downloads.sourceforge.net/sourceforge/wings/wings-1.0.2.tar.bz2 | \
 	    bunzip2 -c | gzip -9c >wings3d_1.0.2.orig.tar.gz
 
+.PHONY: get-orig-source