[Pkg-cli-apps-commits] r4981 - in /packages/themonospot/trunk/debian: changelog control copyright patches/01_fix_build_system patches/02_fix_desktop_file rules themonospot.1 watch

sebner-guest at users.alioth.debian.org sebner-guest at users.alioth.debian.org
Sat Jun 27 13:03:35 UTC 2009 

Author: sebner-guest
Date: Sat Jun 27 13:03:33 2009
New Revision: 4981

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4981
Log:
  * New Upstream release
  * debian/control:
    + Add versioning on quilt
    + Add build-dependency on imagemagick
    + Bump Standards version to 3.8.2
  * debian/rules:
    + Clean up and use quilt dh7 style
    + Convert and install the xpm icon directly
    + Make upstream themonospot.png non-executable
    + Improve get-orig-source rule
    + Add .PHONY target for get-orig-source
  * Update debian/watch
  * Update patches in debian/patches
  * Remove themonospot.install and themonospot.xpm


Modified:
    packages/themonospot/trunk/debian/changelog
    packages/themonospot/trunk/debian/control
    packages/themonospot/trunk/debian/copyright
    packages/themonospot/trunk/debian/patches/01_fix_build_system
    packages/themonospot/trunk/debian/patches/02_fix_desktop_file
    packages/themonospot/trunk/debian/rules
    packages/themonospot/trunk/debian/themonospot.1
    packages/themonospot/trunk/debian/watch

Modified: packages/themonospot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/changelog?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/changelog (original)
+++ packages/themonospot/trunk/debian/changelog Sat Jun 27 13:03:33 2009
@@ -1,12 +1,21 @@
-themonospot (0.7.1.1-3) UNRELEASED; urgency=low
+themonospot (0.7.3.1-1) UNRELEASED; urgency=low
 
-  * Bump Standards version to 3.8.2
-  * debian/rules: 
-    - Clean up and use quilt dh7 style
-    - Add .PHONY target for get-orig-source  
-  * debian/control: Add versioning on quilt
+  * New Upstream release
+  * debian/control:
+    + Add versioning on quilt
+    + Add build-dependency on imagemagick
+    + Bump Standards version to 3.8.2
+  * debian/rules:
+    + Clean up and use quilt dh7 style
+    + Convert and install the xpm icon directly
+    + Make upstream themonospot.png non-executable
+    + Improve get-orig-source rule
+    + Add .PHONY target for get-orig-source
+  * Update debian/watch
+  * Update patches in debian/patches
+  * Remove themonospot.install and themonospot.xpm
 
- -- Stefan Ebner <sebner at ubuntu.com>  Sun, 14 Jun 2009 12:18:59 +0200
+ -- Stefan Ebner <sebner at ubuntu.com>  Sat, 27 Jun 2009 14:40:03 +0200
 
 themonospot (0.7.1.1-2) unstable; urgency=low
 

Modified: packages/themonospot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/control?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/control (original)
+++ packages/themonospot/trunk/debian/control Sat Jun 27 13:03:33 2009
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Stefan Ebner <sebner at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), cli-common-dev (>= 0.5.7)
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~), 
+ cli-common-dev (>= 0.5.7), imagemagick
 Build-Depends-Indep: mono-devel (>= 2.0), pkg-config, libgtk2.0-cil (>= 2.8),
  libglade2.0-cil (>= 2.8)
 Standards-Version: 3.8.2

Modified: packages/themonospot/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/copyright?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/copyright (original)
+++ packages/themonospot/trunk/debian/copyright Sat Jun 27 13:03:33 2009
@@ -3,7 +3,7 @@
 Upstream-Source: http://www.integrazioneweb.com/themonospot
 
 Files: *
-Copyright: Copyright 2007-2008, Armando Basile <hmandevteam at gmail.com>
+Copyright: Copyright 2007-2009, Armando Basile <hmandevteam at gmail.com>
 License: GPL-2
  On Debian systems the full text of the GNU General Public License can be found
  in the `/usr/share/common-licenses/GPL-2' file.

Modified: packages/themonospot/trunk/debian/patches/01_fix_build_system
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/patches/01_fix_build_system?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/patches/01_fix_build_system (original)
+++ packages/themonospot/trunk/debian/patches/01_fix_build_system Sat Jun 27 13:03:33 2009
@@ -1,41 +1,30 @@
-Index: themonospot-0.7.1.1/themonospot-base/Makefile.am
-# Description:
-# Patch the Makefiles to use csc instead of gmcs
+Index: themonospot-0.7.3.1/themonospot-base/Makefile.am
 ===================================================================
---- themonospot-0.7.1.1.orig/themonospot-base/Makefile.am	2008-12-31 14:17:11.000000000 +0100
-+++ themonospot-0.7.1.1/themonospot-base/Makefile.am	2008-12-31 14:20:19.000000000 +0100
+--- themonospot-0.7.3.1.orig/themonospot-base/Makefile.am	2009-06-27 13:10:19.378791073 +0200
++++ themonospot-0.7.3.1/themonospot-base/Makefile.am	2009-06-27 13:11:22.950767755 +0200
 @@ -4,7 +4,7 @@
  # Warning: This is an automatically generated file, do not edit!
  
  if ENABLE_DEBUG
 -ASSEMBLY_COMPILER_COMMAND = gmcs
 +ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:3 -optimize- -debug "-define:DEBUG;TRACE"
  ASSEMBLY = bin/Debug/themonospot-base.dll
  ASSEMBLY_MDB = $(ASSEMBLY).mdb
-@@ -16,7 +16,7 @@
+@@ -18,7 +18,7 @@
  endif
  
  if ENABLE_RELEASE
 -ASSEMBLY_COMPILER_COMMAND = gmcs
 +ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- "-define:TRACE"
  ASSEMBLY = bin/Release/themonospot-base.dll
  ASSEMBLY_MDB = 
-Index: themonospot-0.7.1.1/themonospot-base/Makefile.in
+Index: themonospot-0.7.3.1/themonospot-base/Makefile.in
 ===================================================================
---- themonospot-0.7.1.1.orig/themonospot-base/Makefile.in	2008-12-31 14:17:11.000000000 +0100
-+++ themonospot-0.7.1.1/themonospot-base/Makefile.in	2008-12-31 14:20:46.000000000 +0100
-@@ -72,7 +72,7 @@
- GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @GMCS@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
- INSTALL = @INSTALL@
-@@ -143,8 +143,8 @@
+--- themonospot-0.7.3.1.orig/themonospot-base/Makefile.in	2009-06-27 13:11:40.837768668 +0200
++++ themonospot-0.7.3.1/themonospot-base/Makefile.in	2009-06-27 13:12:20.577769388 +0200
+@@ -151,8 +151,8 @@
  	$(DATA_FILES) $(build_culture_res_files)
  
  # Warning: This is an automatically generated file, do not edit!
@@ -43,20 +32,20 @@
 - at ENABLE_RELEASE_TRUE@ASSEMBLY_COMPILER_COMMAND = gmcs
 + at ENABLE_DEBUG_TRUE@ASSEMBLY_COMPILER_COMMAND = @GMCS@
 + at ENABLE_RELEASE_TRUE@ASSEMBLY_COMPILER_COMMAND = @GMCS@
- @ENABLE_DEBUG_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
- @ENABLE_RELEASE_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
+ @ENABLE_DEBUG_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:3 -optimize- -debug "-define:DEBUG;TRACE"
+ @ENABLE_RELEASE_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- "-define:TRACE"
  @ENABLE_DEBUG_TRUE at ASSEMBLY = bin/Debug/themonospot-base.dll
-Index: themonospot-0.7.1.1/themonospot-gui/Makefile.am
+Index: themonospot-0.7.3.1/themonospot-gui/Makefile.am
 ===================================================================
---- themonospot-0.7.1.1.orig/themonospot-gui/Makefile.am	2008-12-31 14:17:11.000000000 +0100
-+++ themonospot-0.7.1.1/themonospot-gui/Makefile.am	2008-12-31 14:20:19.000000000 +0100
+--- themonospot-0.7.3.1.orig/themonospot-gui/Makefile.am	2009-06-27 13:13:10.605768637 +0200
++++ themonospot-0.7.3.1/themonospot-gui/Makefile.am	2009-06-27 13:13:29.514768866 +0200
 @@ -4,7 +4,7 @@
  # Warning: This is an automatically generated file, do not edit!
  
  if ENABLE_DEBUG
 -ASSEMBLY_COMPILER_COMMAND = gmcs
 +ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:3 -optimize- -debug "-define:DEBUG;TRACE"
  ASSEMBLY = bin/Debug/themonospot.exe
  ASSEMBLY_MDB = $(ASSEMBLY).mdb
 @@ -23,7 +23,7 @@
@@ -65,23 +54,14 @@
  if ENABLE_RELEASE
 -ASSEMBLY_COMPILER_COMMAND = gmcs
 +ASSEMBLY_COMPILER_COMMAND = @GMCS@
- ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
+ ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize- "-define:TRACE"
  ASSEMBLY = bin/Release/themonospot.exe
  ASSEMBLY_MDB = 
-Index: themonospot-0.7.1.1/themonospot-gui/Makefile.in
+Index: themonospot-0.7.3.1/themonospot-gui/Makefile.in
 ===================================================================
---- themonospot-0.7.1.1.orig/themonospot-gui/Makefile.in	2008-12-31 14:17:11.000000000 +0100
-+++ themonospot-0.7.1.1/themonospot-gui/Makefile.in	2008-12-31 14:21:05.000000000 +0100
-@@ -72,7 +72,7 @@
- GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @GMCS@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
- INSTALL = @INSTALL@
-@@ -143,8 +143,8 @@
+--- themonospot-0.7.3.1.orig/themonospot-gui/Makefile.in	2009-06-27 13:13:36.894793167 +0200
++++ themonospot-0.7.3.1/themonospot-gui/Makefile.in	2009-06-27 13:13:59.906768444 +0200
+@@ -150,8 +150,8 @@
  	$(DATA_FILES) $(build_culture_res_files)
  
  # Warning: This is an automatically generated file, do not edit!
@@ -89,19 +69,6 @@
 - at ENABLE_RELEASE_TRUE@ASSEMBLY_COMPILER_COMMAND = gmcs
 + at ENABLE_DEBUG_TRUE@ASSEMBLY_COMPILER_COMMAND = @GMCS@
 + at ENABLE_RELEASE_TRUE@ASSEMBLY_COMPILER_COMMAND = @GMCS@
- @ENABLE_DEBUG_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
- @ENABLE_RELEASE_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
+ @ENABLE_DEBUG_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:3 -optimize- -debug "-define:DEBUG;TRACE"
+ @ENABLE_RELEASE_TRUE at ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- "-define:TRACE"
  @ENABLE_DEBUG_TRUE at ASSEMBLY = bin/Debug/themonospot.exe
-Index: themonospot-0.7.1.1/Makefile.in
-===================================================================
---- themonospot-0.7.1.1.orig/Makefile.in	2008-12-31 14:17:11.000000000 +0100
-+++ themonospot-0.7.1.1/Makefile.in	2008-12-31 14:20:19.000000000 +0100
-@@ -82,7 +82,7 @@
- GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
- GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
- GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
--GMCS = @GMCS@
-+GMCS = @GMCS@
- GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
- GTK_SHARP_20_LIBS = @GTK_SHARP_20_LIBS@
- INSTALL = @INSTALL@

Modified: packages/themonospot/trunk/debian/patches/02_fix_desktop_file
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/patches/02_fix_desktop_file?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/patches/02_fix_desktop_file (original)
+++ packages/themonospot/trunk/debian/patches/02_fix_desktop_file Sat Jun 27 13:03:33 2009
@@ -1,26 +1,24 @@
-Index: themonospot-0.7.1.1/themonospot-gui/resources/themonospot.desktop
-# Description:
-# Make .desktop file freedesktop compliant
+Index: themonospot-0.7.3.1/themonospot-gui/resources/themonospot.desktop
 ===================================================================
---- themonospot-0.7.1.1.orig/themonospot-gui/resources/themonospot.desktop	2008-12-31 14:06:49.000000000 +0100
-+++ themonospot-0.7.1.1/themonospot-gui/resources/themonospot.desktop	2008-12-31 15:22:24.000000000 +0100
-@@ -1,13 +1,13 @@
+--- themonospot-0.7.3.1.orig/themonospot-gui/resources/themonospot.desktop	2009-06-27 14:34:29.997770500 +0200
++++ themonospot-0.7.3.1/themonospot-gui/resources/themonospot.desktop	2009-06-27 14:56:11.658768937 +0200
+@@ -1,7 +1,7 @@
  [Desktop Entry]
--Encoding=UTF-8
--Name=themonospot
--GenericName=themonospot
--Comment=themonospot - Parser and content descriptor for .avi and .mkv files
-+Version=1.0
-+Name=Themonospot
-+GenericName=Themonospot
-+Comment=Themonospot - Parser and content descriptor for .avi and .mkv files
- Icon=themonospot
+ Categories=AudioVideo;AudioVideoEditing;GTK;GNOME;
+ Comment[it]=themonospot - estrae informazioni da un file avi o mkv
+-Comment=themonospot - estrae informazioni da un file avi o mkv
++Comment=themonospot - extract information from avi or mkv files
+ Comment[it_IT]=themonospot - estrae informazioni da un file avi o mkv
  Exec=themonospot
- Categories=AudioVideo;AudioVideoEditing;GTK;GNOME;
--Name[it_IT]=themonospot
--Comment[it_IT]=themonospot - estrae informazioni da un file avi
-+Name[it_IT]=Themonospot
-+Comment[it_IT]=Themonospot - estrae informazioni da un file avi
+ GenericName[it]=themonospot
+@@ -10,10 +10,8 @@
+ MimeType=
+ Name[it]=themonospot
+ Name=themonospot
+-Path=
+ StartupNotify=true
  Terminal=false
+-TerminalOptions=
  Type=Application
- StartupNotify=true
+ X-DBUS-ServiceName=
+ X-DBUS-StartupType=

Modified: packages/themonospot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/rules?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/rules (original)
+++ packages/themonospot/trunk/debian/rules Sat Jun 27 13:03:33 2009
@@ -8,7 +8,10 @@
 
 DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
-VERSION = $(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
+VERSION = $(shell uscan --dehs --force-download --destdir . \
+                --package yahtzeesharp --upstream-version 0 \
+                --watchfile $(dir $(_))/watch --no-symlink | \
+                grep upstream-version | sed 's/<.*>\(.*\)<.*>/\1/g')
 
 include /usr/share/cli-common/cli.make
 include /usr/share/quilt/quilt.make
@@ -22,11 +25,16 @@
 		--download-version $(VERSION) \
 		--destdir . \
 		--force-download \
-		--rename \
-		--repack
+		--rename
 
 override_dh_auto_configure:
 	dh_auto_configure -- GMCS=/usr/bin/csc
+
+override_dh_auto_install:
+	dh_auto_install
+	convert $(CURDIR)/themonospot-gui/resources/monoSPOT_16.png \
+	$(CURDIR)/debian/themonospot/usr/share/pixmaps/themonospot.xpm
+	chmod -x $(CURDIR)/debian/themonospot/usr/share/pixmaps/themonospot.png
 
 %:
 	dh --with quilt $@

Modified: packages/themonospot/trunk/debian/themonospot.1
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/themonospot.1?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/themonospot.1 (original)
+++ packages/themonospot/trunk/debian/themonospot.1 Sat Jun 27 13:03:33 2009
@@ -6,9 +6,9 @@
 \fBthemonospot\fP
 .RI [ file... ]
 .SH DESCRIPTION
-\fBThemonospot\fP is a simple application that can be used to scan an avi and
- matroska (.mkv) file and extract some informations about audio and video data
- flow:
+\fBThemonospot\fP is a simple application that can be used to scan an avi,
+ divx, xvid and matroska (.mkv) file and extract some informations about 
+ audio and video data flow:
 
  * Video codec used
  * Frame size

Modified: packages/themonospot/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/themonospot/trunk/debian/watch?rev=4981&op=diff
==============================================================================
--- packages/themonospot/trunk/debian/watch (original)
+++ packages/themonospot/trunk/debian/watch Sat Jun 27 13:03:33 2009
@@ -1,4 +1,3 @@
 version=3
 
-http://code.google.com/p/themonospot/downloads/list \
-http://themonospot.googlecode.com/files/themonospot-([0-9.]+).tar.gz
+http://www.integrazioneweb.com/repository/SOURCES/themonospot-([0-9.]+).tar.gz

More information about the Pkg-cli-apps-commits mailing list