* Set Standards-Version to 3.7.3 (no changes required).

* Clean up debian/rules.
* Remove encoding from desktop file.
* Change Apps to Applications in menu file.

diff --git a/debian/changelog b/debian/changelog
index 20729f0823a03284ac5c9fc72be7d77be4da3015..e5702d4ea09de4dc4621788dc1311df95e25b5a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+teleschorsch (0.2.1-2) UNRELEASED; urgency=low
+
+  * Set Standards-Version to 3.7.3 (no changes required).
+  * Clean up debian/rules.
+  * Remove encoding from desktop file.
+  * Change Apps to Applications in menu file.
+
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 24 Dec 2007 23:30:55 +0100
+

 teleschorsch (0.2.1-1) unstable; urgency=low
 
   * New upstream release.
 teleschorsch (0.2.1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index aaade9602356d98c00a957645a30955bd1faaa48..2392fd3c3e9309ab8488716389d8124c3f497baf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: Philipp Spitzer <philipp@spitzer.priv.at>
 Build-Depends: debhelper (>= 5), libqt4-dev, imagemagick
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: Philipp Spitzer <philipp@spitzer.priv.at>
 Build-Depends: debhelper (>= 5), libqt4-dev, imagemagick

-Standards-Version: 3.7.2
+Standards-Version: 3.7.3

 Homepage: http://www.toastfreeware.priv.at/
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/teleschorsch/trunk/
 Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/teleschorsch/trunk/
 Homepage: http://www.toastfreeware.priv.at/
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/teleschorsch/trunk/
 Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/teleschorsch/trunk/

diff --git a/debian/menu b/debian/menu
index bc8bc5a6338357037f5ad3dd9f35c5e8afe8a4ca..314f437cbed3abace67db5f8d6d1ca263b2f5a2c 100644 (file)
--- a/debian/menu
+++ b/debian/menu
@@ -1,19 +1,19 @@
 ?package(teleschorsch):needs="X11" \
 ?package(teleschorsch):needs="X11" \

-section="Apps/Viewers" \
+section="Applications/Viewers" \

 title="teleschorsch (QT)" \
 icon32x32="/usr/share/pixmaps/teleschorsch32.xpm" \
 icon16x16="/usr/share/pixmaps/teleschorsch16.xpm" \
 command="/usr/bin/qteleschorsch"
 
 ?package(teleschorsch):needs="text" \
 title="teleschorsch (QT)" \
 icon32x32="/usr/share/pixmaps/teleschorsch32.xpm" \
 icon16x16="/usr/share/pixmaps/teleschorsch16.xpm" \
 command="/usr/bin/qteleschorsch"
 
 ?package(teleschorsch):needs="text" \

-section="Apps/Viewers" \
+section="Applications/Viewers" \

 title="teleschorsch (perl)" \
 icon32x32="/usr/share/pixmaps/teleschorsch32.xpm" \
 icon16x16="/usr/share/pixmaps/teleschorsch16.xpm" \
 command="/usr/share/teleschorsch/teleschorsch.pl"
 
 ?package(teleschorsch):needs="text" \
 title="teleschorsch (perl)" \
 icon32x32="/usr/share/pixmaps/teleschorsch32.xpm" \
 icon16x16="/usr/share/pixmaps/teleschorsch16.xpm" \
 command="/usr/share/teleschorsch/teleschorsch.pl"
 
 ?package(teleschorsch):needs="text" \

-section="Apps/Viewers" \
+section="Applications/Viewers" \

 title="teleschorsch (bash)" \
 icon32x32="/usr/share/pixmaps/teleschorsch32.xpm" \
 icon16x16="/usr/share/pixmaps/teleschorsch16.xpm" \
 title="teleschorsch (bash)" \
 icon32x32="/usr/share/pixmaps/teleschorsch32.xpm" \
 icon16x16="/usr/share/pixmaps/teleschorsch16.xpm" \

diff --git a/debian/rules b/debian/rules
index c79fd83e63ff6931fd2e4570f9f24eb6d23af357..d44a475c2179b4cf788d61dd8908e62409766c62 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,9 @@ configure-stamp:
        dh_testdir
        lrelease qteleschorsch.pro
        qmake
        dh_testdir
        lrelease qteleschorsch.pro
        qmake

-       touch configure-stamp
-
+       touch $@

 
 build: build-stamp
 
 build: build-stamp

-

 build-stamp: configure-stamp 
        dh_testdir
        $(MAKE)
 build-stamp: configure-stamp 
        dh_testdir
        $(MAKE)


@@ -37,11 +35,11 @@ build-stamp: configure-stamp
 clean:
        dh_testdir
        dh_testroot
 clean:
        dh_testdir
        dh_testroot

-       rm -f build-stamp configure-stamp

        [ ! -f Makefile ] || $(MAKE) distclean
        [ ! -f Makefile ] || $(MAKE) distclean

-       dh_clean debian/teleschorsch*.xpm *.qm
+       dh_clean debian/teleschorsch*.xpm *.qm configure-stamp build-stamp install-stamp.

 
 

-install: build
+install: install-stamp
+install-stamp: build-stamp

        dh_testdir
        dh_testroot
        dh_clean -k 
        dh_testdir
        dh_testroot
        dh_clean -k 


@@ -57,26 +55,14 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs ChangeLog
        dh_installdocs
        dh_testroot
        dh_installchangelogs ChangeLog
        dh_installdocs

-#      dh_installexamples

        dh_install
        dh_installmenu
        dh_desktop
        dh_install
        dh_installmenu
        dh_desktop

-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo

        dh_installman teleschorsch.1
        dh_link usr/share/man/man1/teleschorsch.1 usr/share/man/man1/qteleschorsch.1
        dh_strip
        dh_compress
        dh_fixperms
        dh_installman teleschorsch.1
        dh_link usr/share/man/man1/teleschorsch.1 usr/share/man/man1/qteleschorsch.1
        dh_strip
        dh_compress
        dh_fixperms

-#      dh_perl
-#      dh_makeshlibs

        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol

diff --git a/debian/teleschorsch.desktop b/debian/teleschorsch.desktop
index c895900ac4ad3b9fd2ea6e3663e78372fa51619f..f8146779fd79ecdbaa16f67f1d5696578b869677 100644 (file)
--- a/debian/teleschorsch.desktop
+++ b/debian/teleschorsch.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
 [Desktop Entry]

-Encoding=UTF-8

 Name=teleschorsch
 Name[de]=teleschorsch
 Comment=Viewer for video streams
 Name=teleschorsch
 Name[de]=teleschorsch
 Comment=Viewer for video streams