[Demudi-commits] r759 - in om-synth/trunk: . debian debian/patches
src/clients/gtk
Joost Damad
andete-guest at costa.debian.org
Fri Apr 28 16:43:59 UTC 2006
Author: andete-guest
Date: 2006-04-28 16:43:38 +0000 (Fri, 28 Apr 2006)
New Revision: 759
Added:
om-synth/trunk/debian/om-gtk.install
om-synth/trunk/debian/om-gtk.manpages
om-synth/trunk/debian/om-gtk.menu
om-synth/trunk/debian/om-patches.install
om-synth/trunk/debian/om.docs
om-synth/trunk/debian/om.install
om-synth/trunk/debian/om.manpages
Removed:
om-synth/trunk/debian/om-synth-gtk.install
om-synth/trunk/debian/om-synth-gtk.manpages
om-synth/trunk/debian/om-synth-gtk.menu
om-synth/trunk/debian/om-synth-patches.install
om-synth/trunk/debian/om-synth.docs
om-synth/trunk/debian/om-synth.install
om-synth/trunk/debian/om-synth.manpages
om-synth/trunk/debian/patches/01_path.dpatch
Modified:
om-synth/trunk/configure
om-synth/trunk/configure.ac
om-synth/trunk/debian/changelog
om-synth/trunk/debian/control
om-synth/trunk/debian/patches/00list
om-synth/trunk/debian/rules
om-synth/trunk/src/clients/gtk/configure
om-synth/trunk/src/clients/gtk/configure.ac
Log:
renamed om-synth in om
Modified: om-synth/trunk/configure
===================================================================
--- om-synth/trunk/configure 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/configure 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for om-synth 0.2.0.
+# Generated by GNU Autoconf 2.59 for om 0.2.0.
#
# Report bugs to <drobilla at connect.carleton.ca>.
#
@@ -267,10 +267,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='om-synth'
-PACKAGE_TARNAME='om-synth'
+PACKAGE_NAME='om'
+PACKAGE_TARNAME='om'
PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='om-synth 0.2.0'
+PACKAGE_STRING='om 0.2.0'
PACKAGE_BUGREPORT='drobilla at connect.carleton.ca'
ac_unique_file="src/clients/Comm.cpp"
@@ -820,7 +820,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures om-synth 0.2.0 to adapt to many kinds of systems.
+\`configure' configures om 0.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -882,7 +882,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of om-synth 0.2.0:";;
+ short | recursive ) echo "Configuration of om 0.2.0:";;
esac
cat <<\_ACEOF
@@ -1019,7 +1019,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-om-synth configure 0.2.0
+om configure 0.2.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1033,7 +1033,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by om-synth $as_me 0.2.0, which was
+It was created by om $as_me 0.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1686,7 +1686,7 @@
# Define the identity of the package.
- PACKAGE='om-synth'
+ PACKAGE='om'
VERSION='0.2.0'
@@ -5891,7 +5891,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by om-synth $as_me 0.2.0, which was
+This file was extended by om $as_me 0.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5954,7 +5954,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-om-synth config.status 0.2.0
+om config.status 0.2.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: om-synth/trunk/configure.ac
===================================================================
--- om-synth/trunk/configure.ac 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/configure.ac 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,4 +1,4 @@
-AC_INIT([om-synth],[0.2.0],[drobilla at connect.carleton.ca])
+AC_INIT([om],[0.2.0],[drobilla at connect.carleton.ca])
AC_CONFIG_SRCDIR([src/clients/Comm.cpp])
#AC_CONFIG_SRCDIR([src/clients/console/console_client.cpp])
AC_CONFIG_SRCDIR([src/clients/patch_loader/patch_loader.cpp])
Modified: om-synth/trunk/debian/changelog
===================================================================
--- om-synth/trunk/debian/changelog 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/changelog 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,4 +1,4 @@
-om-synth (0.2.0-1) unstable; urgency=low
+om (0.2.0-1) unstable; urgency=low
* Initial Release.
* Close ITP: Closes: #363019
@@ -8,6 +8,7 @@
users
* dpatch for changing search path of plugins to reflect paths used in
package
+ * name package "om", not "om-synth"
-- Joost Yervante Damad <joost at lumatec.be> Mon, 17 Apr 2006 16:16:13 +0200
Modified: om-synth/trunk/debian/control
===================================================================
--- om-synth/trunk/debian/control 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/control 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,4 +1,4 @@
-Source: om-synth
+Source: om
Section: sound
Priority: optional
Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
@@ -6,10 +6,10 @@
Standards-Version: 3.6.2
Uploaders: Joost Yervante Damad <joost at lumatec.be>
-Package: om-synth
+Package: om
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: jackd, om-synth-gtk (= ${Source-Version}), om-synth-patches (= ${Source-Version}), ladspa-omins
+Recommends: jackd, om-gtk (= ${Source-Version}), om-patches (= ${Source-Version}), ladspa-omins
Suggests: patchage, ladspa-plugin
Description: a realtime modular synthesizer and effects processor
Om is a realtime modular synthesizer and effects processor using
@@ -20,19 +20,19 @@
.
Homepage: http://www.nongnu.org/om-synth/
-Package: om-synth-gtk
+Package: om-gtk
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: om-synth (= ${Source-Version})
+Recommends: om (= ${Source-Version})
Description: a realtime modular synthesizer and effects processor - GTK client
A graphical client for the Om modular synthesizer.
.
Homepage: http://www.nongnu.org/om-synth/
-Package: om-synth-patches
+Package: om-patches
Architecture: all
-Depends: om-synth (= ${Source-Version}), blop, swh-plugins, ladspa-vcf, cmt, tap-plugins, ladspa-omins
-Recommends: om-synth-gtk (= ${Source-Version})
+Depends: om (= ${Source-Version}), blop, swh-plugins, ladspa-vcf, cmt, tap-plugins, ladspa-omins
+Recommends: om-gtk (= ${Source-Version})
Suggests: ladspa-plugin
Description: a realtime modular synthesizer and effects processor - patches
Patches for the Om Modular synthesizer.
Copied: om-synth/trunk/debian/om-gtk.install (from rev 747, om-synth/trunk/debian/om-synth-gtk.install)
===================================================================
--- om-synth/trunk/debian/om-synth-gtk.install 2006-04-23 08:42:58 UTC (rev 747)
+++ om-synth/trunk/debian/om-gtk.install 2006-04-28 16:43:38 UTC (rev 759)
@@ -0,0 +1,2 @@
+usr/bin/om_gtk
+usr/share/om-gtk
Copied: om-synth/trunk/debian/om-gtk.manpages (from rev 747, om-synth/trunk/debian/om-synth-gtk.manpages)
Copied: om-synth/trunk/debian/om-gtk.menu (from rev 747, om-synth/trunk/debian/om-synth-gtk.menu)
===================================================================
--- om-synth/trunk/debian/om-synth-gtk.menu 2006-04-23 08:42:58 UTC (rev 747)
+++ om-synth/trunk/debian/om-gtk.menu 2006-04-28 16:43:38 UTC (rev 759)
@@ -0,0 +1 @@
+?package(om-gtk):needs="X11" section="Apps/Sound" title="Om Synth" command="/usr/bin/om_gtk"
Copied: om-synth/trunk/debian/om-patches.install (from rev 747, om-synth/trunk/debian/om-synth-patches.install)
===================================================================
--- om-synth/trunk/debian/om-synth-patches.install 2006-04-23 08:42:58 UTC (rev 747)
+++ om-synth/trunk/debian/om-patches.install 2006-04-28 16:43:38 UTC (rev 759)
@@ -0,0 +1 @@
+usr/share/om/patches
Deleted: om-synth/trunk/debian/om-synth-gtk.install
===================================================================
--- om-synth/trunk/debian/om-synth-gtk.install 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth-gtk.install 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,2 +0,0 @@
-usr/bin/om_gtk
-usr/share/om-synth-gtk
Deleted: om-synth/trunk/debian/om-synth-gtk.manpages
===================================================================
--- om-synth/trunk/debian/om-synth-gtk.manpages 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth-gtk.manpages 2006-04-28 16:43:38 UTC (rev 759)
@@ -1 +0,0 @@
-debian/om_gtk.1
Deleted: om-synth/trunk/debian/om-synth-gtk.menu
===================================================================
--- om-synth/trunk/debian/om-synth-gtk.menu 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth-gtk.menu 2006-04-28 16:43:38 UTC (rev 759)
@@ -1 +0,0 @@
-?package(om-synth-gtk):needs="X11" section="Apps/Sound" title="Om Synth" command="/usr/bin/om_gtk"
Deleted: om-synth/trunk/debian/om-synth-patches.install
===================================================================
--- om-synth/trunk/debian/om-synth-patches.install 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth-patches.install 2006-04-28 16:43:38 UTC (rev 759)
@@ -1 +0,0 @@
-usr/share/om-synth/patches
Deleted: om-synth/trunk/debian/om-synth.docs
===================================================================
--- om-synth/trunk/debian/om-synth.docs 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth.docs 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,4 +0,0 @@
-NEWS
-README
-TODO
-
Deleted: om-synth/trunk/debian/om-synth.install
===================================================================
--- om-synth/trunk/debian/om-synth.install 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth.install 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,2 +0,0 @@
-usr/bin/om
-usr/bin/om_patch_loader
Deleted: om-synth/trunk/debian/om-synth.manpages
===================================================================
--- om-synth/trunk/debian/om-synth.manpages 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/om-synth.manpages 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,2 +0,0 @@
-debian/om.1
-debian/om_patch_loader.1
Copied: om-synth/trunk/debian/om.docs (from rev 747, om-synth/trunk/debian/om-synth.docs)
Copied: om-synth/trunk/debian/om.install (from rev 747, om-synth/trunk/debian/om-synth.install)
Copied: om-synth/trunk/debian/om.manpages (from rev 747, om-synth/trunk/debian/om-synth.manpages)
Modified: om-synth/trunk/debian/patches/00list
===================================================================
--- om-synth/trunk/debian/patches/00list 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/patches/00list 2006-04-28 16:43:38 UTC (rev 759)
@@ -1 +0,0 @@
-01_path.dpatch
Deleted: om-synth/trunk/debian/patches/01_path.dpatch
===================================================================
--- om-synth/trunk/debian/patches/01_path.dpatch 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/patches/01_path.dpatch 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-## by Joost Yervante Damad <joost at lumatec.be>
-##
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- om-synth-0.2.0.orig/src/clients/gtk/src/StateManager.cpp 2005-09-22 08:49:59.000000000 +0200
-+++ om-synth-0.2.0/src/clients/gtk/src/StateManager.cpp 2006-04-17 20:03:42.000000000 +0200
-@@ -40,7 +40,7 @@
-
-
- StateManager::StateManager()
--: m_patch_path("/usr/share/om/patches:/usr/local/share/om/patches"),
-+: m_patch_path("/usr/share/om-synth/patches:/usr/local/share/om-synth/patches"),
- m_audio_port_color(0x3F5885FF),
- m_control_port_color(0x3F8558FF)
- {
Modified: om-synth/trunk/debian/rules
===================================================================
--- om-synth/trunk/debian/rules 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/debian/rules 2006-04-28 16:43:38 UTC (rev 759)
@@ -44,13 +44,13 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- -rm -rf debian/om-synth
+ -rm -rf debian/om
-rm -rf debian/tmp
rm -f config-stamp
rm -f config.log config.status
rm -f src/engine/config.log src/engine/config.status
rm -f src/clients/gtk/config.log src/clients/gtk/config.status
- rm -f debian/om*.1
+ -rm $(shell cat debian/*.manpages)
dh_clean
install: install-arch install-indep
@@ -86,16 +86,10 @@
dh_md5sums
dh_builddeb
-manpages: om.1 om_gtk.1 om_patch_loader.1
+debian-manpages: $(shell cat debian/*.manpages)
-om.1: debian/om.sgml
- docbook-to-man $< > debian/$@
+debian/%.1: debian/%.sgml
+ docbook-to-man $< > $@
-om_gtk.1: debian/om_gtk.sgml
- docbook-to-man $< > debian/$@
-
-om_patch_loader.1: debian/om_patch_loader.sgml
- docbook-to-man $< > debian/$@
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install manpages
Modified: om-synth/trunk/src/clients/gtk/configure
===================================================================
--- om-synth/trunk/src/clients/gtk/configure 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/src/clients/gtk/configure 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for om-synth-gtk 0.2.0.
+# Generated by GNU Autoconf 2.59 for om-gtk 0.2.0.
#
# Report bugs to <drobilla at connect.carleton.ca>.
#
@@ -267,10 +267,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='om-synth-gtk'
-PACKAGE_TARNAME='om-synth-gtk'
+PACKAGE_NAME='om-gtk'
+PACKAGE_TARNAME='om-gtk'
PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='om-synth-gtk 0.2.0'
+PACKAGE_STRING='om-gtk 0.2.0'
PACKAGE_BUGREPORT='drobilla at connect.carleton.ca'
ac_unique_file="src/main.cpp"
@@ -833,7 +833,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures om-synth-gtk 0.2.0 to adapt to many kinds of systems.
+\`configure' configures om-gtk 0.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -895,7 +895,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of om-synth-gtk 0.2.0:";;
+ short | recursive ) echo "Configuration of om-gtk 0.2.0:";;
esac
cat <<\_ACEOF
@@ -1036,7 +1036,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-om-synth-gtk configure 0.2.0
+om-gtk configure 0.2.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1050,7 +1050,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by om-synth-gtk $as_me 0.2.0, which was
+It was created by om-gtk $as_me 0.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1696,7 +1696,7 @@
# Define the identity of the package.
- PACKAGE='om-synth-gtk'
+ PACKAGE='om-gtk'
VERSION='0.2.0'
@@ -5626,7 +5626,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by om-synth-gtk $as_me 0.2.0, which was
+This file was extended by om-gtk $as_me 0.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5689,7 +5689,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-om-synth-gtk config.status 0.2.0
+om-gtk config.status 0.2.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: om-synth/trunk/src/clients/gtk/configure.ac
===================================================================
--- om-synth/trunk/src/clients/gtk/configure.ac 2006-04-27 12:57:33 UTC (rev 758)
+++ om-synth/trunk/src/clients/gtk/configure.ac 2006-04-28 16:43:38 UTC (rev 759)
@@ -1,6 +1,6 @@
# configure.in for om-gtk
-AC_INIT(om-synth-gtk, 0.2.0, drobilla at connect.carleton.ca)
+AC_INIT(om-gtk, 0.2.0, drobilla at connect.carleton.ca)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_SRCDIR(src/canvas/PatchBayArea.cpp)
AC_CONFIG_HEADER(config.h)
More information about the Demudi-commits
mailing list