[SCM] morituri/master: * AUTHORS: * Makefile.am: * NEWS: * TODO: * autogen.sh: * configure.ac: * examples/ARcalibrate.py: * misc/Makefile.am: * misc/morituri-uninstalled: * morituri.spec.in: * morituri/Makefile.am: * morituri/common/Makefile.am: * morituri/common/logcommand.py: * morituri/extern/Makefile.am: * morituri/rip/Makefile.am: * morituri/rip/__init__.py: * morituri/rip/main.py: * morituri/test/Makefile: * morituri/test/Makefile.am: * configure.ac (added): * AUTHORS (added): * morituri.spec.in (added): * Makefile.am (added): * morituri/test/Makefile.am (added): * morituri/extern/Makefile.am (added): * morituri/common/logcommand.py (added): * morituri/common/Makefile.am (added): * morituri/Makefile.am (added): * morituri/rip (added): * morituri/rip/__init__.py (added): * morituri/rip/Makefile.am (added): * morituri/rip/main.py (added): * misc/Makefile.am (added): * misc/morituri-uninstalled (added): * autogen.sh (added): * NEWS (added): Start autotooling. Add a command-line application.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Oct 19 20:09:01 UTC 2014


The following commit has been merged in the master branch:
commit 1450b777069e62b2f603d238f5d780e54ef75cf2
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri May 22 20:19:32 2009 +0000

    	* AUTHORS:
    	* Makefile.am:
    	* NEWS:
    	* TODO:
    	* autogen.sh:
    	* configure.ac:
    	* examples/ARcalibrate.py:
    	* misc/Makefile.am:
    	* misc/morituri-uninstalled:
    	* morituri.spec.in:
    	* morituri/Makefile.am:
    	* morituri/common/Makefile.am:
    	* morituri/common/logcommand.py:
    	* morituri/extern/Makefile.am:
    	* morituri/rip/Makefile.am:
    	* morituri/rip/__init__.py:
    	* morituri/rip/main.py:
    	* morituri/test/Makefile:
    	* morituri/test/Makefile.am:
    	* configure.ac (added):
    	* AUTHORS (added):
    	* morituri.spec.in (added):
    	* Makefile.am (added):
    	* morituri/test/Makefile.am (added):
    	* morituri/extern/Makefile.am (added):
    	* morituri/common/logcommand.py (added):
    	* morituri/common/Makefile.am (added):
    	* morituri/Makefile.am (added):
    	* morituri/rip (added):
    	* morituri/rip/__init__.py (added):
    	* morituri/rip/Makefile.am (added):
    	* morituri/rip/main.py (added):
    	* misc/Makefile.am (added):
    	* misc/morituri-uninstalled (added):
    	* autogen.sh (added):
    	* NEWS (added):
    	  Start autotooling.  Add a command-line application.

diff --git a/Makefile.am b/Makefile.am
index 0d42610..b50a650 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = bin etc morituri doc m4 misc
 
-EXTRA_DIST = HACKING morituri.spec morituri.doap RELEASE
+EXTRA_DIST = morituri.spec morituri.doap RELEASE
 
 check: pychecker check-python check-bash
 
diff --git a/configure.ac b/configure.ac
index f7eda4d..e647b01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,10 +50,13 @@ etc/bash_completion.d/Makefile
 m4/Makefile
 morituri/Makefile
 morituri/rip/Makefile
+morituri/common/Makefile
 morituri/configure/Makefile
 morituri/configure/uninstalled.py
 morituri/configure/installed.py
 morituri/extern/Makefile
+morituri/image/Makefile
+morituri/program/Makefile
 morituri/test/Makefile
 doc/Makefile
 misc/Makefile
diff --git a/misc/Makefile.am b/misc/Makefile.am
index acdac29..cdaa760 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = \
 	pycheckerrc \
 	header.py \
-	moap-uninstalled \
+	morituri-uninstalled \
 	show-coverage.py
diff --git a/morituri/Makefile.am b/morituri/Makefile.am
index 1d814f4..8e2ebb2 100644
--- a/morituri/Makefile.am
+++ b/morituri/Makefile.am
@@ -3,7 +3,6 @@ CLEANFILES = *.py{c,o}
 morituridir = $(PYTHONLIBDIR)/morituri
 
 morituri_PYTHON = \
-	__init__.py \
-	main.py
+	__init__.py
 
-SUBDIRS = extern rip test
+SUBDIRS = common extern image program rip test
diff --git a/morituri/test/Makefile b/morituri/test/Makefile
index 0b2aaae..959c552 100644
--- a/morituri/test/Makefile
+++ b/morituri/test/Makefile
@@ -75,7 +75,7 @@ PACKAGE_VERSION_MAJOR = 0
 PACKAGE_VERSION_MICRO = 0
 PACKAGE_VERSION_MINOR = 0
 PACKAGE_VERSION_NANO = 1
-PACKAGE_VERSION_RELEASE = 0.20090520.223152
+PACKAGE_VERSION_RELEASE = 0.20090522.221730
 PATH_SEPARATOR = :
 PYCHECKER = yes
 PYTHON = /usr/bin/python

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list