rev 2942 - kde-extras/codeine/trunk/debian

Achim Bohnet ach-guest at costa.debian.org
Wed Jan 18 01:17:05 UTC 2006


Author: ach-guest
Date: 2006-01-18 01:17:05 +0000 (Wed, 18 Jan 2006)
New Revision: 2942

Added:
   kde-extras/codeine/trunk/debian/TODO
Modified:
   kde-extras/codeine/trunk/debian/changelog
   kde-extras/codeine/trunk/debian/control
   kde-extras/codeine/trunk/debian/copyright
   kde-extras/codeine/trunk/debian/rules
Log:
codeine: continue pkging were Tonio_ stopped:
	http://revu.tauware.de/details.py?upid=1154

	I replaced the rules with an old version I had on
	disk. Now debuild is idempotent. And build fine
	in with pbuilder.

	Still some minor thing to do (see debian/TODO)

Added: kde-extras/codeine/trunk/debian/TODO
===================================================================
--- kde-extras/codeine/trunk/debian/TODO	2006-01-18 01:02:09 UTC (rev 2941)
+++ kde-extras/codeine/trunk/debian/TODO	2006-01-18 01:17:05 UTC (rev 2942)
@@ -0,0 +1,4 @@
+o add konq service menu
+o comment out some code that writes the output stdout
+o rosettafication
+o more meat in the manpage

Modified: kde-extras/codeine/trunk/debian/changelog
===================================================================
--- kde-extras/codeine/trunk/debian/changelog	2006-01-18 01:02:09 UTC (rev 2941)
+++ kde-extras/codeine/trunk/debian/changelog	2006-01-18 01:17:05 UTC (rev 2942)
@@ -1,6 +1,10 @@
 codeine (1.0-0ubuntu1) dapper; urgency=low
 
+  [ Achim Bohnet ]
   * Initial Release.
-  * Added patch kubuntu_01_fix_desktop_file.patch to add french GenericName to codeine.desktop file.
+  * bit of polishing and fixing all over debian/*
 
- -- Anthony Mercatante <anthony.mercatante at laposte.net>  Mon, 14 Nov 2005 13:07:28 +0200
+  [ Anthony Mercatante ]
+  * Added patch 01 to fix the codeine.desktop file.
+
+ -- Achim Bohnet <ach at mpe.mpg.de>  Tue, 17 Jan 2006 23:26:41 +0100

Modified: kde-extras/codeine/trunk/debian/control
===================================================================
--- kde-extras/codeine/trunk/debian/control	2006-01-18 01:02:09 UTC (rev 2941)
+++ kde-extras/codeine/trunk/debian/control	2006-01-18 01:17:05 UTC (rev 2942)
@@ -1,15 +1,15 @@
 Source: codeine
 Section: kde
 Priority: optional
-Maintainer: Anthony Mercatante <anthony.mercatante at laposte.net>
-Build-Depends: debhelper (>= 4.1), cdbs, kdelibs4-dev, docbook2x, libxine-dev, bzip2, python (>= 2.4)
+Maintainer: Achim Bohnet <ach at mpe.mpg.de>
+Build-Depends: debhelper (>= 4.1), cdbs, scons, kdelibs4-dev, docbook2x, libxine-dev, bzip2, python (>= 2.4)
 Standards-Version: 3.6.2
 
 Package: codeine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: video player for KDE with a different philosophy
- Codeine is a videop layer designed to be as simple as possible.
+ Codeine is a video player designed to be as simple as possible.
  It uses the Xine engine.
  .
  Features:

Modified: kde-extras/codeine/trunk/debian/copyright
===================================================================
--- kde-extras/codeine/trunk/debian/copyright	2006-01-18 01:02:09 UTC (rev 2941)
+++ kde-extras/codeine/trunk/debian/copyright	2006-01-18 01:17:05 UTC (rev 2942)
@@ -1,5 +1,6 @@
-This package was debianized by Anthony Mercatante <anthony.mercatante at laposte.net> on
-Mon, 24 oct 2005 17:39:28 +0200.
+This package was debianized by Anthony Mercatante
+<anthony.mercatante at laposte.net> on Mon, 24 oct 2005 17:39:28 +0200.
+2006 reworked by Achim Bohnet <ach at mpe.mpg.de>
 
 It was downloaded from: http://www.methylblue.com/codeine/
 
@@ -8,7 +9,7 @@
 
 License:
 
-All the software and debian/codeine.1.docbook:
+All the software and debian/codeine.1.docbook are under the GPL:
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

Modified: kde-extras/codeine/trunk/debian/rules
===================================================================
--- kde-extras/codeine/trunk/debian/rules	2006-01-18 01:02:09 UTC (rev 2941)
+++ kde-extras/codeine/trunk/debian/rules	2006-01-18 01:17:05 UTC (rev 2942)
@@ -1,40 +1,119 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_SCONS_PREFIX=/usr
-DEB_INSTALL_MANPAGES_codeine = codeine.1
 
-CONFIG_STATUS=$(DEB_BUILDDIR)/config.status
-SCONS_CMD=$(shell \
-	if [ ! -d "scons-mini" ]; then \
-		mkdir scons-mini && cd scons-mini && tar xjf ../scons/scons-mini.tar.bz2 && cd ..; \
-	fi; \
-	echo "python scons-mini/scons"; \
-)
+# 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)
 
-common-configure-arch common-configure-indep:: common-configure-impl
-common-configure-impl:: $(CONFIG_STATUS)
-$(CONFIG_STATUS):
-	$(SCONS_CMD) configure prefix=$(DEB_DESTDIR)$(DEB_SCONS_PREFIX)
-	touch $(CONFIG_STATUS)
 
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
-	$(SCONS_CMD)
+CFLAGS = -Wall -g
 
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	$(SCONS_CMD) install
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
 
-install/codeine::
-	dh_install misc/codeine.desktop usr/share/applications/kde
+#-include debian/debiandirs
+#
+## To be used with kde-style admin subdirectories if desired.
+#debian/debiandirs: admin/debianrules
+#	perl -w admin/debianrules echodirs > debian/debiandirs
 
-build/codeine::
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+#	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+	scons
 	docbook2x-man debian/codeine.1.docbook
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-scons -c
+	rm -rf cache/*
+	rm -f generic.cache.py kde.cache.py
+	rm -f scons/*.pyc scons/signatures.dblite
+	rm -f codeine.1
 	
-clean::
-	rm -rf build cache scons-mini
-	rm -f admin/*.pyc $(CONFIG_STATUS)
-	rm -f codeine.1
+	#-$(MAKE) distclean
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	#cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	#cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean  
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k  
+	dh_installdirs
+	# Add here commands to install the package into debian/codeine.
+	#$(MAKE) install prefix=$(CURDIR)/debian/codeine/usr
+	DESTDIR=$(CURDIR)/debian/codeine scons install
+
+	dh_installman codeine.1
+
+
+# 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 ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 




More information about the pkg-kde-commits mailing list