[med-svn] r10360 - trunk/packages/pvrg-jpeg/trunk/debian

Tue Apr 10 16:33:21 UTC 2012

Author: malat
Date: 2012-04-10 16:33:19 +0000 (Tue, 10 Apr 2012)
New Revision: 10360

Removed:
   trunk/packages/pvrg-jpeg/trunk/debian/pvrg-jpeg.install
Modified:
   trunk/packages/pvrg-jpeg/trunk/debian/changelog
   trunk/packages/pvrg-jpeg/trunk/debian/control
   trunk/packages/pvrg-jpeg/trunk/debian/rules
Log:
rework pvrg-jpeg

Modified: trunk/packages/pvrg-jpeg/trunk/debian/changelog
===================================================================

--- trunk/packages/pvrg-jpeg/trunk/debian/changelog	2012-04-10 15:37:10 UTC (rev 10359)
+++ trunk/packages/pvrg-jpeg/trunk/debian/changelog	2012-04-10 16:33:19 UTC (rev 10360)
@@ -1,3 +1,12 @@
+pvrg-jpeg (1.2.1+dfsg1-2) unstable; urgency=low
+
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Use my @d.o alias
+  * Remove DMUA flag, not required
+  * Simplify d/rules
+
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 10 Apr 2012 18:32:54 +0200
+
 pvrg-jpeg (1.2.1+dfsg1-1) unstable; urgency=low
 
   * Initial release (Closes: #508992)

Modified: trunk/packages/pvrg-jpeg/trunk/debian/control
===================================================================
--- trunk/packages/pvrg-jpeg/trunk/debian/control	2012-04-10 15:37:10 UTC (rev 10359)
+++ trunk/packages/pvrg-jpeg/trunk/debian/control	2012-04-10 16:33:19 UTC (rev 10360)
@@ -2,12 +2,11 @@
 Section: graphics
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7), cmake, flex, quilt
-Standards-Version: 3.8.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/pvrg-jpeg/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/pvrg-jpeg/trunk/
+Uploaders: Mathieu Malaterre <malat at debian.org>
+Build-Depends: debhelper (>= 7), cmake, flex
+Standards-Version: 3.9.3
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/pvrg-jpeg/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/pvrg-jpeg/trunk/
 Homepage: http://jpeg.sourceforge.net/
 
 Package: pvrg-jpeg

Deleted: trunk/packages/pvrg-jpeg/trunk/debian/pvrg-jpeg.install
===================================================================
--- trunk/packages/pvrg-jpeg/trunk/debian/pvrg-jpeg.install	2012-04-10 15:37:10 UTC (rev 10359)
+++ trunk/packages/pvrg-jpeg/trunk/debian/pvrg-jpeg.install	2012-04-10 16:33:19 UTC (rev 10360)
@@ -1,2 +0,0 @@
-usr/bin/pvrg-jpeg
-usr/share/man/man1/pvrg-jpeg.1

Modified: trunk/packages/pvrg-jpeg/trunk/debian/rules
===================================================================
--- trunk/packages/pvrg-jpeg/trunk/debian/rules	2012-04-10 15:37:10 UTC (rev 10359)
+++ trunk/packages/pvrg-jpeg/trunk/debian/rules	2012-04-10 16:33:19 UTC (rev 10360)
@@ -1,22 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-include /usr/share/quilt/quilt.make
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 VER_MAJOR = 1
 VER_MINOR = 2
 VER_PATCH = 1
@@ -27,95 +11,22 @@
 DEBIAN_SRC_DIR = pvrg-jpeg-$(VER_FULL)
 DEBIAN_SRC_TAR = pvrg-jpeg_$(VER_FULL_DFSG).orig.tar.gz
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-SRC	:= $(CURDIR)
-BUILD	:= $(CURDIR)/debian/build
-TARGET	:= $(CURDIR)/debian/tmp
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	# Add here commands to configure the package.
-	[ -d debian/build ] || mkdir debian/build
-	[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
-	cd debian/build; cmake $(CURDIR) -DCMAKE_INSTALL_PREFIX="/usr" \
+CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
 		-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DBUILD_SHARED_LIBS=ON
 
-	touch configure-stamp
+%:
+	dh $@ --parallel --buildsystem=cmake
 
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
+override_dh_auto_configure:
+	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
-	# Add here commands to compile the package.
-	$(MAKE) -C debian/build
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	rm -rf debian/build
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) -C debian/build DESTDIR=$(TARGET) install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=$(TARGET) --fail-missing
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
 $(UPSTREAM_SRC).tar.gz:
-	#uscan --force-download --verbose --repack
 	wget http://freefr.dl.sourceforge.net/project/jpeg/jpeg/PVRG%20JPEGv1.2.1/$@
-	# http://freefr.dl.sourceforge.net/project/jpeg/jpeg/PVRG%20JPEGv1.2.1/JPEGv1.2.1.tar.gz
 
 get-orig-source: $(UPSTREAM_SRC).tar.gz
 	tar xzf $(UPSTREAM_SRC).tar.gz
 	rm -rf jpegdir/doc.ps
 	mv jpegdir $(DEBIAN_SRC_DIR)
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
-
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source


