Merge lp:~noskcaj/ubuntu/trusty/xvid4conf/merge into lp:ubuntu/trusty/xvid4conf

[Jackson Doak]

Merge from deb-multimedia

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

12. By Jackson Doak on 2013-11-19

Actually add the watch file

11. By Jackson Doak on 2013-11-19

Add debian/watch

10. By Jackson Doak on 2013-11-19

Enable hardening

9. By Jackson Doak on 2013-11-19

Fix maintainer

8. By Jackson Doak on 2013-11-19

Merge from deb-multimedia

=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2013-11-19 20:25:10 +0000
@@ -0,0 +1,2 @@
+
+See /usr/share/doc/quilt/README.source

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-17 11:23:57 +0000
+++ debian/changelog	2013-11-19 20:25:10 +0000
@@ -1,3 +1,31 @@
+xvid4conf (1.12-dmo2ubuntu1) trusty; urgency=low
+
+  * Merge from deb-multimedia. Remaining changes:
+    - debian/control: added Homepage field
+  * Enable hardening
+  * Add debian/watch
+
+ -- Jackson Doak <[e-mail]>  Wed, 20 Nov 2013 06:56:13 +1100
+
+xvid4conf (1.12-dmo2) unstable; urgency=low
+
+  * New patch to fix Gtk-Warning on GtkSpinButton.
+
+ -- Christian Marillat <[e-mail]>  Sat, 22 Jun 2013 11:17:20 +0200
+
+xvid4conf (1.12-dmo1) unstable; urgency=low
+
+  * Updated to Standards-Version: 3.9.3
+
+ -- Christian Marillat <[e-mail]>  Sun, 27 May 2012 09:46:03 +0200
+
+xvid4conf (1.12-0.2) unstable; urgency=low
+
+  * Rebuild to add missing Checksums-Sha1 and Checksums-Sha256 fields in .dsc
+    file.
+
+ -- Christian Marillat <[e-mail]>  Sun, 07 Feb 2010 20:20:58 +0100
+
 xvid4conf (1.12-0.1ubuntu1) quantal; urgency=low
 
   * debian/control: added Homepage field per Debian Policy

=== modified file 'debian/compat'
--- debian/compat	2006-05-14 14:43:21 +0000
+++ debian/compat	2013-11-19 20:25:10 +0000
@@ -1,1 +1,1 @@
-4
+9

=== modified file 'debian/control'
--- debian/control	2012-09-17 11:22:43 +0000
+++ debian/control	2013-11-19 20:25:10 +0000
@@ -2,9 +2,10 @@
 Section: graphics
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Christian Marillat <[e-mail]>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev
+XSBC-Original-Maintainer: Christian Marillat <[e-mail]>
+Bugs: mailto:[e-mail]
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9), libgtk2.0-dev, quilt
 Homepage: http://tibit.org/hacks/
 
 Package: xvid4conf

=== modified file 'debian/copyright'
--- debian/copyright	2006-05-14 14:43:21 +0000
+++ debian/copyright	2013-11-19 20:25:10 +0000
@@ -1,4 +1,4 @@
-This package was debianized by Christian Marillat <[e-mail]> on
+This package was debianized by Christian Marillat <[e-mail]> on
 Sun, 25 Jan 2004 14:16:20 +0100.
 
 It was downloaded from http://zebra.fh-weingarten.de/~transcode/xvid4conf/

=== added directory 'debian/patches'
=== added file 'debian/patches/01_GtkSpinButton.diff'
--- debian/patches/01_GtkSpinButton.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/01_GtkSpinButton.diff	2013-11-19 20:25:10 +0000
@@ -0,0 +1,310 @@
+--- a/xvid4conf2.glade
++++ b/xvid4conf2.glade
+@@ -650,7 +650,7 @@ This setting allow you to favorize or no
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">0 -255 255 1 10 10</property>
++		      <property name="adjustment">0 -255 255 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -674,7 +674,7 @@ This two settings allow you to tune the
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">100 0 200 1 10 10</property>
++		      <property name="adjustment">100 0 200 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -698,7 +698,7 @@ This two settings allow you to tune the
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">150 0 200 1 10 10</property>
++		      <property name="adjustment">150 0 200 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -727,7 +727,7 @@ You must be aware that the higher max_bf
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">2 0 10 1 10 10</property>
++		      <property name="adjustment">2 0 10 1 10 0</property>
+ 		      <signal name="value_changed" handler="on_max_bframes_value_changed" last_modification_time="Sun, 10 Aug 2003 12:57:39 GMT"/>
+ 		      <signal name="changed" handler="on_max_bframes_value_changed" last_modification_time="Sun, 10 Aug 2003 14:17:07 GMT"/>
+ 		    </widget>
+@@ -947,7 +947,7 @@ This setting allows you to choose the (1
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">0 0 100 1 10 10</property>
++		      <property name="adjustment">0 0 100 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -1165,7 +1165,7 @@ This option activates PSNR measurement,
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">2 1 31 1 10 10</property>
++		      <property name="adjustment">2 1 31 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -1189,7 +1189,7 @@ This option activates PSNR measurement,
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">2 1 31 1 10 10</property>
++		      <property name="adjustment">2 1 31 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -1213,7 +1213,7 @@ This option activates PSNR measurement,
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">2 1 31 1 10 10</property>
++		      <property name="adjustment">2 1 31 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">1</property>
+@@ -1237,7 +1237,7 @@ This option activates PSNR measurement,
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">31 1 31 1 10 10</property>
++		      <property name="adjustment">31 1 31 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">2</property>
+@@ -1261,7 +1261,7 @@ This option activates PSNR measurement,
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">31 1 31 1 10 10</property>
++		      <property name="adjustment">31 1 31 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">2</property>
+@@ -1285,7 +1285,7 @@ This option activates PSNR measurement,
+ 		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 		      <property name="snap_to_ticks">False</property>
+ 		      <property name="wrap">False</property>
+-		      <property name="adjustment">31 1 31 1 10 10</property>
++		      <property name="adjustment">31 1 31 1 10 0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">2</property>
+@@ -2091,7 +2091,7 @@ Think of that setting like a shrinking f
+ 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">0 0 100 1 10 10</property>
++	      <property name="adjustment">0 0 100 1 10 0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -2115,7 +2115,7 @@ Think of that setting like a growing fac
+ 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">0 0 100 1 10 10</property>
++	      <property name="adjustment">0 0 100 1 10 0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -2209,7 +2209,7 @@ Value = [0..100]</property>
+ 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">0 0 100 1 10 10</property>
++	      <property name="adjustment">0 0 100 1 10 0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -2233,7 +2233,7 @@ NB: This setting impacts quality a lot,
+ 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">5 0 100 1 10 10</property>
++	      <property name="adjustment">5 0 100 1 10 0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -2255,7 +2255,7 @@ NB: This setting impacts quality a lot,
+ 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">5 0 100 1 10 10</property>
++	      <property name="adjustment">5 0 100 1 10 0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+@@ -2277,7 +2277,7 @@ NB: This setting impacts quality a lot,
+ 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">5 0 100 1 10 10</property>
++	      <property name="adjustment">5 0 100 1 10 0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="left_attach">1</property>
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -471,7 +471,7 @@ create_window1 (void)
+   gtk_misc_set_alignment (GTK_MISC (bframe_threshold_label), 0, 0.5);
+   gtk_misc_set_padding (GTK_MISC (bframe_threshold_label), 2, 6);
+ 
+-  bframe_threshold_adj = gtk_adjustment_new (0, -255, 255, 1, 10, 10);
++  bframe_threshold_adj = gtk_adjustment_new (0, -255, 255, 1, 10, 0);
+   bframe_threshold = gtk_spin_button_new (GTK_ADJUSTMENT (bframe_threshold_adj), 1, 0);
+   gtk_widget_show (bframe_threshold);
+   gtk_table_attach (GTK_TABLE (table2), bframe_threshold, 1, 2, 3, 4,
+@@ -479,7 +479,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 0);
+   gtk_tooltips_set_tip (tooltips, bframe_threshold, "Sometimes BFrames do not look good, and introduce artefacts when most of the frame is static and some small zones have high motion (a static scene with a man talking, his mouth will probably look bad if what is surrounding the man and his mouth is completly static)\n\nThis setting allow you to favorize or not, the use of bframes. The higher the value, the more a bframe has chance to be used.", NULL);
+ 
+-  bquant_offset_adj = gtk_adjustment_new (100, 0, 200, 1, 10, 10);
++  bquant_offset_adj = gtk_adjustment_new (100, 0, 200, 1, 10, 0);
+   bquant_offset = gtk_spin_button_new (GTK_ADJUSTMENT (bquant_offset_adj), 1, 0);
+   gtk_widget_show (bquant_offset);
+   gtk_table_attach (GTK_TABLE (table2), bquant_offset, 1, 2, 2, 3,
+@@ -487,7 +487,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 0);
+   gtk_tooltips_set_tip (tooltips, bquant_offset, "As explained before, BFrames are highly correlated to its reference frames Thus XviD computes their quantizer to its reference's quantizers.\nThis two settings allow you to tune the formula:", NULL);
+ 
+-  bquant_ratio_adj = gtk_adjustment_new (150, 0, 200, 1, 10, 10);
++  bquant_ratio_adj = gtk_adjustment_new (150, 0, 200, 1, 10, 0);
+   bquant_ratio = gtk_spin_button_new (GTK_ADJUSTMENT (bquant_ratio_adj), 1, 0);
+   gtk_widget_show (bquant_ratio);
+   gtk_table_attach (GTK_TABLE (table2), bquant_ratio, 1, 2, 1, 2,
+@@ -495,7 +495,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 0);
+   gtk_tooltips_set_tip (tooltips, bquant_ratio, "As explained before, BFrames are highly correlated to its reference frames Thus XviD computes their quantizer to its reference's quantizers.\nThis two settings allow you to tune the formula:", NULL);
+ 
+-  max_bframes_adj = gtk_adjustment_new (2, 0, 10, 1, 10, 10);
++  max_bframes_adj = gtk_adjustment_new (2, 0, 10, 1, 10, 0);
+   max_bframes = gtk_spin_button_new (GTK_ADJUSTMENT (max_bframes_adj), 1, 0);
+   gtk_widget_show (max_bframes);
+   gtk_table_attach (GTK_TABLE (table2), max_bframes, 1, 2, 0, 1,
+@@ -570,7 +570,7 @@ create_window1 (void)
+   gtk_label_set_justify (GTK_LABEL (label80), GTK_JUSTIFY_LEFT);
+   gtk_misc_set_alignment (GTK_MISC (label80), 0, 0.5);
+ 
+-  frame_drop_ratio_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
++  frame_drop_ratio_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+   frame_drop_ratio = gtk_spin_button_new (GTK_ADJUSTMENT (frame_drop_ratio_adj), 1, 0);
+   gtk_widget_show (frame_drop_ratio);
+   gtk_table_attach (GTK_TABLE (table12), frame_drop_ratio, 1, 2, 0, 1,
+@@ -642,7 +642,7 @@ create_window1 (void)
+   gtk_misc_set_alignment (GTK_MISC (bquant_min_max_label), 0, 0.5);
+   gtk_misc_set_padding (GTK_MISC (bquant_min_max_label), 2, 5);
+ 
+-  min_iquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 10);
++  min_iquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 0);
+   min_iquant = gtk_spin_button_new (GTK_ADJUSTMENT (min_iquant_adj), 1, 0);
+   gtk_widget_show (min_iquant);
+   gtk_table_attach (GTK_TABLE (table4), min_iquant, 1, 2, 1, 2,
+@@ -650,7 +650,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 2);
+   gtk_tooltips_set_tip (tooltips, min_iquant, "Minimum I-Frame Quantizer", NULL);
+ 
+-  min_pquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 10);
++  min_pquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 0);
+   min_pquant = gtk_spin_button_new (GTK_ADJUSTMENT (min_pquant_adj), 1, 0);
+   gtk_widget_show (min_pquant);
+   gtk_table_attach (GTK_TABLE (table4), min_pquant, 1, 2, 2, 3,
+@@ -658,7 +658,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 2);
+   gtk_tooltips_set_tip (tooltips, min_pquant, "Minimum P-Frame Quantizer", NULL);
+ 
+-  min_bquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 10);
++  min_bquant_adj = gtk_adjustment_new (2, 1, 31, 1, 10, 0);
+   min_bquant = gtk_spin_button_new (GTK_ADJUSTMENT (min_bquant_adj), 1, 0);
+   gtk_widget_show (min_bquant);
+   gtk_table_attach (GTK_TABLE (table4), min_bquant, 1, 2, 3, 4,
+@@ -666,7 +666,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 2);
+   gtk_tooltips_set_tip (tooltips, min_bquant, "Minimum B-Frame Quantizer", NULL);
+ 
+-  max_iquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 10);
++  max_iquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 0);
+   max_iquant = gtk_spin_button_new (GTK_ADJUSTMENT (max_iquant_adj), 1, 0);
+   gtk_widget_show (max_iquant);
+   gtk_table_attach (GTK_TABLE (table4), max_iquant, 2, 3, 1, 2,
+@@ -674,7 +674,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 2);
+   gtk_tooltips_set_tip (tooltips, max_iquant, "Maximum I-Frame Quantizer", NULL);
+ 
+-  max_pquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 10);
++  max_pquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 0);
+   max_pquant = gtk_spin_button_new (GTK_ADJUSTMENT (max_pquant_adj), 1, 0);
+   gtk_widget_show (max_pquant);
+   gtk_table_attach (GTK_TABLE (table4), max_pquant, 2, 3, 2, 3,
+@@ -682,7 +682,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 2, 2);
+   gtk_tooltips_set_tip (tooltips, max_pquant, "Maximum I-Frame Quantizer", NULL);
+ 
+-  max_bquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 10);
++  max_bquant_adj = gtk_adjustment_new (31, 1, 31, 1, 10, 0);
+   max_bquant = gtk_spin_button_new (GTK_ADJUSTMENT (max_bquant_adj), 1, 0);
+   gtk_widget_show (max_bquant);
+   gtk_table_attach (GTK_TABLE (table4), max_bquant, 2, 3, 3, 4,
+@@ -952,7 +952,7 @@ create_window1 (void)
+   gtk_misc_set_alignment (GTK_MISC (label64), 0, 0.5);
+   gtk_misc_set_padding (GTK_MISC (label64), 2, 5);
+ 
+-  curve_compression_high_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
++  curve_compression_high_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+   curve_compression_high = gtk_spin_button_new (GTK_ADJUSTMENT (curve_compression_high_adj), 1, 0);
+   gtk_widget_show (curve_compression_high);
+   gtk_table_attach (GTK_TABLE (table9), curve_compression_high, 1, 2, 2, 3,
+@@ -960,7 +960,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 0, 0);
+   gtk_tooltips_set_tip (tooltips, curve_compression_high, "This settigs control how much the upper part of the curve has to get closer to the average bitrate value. The upper part of the curve is the set of values that are higher than the curve average. It is expressed in %.\n\nThink of that setting like a shrinking factor for the upper part of the curve.", NULL);
+ 
+-  curve_compression_low_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
++  curve_compression_low_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+   curve_compression_low = gtk_spin_button_new (GTK_ADJUSTMENT (curve_compression_low_adj), 1, 0);
+   gtk_widget_show (curve_compression_low);
+   gtk_table_attach (GTK_TABLE (table9), curve_compression_low, 1, 2, 3, 4,
+@@ -992,7 +992,7 @@ create_window1 (void)
+   gtk_tooltips_set_tip (tooltips, container_frame_overhead, "Most of the time users express their target bitrate for video w/o taking care of the video container overhead. This small but (mostly) constant overhead can make the target file size is not respected (oversized result). We decided to allow users to set the amount of overhead per frame the container generates (give only an average per frame)\n\nValue = >=0\nDefault = 24 (AVI frame average overhead per frame in bytes)\n0 has a special meaning, it lets XviD uses its own default values", NULL);
+   gtk_entry_set_text (GTK_ENTRY (container_frame_overhead), "24");
+ 
+-  keyframe_boost_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
++  keyframe_boost_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+   keyframe_boost = gtk_spin_button_new (GTK_ADJUSTMENT (keyframe_boost_adj), 1, 0);
+   gtk_widget_show (keyframe_boost);
+   gtk_table_attach (GTK_TABLE (table9), keyframe_boost, 1, 2, 0, 1,
+@@ -1000,7 +1000,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 0, 0);
+   gtk_tooltips_set_tip (tooltips, keyframe_boost, "This setting tells how many additional amount of bits, Intra Frames are supposed to be given (this \"bossting\" amount of bits is compensated by subtracting the same amount of bits from other frame types pool) \n\nValue = [0..100]", NULL);
+ 
+-  bitrate_payback_delay_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 10);
++  bitrate_payback_delay_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 0);
+   bitrate_payback_delay = gtk_spin_button_new (GTK_ADJUSTMENT (bitrate_payback_delay_adj), 1, 0);
+   gtk_widget_show (bitrate_payback_delay);
+   gtk_table_attach (GTK_TABLE (table9), bitrate_payback_delay, 1, 2, 1, 2,
+@@ -1008,7 +1008,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 0, 0);
+   gtk_tooltips_set_tip (tooltips, bitrate_payback_delay, "During two pass, a scaled bitrate curve is computed. The difference between that expected curve and the result obtained during encoding is called overflow. Obviously, the two pass Rate Controller tries to compensate that overflow distributing it over next frames to be encoded.  \nThis setting controls how much overflow is distributed at each new frame.  Low values allow lazy overflow control, big rate bursts are compensated more slowly (could lead to lack of precision for small clips). High values make RC compensate very hard the overflow, this can have a very bad impact on quality during rate bursts.  \nNB: This setting impacts quality a lot, play with it carefully!", NULL);
+ 
+-  max_overflow_improvement_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 10);
++  max_overflow_improvement_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 0);
+   max_overflow_improvement = gtk_spin_button_new (GTK_ADJUSTMENT (max_overflow_improvement_adj), 1, 0);
+   gtk_widget_show (max_overflow_improvement);
+   gtk_table_attach (GTK_TABLE (table9), max_overflow_improvement, 1, 2, 4, 5,
+@@ -1016,7 +1016,7 @@ create_window1 (void)
+                     (GtkAttachOptions) (0), 0, 0);
+   gtk_tooltips_set_tip (tooltips, max_overflow_improvement, "During the frame bit allocation, overflow control may increase the frame size. This parameter controls how much the overflow control is allowed to increase the frame size in percent compared to the ideal curve allocation", NULL);
+ 
+-  max_overflow_degradation_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 10);
++  max_overflow_degradation_adj = gtk_adjustment_new (5, 0, 100, 1, 10, 0);
+   max_overflow_degradation = gtk_spin_button_new (GTK_ADJUSTMENT (max_overflow_degradation_adj), 1, 0);
+   gtk_widget_show (max_overflow_degradation);
+   gtk_table_attach (GTK_TABLE (table9), max_overflow_degradation, 1, 2, 5, 6,

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-11-19 20:25:10 +0000
@@ -0,0 +1,1 @@
+01_GtkSpinButton.diff

=== modified file 'debian/rules'
--- debian/rules	2004-02-07 16:53:56 +0000
+++ debian/rules	2013-11-19 20:25:10 +0000
@@ -1,84 +1,10 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
-	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
-	--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE) -j4
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	-$(MAKE) distclean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xvid4conf
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --with quilt
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-11-19 20:25:10 +0000
@@ -0,0 +1,1 @@
+1.0

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2013-11-19 20:25:10 +0000
@@ -0,0 +1,2 @@
+version=3
+http://tibit.org/hacks/xvid4conf-(.*).tar.gz
\ No newline at end of file