--- a/debian/changelog	Wed May 20 08:45:50 2009 +0000
+++ b/debian/changelog	Wed May 20 13:52:12 2009 +0000
@@ -1,11 +1,40 @@
 universalindentgui (1.0.2-1) unstable; urgency=low
 
-  * New upstream release
-  * Using a temporary directory with a random name for security reasons (Closes: #504726)
-  * Using correct mono spaced font on Linux systems (Closes: #483873)
-  * Corrected the path endings to always end with a slash (Closes: #486577)
+  * New upstream release:
+    - The default editor font type is now Monospace instead of Courier.
+      (Closes: #483873)
+  * Add 01_disable_check_for_update.diff patch:
+    Automatic check for update is disabled by default. (Closes: #514999)
+  * Bump debian/compat to 7.
+  * Update debian/control:
+    - Set Thomas Schweitzer as maintainer and myself as uploader.
+      (Closes: #483068)
+    - Bump debhelper build-dependency to 7.
+    - Bump Standards-Version to 3.8.1. No changes needed.
+    - Update recommended beautifier list.
+    - Update description to list all supported beautifiers.
+  * Update debian/copyright:
+    - Add PerlTidy.pm and JsDecoder.js missing copyrights.
+  * Cleanup debian/rules.
 
- -- Thomas Schweitzer <mail@thomas-schweitzer.de>  Thu, 12 Feb 2009 17:15:00 +0100
+ -- Fathi Boudra <fabo@debian.org>  Wed, 29 Apr 2009 10:50:58 +0200
+
+universalindentgui (0.8.1-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Avoid symlink attacks by using mkdtemp (Closes: 504726)
+
+ -- Eddy Petrișor <eddy.petrisor@gmail.com>  Wed, 12 Nov 2008 01:34:23 +0200
+
+universalindentgui (0.8.1-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * urgency high since universalindentgui is actually useless by default
+    (can be hacked to work by setting TMPDIR='/tmp/a')
+  * fixed temporary path asamblation so indents can work
+    (Closes: 486577)
+
+ -- Eddy Petrișor <eddy.petrisor@gmail.com>  Wed, 05 Nov 2008 03:51:48 +0200
 
 universalindentgui (0.8.1-1) unstable; urgency=low
 
@@ -21,4 +50,3 @@
   * Add man page missing in release archive (svn revision 603 plus fixes)
 
  -- Sebastian Pipping <webmaster@hartwork.org>  Tue, 08 Jan 2008 15:13:53 +0100
-

--- a/debian/compat	Wed May 20 08:45:50 2009 +0000
+++ b/debian/compat	Wed May 20 13:52:12 2009 +0000
@@ -1,1 +1,1 @@
-6
+7

--- a/debian/control	Wed May 20 08:45:50 2009 +0000
+++ b/debian/control	Wed May 20 13:52:12 2009 +0000
@@ -2,22 +2,44 @@
 Section: devel
 Priority: optional
 Maintainer: Thomas Schweitzer <mail@thomas-schweitzer.de>
-Build-Depends: debhelper (>= 6), libqt4-dev (>= 4.4), libqscintilla2-dev
-Standards-Version: 3.8.0
-Uploaders: Marcela Tiznado <mlt@debian.org>
-Homepage: http://universalindent.sourceforge.net/
+Uploaders: Fathi Boudra <fabo@debian.org>
+Build-Depends: quilt, debhelper (>= 7), libqt4-dev, libqscintilla2-dev
+Standards-Version: 3.8.1
+Homepage: http://universalindent.sourceforge.net
 
 Package: universalindentgui
 Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: astyle, bcpp, csstidy, hindent, indent, perltidy, tidy, uncrustify, xmlindent
-Description: GUI frontend for nearly any code beautifier
- UniversalIndentGui is a GUI fontend for nearly any code beautifier.
- It allows you to comfortably change each parameter of a beautifier and
- directly see how the source code is affected done by a live preview.
- Many free available code beautifier, formatter and indenter are currently
- supported, like GNU Indent, Uncrustify, Artistic Styler, PHP Stylist,
- Ruby Beautify, HTML Tidy and many other (look at features for complete list).
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: astyle, bcpp, csstidy, hindent, indent, perltidy, tidy, uncrustify,
+ xmlindent
+Description: GUI frontend for several code beautifiers
+ UniversalIndentGui is a GUI fontend for several code beautifiers, currently
+ supporting:
+  * Artistic Styler
+  * BCPP
+  * Cobol Beautify
+  * CSSTidy
+  * Fortran 90 PPR
+  * GNU Indent
+  * GreatCode
+  * hindent
+  * HTB
+  * Javascript Decoder
+  * JSPPP
+  * Perl Tidy
+  * PHP_Beautifier
+  * PHP Code Beautifier
+  * PHP Stylist
+  * pindent
+  * Ruby Beautify
+  * Ruby Formatter
+  * Shell Indent
+  * (HTML) Tidy
+  * Uncrustify
+  * XML Indent
+ .
+ UniversalIndentGui allows you to tune a beautifier's configuration and see
+ how the changes affects a source example live. It is especially useful to
+ compare different beautifiers when you have to choose one of them.
  Currently not supported indenters can be easyly added by creating a
  configuration file for them.
- 

--- a/debian/copyright	Wed May 20 08:45:50 2009 +0000
+++ b/debian/copyright	Wed May 20 13:52:12 2009 +0000
@@ -1,41 +1,59 @@
-This package was debianized by Thomas Schweitzer <mail@thomas-schweitzer.de> on
-Thu, 12 Feb 2009 17:15:00 +0100.
-
-It was downloaded from:
-
-    <http://downloads.sourceforge.net/universalindent/universalindentgui-1.0.2.tar.gz>
-
-And the project homepage is:
-
-    <http://universalindent.sourceforge.net/>
-
-Upstream Author:
-
-    Thomas Schweitzer <thomas_-_s@users.sourceforge.net>
-
-Copyright:
-
-    <Copyright (C) 2006-2009 Thomas Schweitzer>
-
-License:
-
-  - The sources of UniversalIndentGui are:
-
-    | Copyright (c) 2006-2009, Thomas Schweitzer
-
-    | This program is free software; you can redistribute it and/or modify
-    | it under the terms of the GNU General Public License version 2.0 as
-    | published by the Free Software Foundation.
-    |
-    | This program is distributed in the hope that it will be useful,
-    | but WITHOUT ANY WARRANTY; without even the implied warranty of
-    | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    | GNU General Public License for more details.
-    |
-    | You should have received a copy of the GNU General Public License
-    | along with this program; if not, write to the Free Software
-    | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-The Debian packaging is (C) 2009, Thomas Schweitzer <mail@thomas-schweitzer.de> and
-is licensed under the GPL 2, see `/usr/share/common-licenses/GPL-2'.
-
+This package was debianized by:
+
+    Fathi Boudra <fabo@debian.org> on Wed, 29 Apr 2009 10:50:58 +0200
+
+It was downloaded from:
+
+    http://universalindent.sourceforge.net
+
+Upstream Author:
+
+    Thomas Schweitzer <mail@thomas-schweitzer.de>
+
+Copyright:
+
+    Copyright (C) 2006-2009 Thomas Schweitzer
+
+Copyright for indenters/PerlTidyLib.pm file:
+
+    Copyright (C) 2000-2007 Steve Hancock
+
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+Copyright for indenters/JsDecoder.js file:
+
+    Copyright (C) 2004-2008 Cezary Tomczak
+
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+UniversalIndentGUI license:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as
+    published by the Free Software Foundation.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'
+and the GPL version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is:
+
+    Copyright (C) 2009 Fathi Boudra <fabo@debian.org>
+
+and is licensed under the GPL version 2, 
+see `/usr/share/common-licenses/GPL-2'.

--- a/debian/docs	Wed May 20 08:45:50 2009 +0000
+++ b/debian/docs	Wed May 20 13:52:12 2009 +0000
@@ -1,3 +1,2 @@
 CHANGELOG.txt
-INSTALL.txt
 readme.html

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/menu	Wed May 20 13:52:12 2009 +0000
@@ -0,0 +1,7 @@
+?package(universalindentgui):\
+  needs="X11"\
+  section="Applications/Programming"\
+  title="UniversalIndentGUI"\
+  command="/usr/bin/universalindentgui"\
+  icon="/usr/share/pixmaps/universalIndentGUI_32x32.xpm"
+

--- a/debian/rules	Wed May 20 08:45:50 2009 +0000
+++ b/debian/rules	Wed May 20 13:52:12 2009 +0000
@@ -1,95 +1,83 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-
-
+include /usr/share/quilt/quilt.make
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	# Add here commands to configure the package.
+
+	# Fix executable problem
+	find . -type f -exec chmod a-x '{}' \;
+	chmod a+x debian/rules
+
 	qmake-qt4
-	rm -fv translations/qt_*.qm
 
 	touch configure-stamp
 
-
 build: build-stamp
-
-build-stamp: configure-stamp  
+build-stamp: configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
-	#docbook-to-man debian/universalindentgui.sgml > universalindentgui.1
 
 	touch $@
 
-clean: 
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
-	#$(MAKE) clean
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -Rfv debug release
-	rm -fv translations/*.qm Makefile.* Makefile
-	rm -fv doc/universalindentgui.1.gz
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -rf debug release
+	rm -f translations/*.qm Makefile.* doc/universalindentgui.1.gz
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
-	# Add here commands to install the package into debian/universalindentgui.
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/universalindentgui install
-	
+
 	mkdir -p $(CURDIR)/debian/universalindentgui/usr/share/pixmaps
 	cp $(CURDIR)/resources/universalIndentGUI_32x32.xpm $(CURDIR)/debian/universalindentgui/usr/share/pixmaps/
+	
+	# Remove shellindent
+	#rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/example.sh	
+	#rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/shellindent.awk
+	#rm -f debian/universalindentgui/usr/share/universalindentgui/indenters/uigui_shellindent.ini
 
+	# Fix lintian warnings
+	find debian -type f -name '*.rb' | xargs chmod a+x
+
+	# Install lintian override
+	install -D -p -m644 debian/universalindentgui.lintian \
+		debian/universalindentgui/usr/share/lintian/overrides/universalindentgui
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGELOG.txt
-	dh_installdocs doc doc/iniFileFormat.html --exclude=INSTALL.txt --exclude=doc/universalindentgui.1.gz --exclude=doc/universalindentgui.man
+	dh_installdocs
 	dh_installexamples
 #	dh_install
 	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
+	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/universalindentgui.lintian	Wed May 20 13:52:12 2009 +0000
@@ -0,0 +1,4 @@
+# intended behavior. We don't want to depends on ruby.
+universalindentgui: ruby-script-but-no-ruby-dep ./usr/share/universalindentgui/indenters/example.rb
+universalindentgui: ruby-script-but-no-ruby-dep ./usr/share/universalindentgui/indenters/rbeautify.rb
+universalindentgui: ruby-script-but-no-ruby-dep ./usr/share/universalindentgui/indenters/ruby_formatter.rb

--- a/debian/universalindentgui.menu	Wed May 20 08:45:50 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-?package(universalindentgui):\
-  needs="X11"\
-  section="Applications/Programming"\
-  title="UniversalIndentGUI"\
-  command="/usr/bin/universalindentgui"\
-  icon="/usr/share/pixmaps/universalIndentGUI_32x32.xpm"
-