[SCM] ardour/master: Revert "Remove ardour-{flavour} files, there are no flavours."

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f9dc1f3beebc4bc4a43f0fb35f5196c3989b46de
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Oct 4 21:54:25 2013 +0200

    Revert "Remove ardour-{flavour} files, there are no flavours."
    
    This reverts commit e7f9ed11fc6732c17cce217c95d0f6c7438bc968.
    
    Of course, there are flavors, as "rmadison ardour" would happily
    confirm.

diff --git a/debian/ardour.desktop b/debian/ardour-altivec.desktop
similarity index 83%
copy from debian/ardour.desktop
copy to debian/ardour-altivec.desktop
index 949a317..4c0f7e2 100644
--- a/debian/ardour.desktop
+++ b/debian/ardour-altivec.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Ardour Digital Audio Workstation
+Name=Ardour Digital Audio Workstation (AltiVec)
 Comment=Record, mix and master multi-track audio
 Exec=/usr/bin/ardour2
 Terminal=false
diff --git a/debian/ardour.docs b/debian/ardour-altivec.docs
similarity index 100%
copy from debian/ardour.docs
copy to debian/ardour-altivec.docs
diff --git a/debian/ardour-altivec.examples b/debian/ardour-altivec.examples
new file mode 100644
index 0000000..8b7d5a7
--- /dev/null
+++ b/debian/ardour-altivec.examples
@@ -0,0 +1 @@
+build-altivec/ardour_system.rc
diff --git a/debian/ardour-altivec.install b/debian/ardour-altivec.install
new file mode 100644
index 0000000..eee08c3
--- /dev/null
+++ b/debian/ardour-altivec.install
@@ -0,0 +1,7 @@
+debian/tmp/altivec/usr/bin/ardour2 usr/bin
+debian/tmp/altivec/usr/lib*	usr/
+debian/tmp/altivec/usr/share/ardour2 usr/share/
+debian/tmp/altivec/usr/share/locale usr/share/
+debian/tmp/altivec/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
diff --git a/debian/ardour-altivec.manpages b/debian/ardour-altivec.manpages
new file mode 100644
index 0000000..4928454
--- /dev/null
+++ b/debian/ardour-altivec.manpages
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
diff --git a/debian/ardour-altivec.menu b/debian/ardour-altivec.menu
new file mode 100644
index 0000000..7021a25
--- /dev/null
+++ b/debian/ardour-altivec.menu
@@ -0,0 +1,4 @@
+?package(ardour-altivec):needs="X11" section="Applications/Sound" \
+  hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+  title="Ardour Digital Audio Workstation (AltiVec)" command="/usr/bin/ardour2"
+
diff --git a/debian/ardour.sharedmimeinfo b/debian/ardour-altivec.sharedmimeinfo
similarity index 100%
copy from debian/ardour.sharedmimeinfo
copy to debian/ardour-altivec.sharedmimeinfo
diff --git a/debian/ardour.desktop b/debian/ardour-i686.desktop
similarity index 84%
copy from debian/ardour.desktop
copy to debian/ardour-i686.desktop
index 949a317..265028f 100644
--- a/debian/ardour.desktop
+++ b/debian/ardour-i686.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Ardour Digital Audio Workstation
+Name=Ardour Digital Audio Workstation (i686)
 Comment=Record, mix and master multi-track audio
 Exec=/usr/bin/ardour2
 Terminal=false
diff --git a/debian/ardour.docs b/debian/ardour-i686.docs
similarity index 100%
copy from debian/ardour.docs
copy to debian/ardour-i686.docs
diff --git a/debian/ardour-i686.examples b/debian/ardour-i686.examples
new file mode 100644
index 0000000..76c4214
--- /dev/null
+++ b/debian/ardour-i686.examples
@@ -0,0 +1 @@
+build-i686/ardour_system.rc
diff --git a/debian/ardour-i686.install b/debian/ardour-i686.install
new file mode 100644
index 0000000..30c1a3b
--- /dev/null
+++ b/debian/ardour-i686.install
@@ -0,0 +1,7 @@
+debian/tmp/i686/usr/bin/ardour2 usr/bin
+debian/tmp/i686/usr/lib*	usr/
+debian/tmp/i686/usr/share/ardour2 usr/share/
+debian/tmp/i686/usr/share/locale usr/share/
+debian/tmp/i686/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
diff --git a/debian/ardour-i686.manpages b/debian/ardour-i686.manpages
new file mode 100644
index 0000000..4928454
--- /dev/null
+++ b/debian/ardour-i686.manpages
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
diff --git a/debian/ardour-i686.menu b/debian/ardour-i686.menu
new file mode 100644
index 0000000..82e1f48
--- /dev/null
+++ b/debian/ardour-i686.menu
@@ -0,0 +1,4 @@
+?package(ardour-i686):needs="X11" section="Applications/Sound" \
+  hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+  title="Ardour Digital Audio Workstation (i686)" command="/usr/bin/ardour2"
+
diff --git a/debian/ardour.sharedmimeinfo b/debian/ardour-i686.sharedmimeinfo
similarity index 100%
copy from debian/ardour.sharedmimeinfo
copy to debian/ardour-i686.sharedmimeinfo
diff --git a/debian/ardour.desktop b/debian/ardour-opt.desktop
similarity index 82%
copy from debian/ardour.desktop
copy to debian/ardour-opt.desktop
index 949a317..3287f07 100644
--- a/debian/ardour.desktop
+++ b/debian/ardour-opt.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Ardour Digital Audio Workstation
+Name=Ardour Digital Audio Workstation (@optarch@)
 Comment=Record, mix and master multi-track audio
 Exec=/usr/bin/ardour2
 Terminal=false
diff --git a/debian/ardour.docs b/debian/ardour-opt.docs
similarity index 100%
copy from debian/ardour.docs
copy to debian/ardour-opt.docs
diff --git a/debian/ardour-opt.examples b/debian/ardour-opt.examples
new file mode 100644
index 0000000..9e8267d
--- /dev/null
+++ b/debian/ardour-opt.examples
@@ -0,0 +1 @@
+ardour_system.rc
diff --git a/debian/ardour-opt.install b/debian/ardour-opt.install
new file mode 100644
index 0000000..71138ea
--- /dev/null
+++ b/debian/ardour-opt.install
@@ -0,0 +1,7 @@
+debian/tmp/@optarch@/usr/bin/ardour2 usr/bin
+debian/tmp/@optarch@/usr/lib*	usr/
+debian/tmp/@optarch@/usr/share/ardour2 usr/share/
+debian/tmp/@optarch@/usr/share/locale usr/share/
+debian/tmp/@optarch@/etc/ardour2* etc/
+debian/ardour.desktop usr/share/applications
+debian/ardour2-session_exchange.py usr/bin
diff --git a/debian/ardour-opt.manpages b/debian/ardour-opt.manpages
new file mode 100644
index 0000000..4928454
--- /dev/null
+++ b/debian/ardour-opt.manpages
@@ -0,0 +1 @@
+DOCUMENTATION/ardour.1*
diff --git a/debian/ardour-opt.menu b/debian/ardour-opt.menu
new file mode 100644
index 0000000..5dba9a7
--- /dev/null
+++ b/debian/ardour-opt.menu
@@ -0,0 +1,4 @@
+?package(ardour- at optarch@):needs="X11" section="Applications/Sound" \
+  hints="Professional,Featureful,WAV,GTK,MIDI,Music Editor,DAW,Multitrack,JACK,LADSPA" \
+  title="Ardour Digital Audio Workstation (@optarch@)" command="/usr/bin/ardour2"
+

-- 
ardour Debian packaging