[SCM] devede/master: Argh, python... devede was already Arch: all.

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

The following commit has been merged in the master branch:
commit 565a9e10856c99763023ff324086bcdcbdd4f94a
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Apr 17 10:46:29 2012 +0200

    Argh, python... devede was already Arch: all.

diff --git a/debian/changelog b/debian/changelog
index 162e4d8..d784d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,12 @@
 devede (3.21.0-2) unstable; urgency=low
 
   * Team upload.
-  * Introduce a devede-data package for the architecture-independent files.
   * No need to chmod in /usr/share, dh_fixperms takes care of that.
   * Simplify override_dh_clean and override_dh_install.
   * Remove build/ directory in clean rule.
-  * Move devede.desktop file into the devede pakage.
   * devedesans.ttf is FreeSans, so use the one packaged in Debian instead.
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Tue, 17 Apr 2012 10:31:28 +0200
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Tue, 17 Apr 2012 10:44:58 +0200
 
 devede (3.21.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b3c07cc..061b002 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/devede.git
 Package: devede
 Architecture: all
 Depends:
- devede-data (= ${source:Version}),
  dvdauthor,
  ffmpeg (>= 4:0.7.2),
  genisoimage,
@@ -34,6 +33,7 @@ Depends:
  python-cairo,
  python-gobject,
  python-gtk2 (>= 2.16.0),
+ ttf-freefont,
  vcdimager,
  ${misc:Depends},
  ${python:Depends}
@@ -44,23 +44,3 @@ Description: simple application to create Video DVDs
  any number of video files, in any of the formats supported by Mplayer.
  .
  It allows user to create subtitles and even menus.
-
-Package: devede-data
-Architecture: all
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ttf-freefont
-Recommends:
- devede
-Breaks:
- devede (<< 3.21.0-2~)
-Replaces:
- devede (<< 3.21.0-2~)
-Description: simple application to create Video DVDs (data files)
- DeVeDe is a program to create video DVDs, suitables for home players, from
- any number of video files, in any of the formats supported by Mplayer.
- .
- It allows user to create subtitles and even menus.
- .
- This package contains the architecture-independent data files.
diff --git a/debian/devede-data.install b/debian/devede-data.install
deleted file mode 100644
index dd222db..0000000
--- a/debian/devede-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share
diff --git a/debian/devede.dirs b/debian/devede.dirs
deleted file mode 100644
index f7177e8..0000000
--- a/debian/devede.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share
diff --git a/debian/devede-data.doc-base b/debian/devede.doc-base
similarity index 100%
rename from debian/devede-data.doc-base
rename to debian/devede.doc-base
diff --git a/debian/devede.install b/debian/devede.install
index b23756f..ea8f38c 100644
--- a/debian/devede.install
+++ b/debian/devede.install
@@ -1,3 +1 @@
-usr/bin
-usr/lib
 debian/devede.xpm usr/share/pixmaps
diff --git a/debian/devede-data.links b/debian/devede.links
similarity index 100%
rename from debian/devede-data.links
rename to debian/devede.links
diff --git a/debian/rules b/debian/rules
index ad7fe70..9ff6042 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,12 @@
 	dh $@ --with python2,scour
 
 override_dh_auto_install:
-	./install.sh DESTDIR=$(CURDIR)/debian/tmp/ prefix=/usr
+	./install.sh DESTDIR=$(CURDIR)/debian/devede/ prefix=/usr
 	dh_auto_install -- \
 		--install-lib=/usr/lib/devede \
-		--root=$(CURDIR)/debian/tmp/
-	mv $(CURDIR)/debian/tmp/usr/bin/devede.py \
+		--root=$(CURDIR)/debian/devede/
+	mv $(CURDIR)/debian/devede/usr/bin/devede.py \
 		$(CURDIR)/debian/devede/usr/bin/devede
-	mv $(CURDIR)/debian/tmp/usr/share/applications/ \
-		$(CURDIR)/debian/devede/usr/share/
 
 override_dh_clean:
 	dh_clean -Xhtml/menu.html~

-- 
devede packaging