From 7d601ade8e3091bd99d62d0af9c27947c054206f Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Sat, 3 Mar 2012 02:16:49 -0500
Subject: [PATCH] debian: fixed lintian errors and updated policy and compat
 levels

The following changes were made under debian/:

  * reviewed policy manual and updated Standards-Version to 3.9.1 (2012/03/03)
  * reviewed debhelper(7) manpage changes and updated compat to 7 (2012/03/03)
  * moved udev rules from /etc/udev/rules.d to /lib/udev/rules.d
  * changed backup and desktop menu icons to 32x32 XPM format
  * using >0 debian version number, since I'll probably be maintainer now
  * removed libosyncwrap.a and libosyncwrap.so from desktop package

The following changes were made under opensync-plugin/debian/:

  * Bumped compat to level 7 (2012/03/03)
  * Bumped Standards-Version to 3.9.1 (2012/03/03)
  * Using >0 debian version, since I'll probably be Debian maintainer now

The following changes were made under opensync-plugin-4x/debian/:

  * Bumped compat level to 7 (2012/03/03)
  * Bumped Standards-Version to 3.9.1 (2012/03/03)
  * Using >0 debian version, since I'll probably be Debian maintainer now
  * Fixed extended-description-line-too-long lintian warning
---
 debian/barrybackup-gui.menu                      |   2 +-
 debian/barrydesktop.install                      |   2 -
 debian/barrydesktop.menu                         |   2 +-
 debian/changelog                                 |  12 +-
 debian/compat                                    |   2 +-
 debian/control                                   |  18 +-
 debian/{libbarry0.docs => libbarry18.docs}       |   0
 debian/{libbarry0.install => libbarry18.install} |   0
 debian/rules                                     |   8 +-
 doc/ReleaseChecklist.txt                         |   3 +-
 logo/barry_logo_debian_menu_icon.xpm             | 514 +++++++++++++++++++++++
 opensync-plugin-0.4x/debian/changelog            |   8 +-
 opensync-plugin-0.4x/debian/compat               |   2 +-
 opensync-plugin-0.4x/debian/control              |   9 +-
 opensync-plugin/debian/changelog                 |   7 +-
 opensync-plugin/debian/compat                    |   2 +-
 opensync-plugin/debian/control                   |   6 +-
 17 files changed, 562 insertions(+), 35 deletions(-)
 rename debian/{libbarry0.docs => libbarry18.docs} (100%)
 rename debian/{libbarry0.install => libbarry18.install} (100%)
 create mode 100644 logo/barry_logo_debian_menu_icon.xpm

diff --git a/debian/barrybackup-gui.menu b/debian/barrybackup-gui.menu
index f52f3974..d274546e 100644
--- a/debian/barrybackup-gui.menu
+++ b/debian/barrybackup-gui.menu
@@ -4,5 +4,5 @@
   title="Barry Backup"\
   command="/usr/bin/barrybackup"\
   hints="Blackberry Backup Utility"\
-  icon="/usr/share/pixmaps/barry_logo_icon.png"
+  icon="/usr/share/pixmaps/barry_backup_menu_icon.xpm"
 
diff --git a/debian/barrydesktop.install b/debian/barrydesktop.install
index 1a51d652..e5a8c252 100644
--- a/debian/barrydesktop.install
+++ b/debian/barrydesktop.install
@@ -6,7 +6,5 @@ debian/tmp/usr/share/barry/desktop/0.40/*
 debian/tmp/usr/share/barry/desktop/images/*
 debian/tmp/usr/share/man/man1/barrydesktop.1
 debian/tmp/usr/lib/libosyncwrap.so.*
-debian/tmp/usr/lib/libosyncwrap.a
-debian/tmp/usr/lib/libosyncwrap.so
 debian/tmp/usr/include/barry*/osyncwrap/*
 
diff --git a/debian/barrydesktop.menu b/debian/barrydesktop.menu
index 1bcd9c9b..0b24f54b 100644
--- a/debian/barrydesktop.menu
+++ b/debian/barrydesktop.menu
@@ -4,5 +4,5 @@
   title="Barry Desktop Panel"\
   command="/usr/bin/barrydesktop"\
   hints="Blackberry Management GUI"\
-  icon="/usr/share/pixmaps/barry_desktop_icon.png"
+  icon="/usr/share/pixmaps/barry_desktop_menu_icon.xpm"
 
diff --git a/debian/changelog b/debian/changelog
index 06b4f928..a3d8934c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-barry (0.18.0-0) unstable; urgency=low
+barry (0.18.0-1) unstable; urgency=low
 
   * version bump
   * moved opensync-plugin into its own build
@@ -9,8 +9,14 @@ barry (0.18.0-0) unstable; urgency=low
   * added bwatch
   * added btarcmp
   * made udev linux-only, as per intrigeri's patch 539ed1b43b5559b8a90f7b651
-
- -- Chris Frey <cdfrey@foursquare.net>  Mon,  2 Jan 2012 03:20:18 -0400
+  * reviewed policy manual and updated Standards-Version to 3.9.1 (2012/03/03)
+  * reviewed debhelper(7) manpage changes and updated compat to 7 (2012/03/03)
+  * moved udev rules from /etc/udev/rules.d to /lib/udev/rules.d
+  * changed backup and desktop menu icons to 32x32 XPM format
+  * using >0 debian version number, since I'll probably be maintainer now
+  * removed libosyncwrap.a and libosyncwrap.so from desktop package
+
+ -- Chris Frey <cdfrey@foursquare.net>  Sat,  3 Mar 2012 00:38:40 -0500
 
 barry (0.13-1.2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 1e8b3149..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index ebae788d..c83a0ca4 100644
--- a/debian/control
+++ b/debian/control
@@ -32,11 +32,11 @@ Source: barry
 Section: misc
 Priority: optional
 Maintainer: Chris Frey <cdfrey@foursquare.net>
-Build-Depends: debhelper (>= 6.0.0), g++ (>= 4.1), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, libboost-serialization-dev, libxml++2.6-dev, libfuse-dev (>= 2.5), zlib1g-dev, libtar-dev, libglib2.0-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, gettext (<< 0.18) | autopoint, libgcal-dev, wx-common, libwxgtk2.8-dev, evolution-data-server-dev, libebook1.2-dev, libedata-book1.2-dev, libedata-cal1.2-dev, libedataserver1.2-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.0), g++ (>= 4.1), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, libboost-serialization-dev, libxml++2.6-dev, libfuse-dev (>= 2.5), zlib1g-dev, libtar-dev, libglib2.0-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, gettext (<< 0.18) | autopoint, libgcal-dev, wx-common, libwxgtk2.8-dev, evolution-data-server-dev, libebook1.2-dev, libedata-book1.2-dev, libedata-cal1.2-dev, libedataserver1.2-dev
+Standards-Version: 3.9.1
 Homepage: http://netdirect.ca/barry
 
-Package: libbarry0
+Package: libbarry18
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -45,11 +45,11 @@ Description: Library for using the BlackBerry handheld on Linux
  .
  This package contains shared libraries.
 
-Package: libbarry0-dbg
+Package: libbarry18-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libbarry0 (= ${binary:Version})
+Depends: libbarry18 (= ${binary:Version})
 Description: Library for using the BlackBerry handheld and debugging symbols
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
  .
@@ -58,7 +58,7 @@ Description: Library for using the BlackBerry handheld and debugging symbols
 Package: libbarry-dev
 Section: libdevel
 Architecture: any
-Depends: libbarry0 (= ${binary:Version})
+Depends: libbarry18 (= ${binary:Version})
 Description: Development files for libbarry
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
  .
@@ -68,7 +68,7 @@ Description: Development files for libbarry
 Package: barry-util
 Section: utils
 Architecture: any
-Depends: libbarry0 (>= 0.18), libbarry0 (<< 0.19), udev (>= 0.056) [linux-any], python, ${shlibs:Depends}
+Depends: libbarry18, udev (>= 0.056) [linux-any], python, ${shlibs:Depends}
 Suggests: ppp
 Description: Command line utilities for working with the RIM BlackBerry Handheld
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
@@ -89,7 +89,7 @@ Description: Command line BlackBerry utilities and debugging symbols
 Package: barrybackup-gui
 Section: utils
 Architecture: any
-Depends: libbarry0 (>= 0.18), libbarry0 (<< 0.19), ${shlibs:Depends}
+Depends: libbarry18, ${shlibs:Depends}
 Description: GTK+ GUI for backing up the RIM BlackBerry Handheld
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
  .
@@ -108,7 +108,7 @@ Description: GTK+ GUI for backing up BlackBerry and debugging symbols
 Package: barrydesktop
 Section: utils
 Architecture: any
-Depends: libbarry0 (>= 0.18), libbarry0 (<< 0.19), ${shlibs:Depends}
+Depends: libbarry18, ${shlibs:Depends}
 Description: Desktop Panel GUI for the RIM BlackBerry Handheld
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
  .
diff --git a/debian/libbarry0.docs b/debian/libbarry18.docs
similarity index 100%
rename from debian/libbarry0.docs
rename to debian/libbarry18.docs
diff --git a/debian/libbarry0.install b/debian/libbarry18.install
similarity index 100%
rename from debian/libbarry0.install
rename to debian/libbarry18.install
diff --git a/debian/rules b/debian/rules
index 10c43d42..24612859 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,11 @@ DEB_INSTALL_DOCS_ALL =
 install/barry-util::
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	# Install udev rules for the barry-util package
-	install -d $(CURDIR)/debian/barry-util/etc/udev/rules.d
+	install -d $(CURDIR)/debian/barry-util/lib/udev/rules.d
 	install -m 0644 \
 		$(DEB_SRCDIR)/udev/10-blackberry.rules \
 		$(DEB_SRCDIR)/udev/99-blackberry-perms.rules \
-		$(CURDIR)/debian/barry-util/etc/udev/rules.d
+		$(CURDIR)/debian/barry-util/lib/udev/rules.d
 endif
 	# Install modprobe blacklist file for bcharge, into barry-util package
 	install -d $(CURDIR)/debian/barry-util/etc/modprobe.d
@@ -95,7 +95,7 @@ endif
 install/barrybackup-gui::
 	# Install barry icon
 	install -d $(CURDIR)/debian/barrybackup-gui/usr/share/pixmaps
-	install -m 0644 $(DEB_SRCDIR)/logo/barry_logo_icon.png $(CURDIR)/debian/barrybackup-gui/usr/share/pixmaps
+	install -m 0644 $(DEB_SRCDIR)/logo/barry_logo_debian_menu_icon.xpm $(CURDIR)/debian/barrybackup-gui/usr/share/pixmaps/barry_backup_menu_icon.xpm
 	# Install Gnome .desktop file
 	install -d $(CURDIR)/debian/barrybackup-gui/usr/share/applications
 	install -m 0644 $(DEB_SRCDIR)/menu/barrybackup.desktop $(CURDIR)/debian/barrybackup-gui/usr/share/applications
@@ -103,7 +103,7 @@ install/barrybackup-gui::
 install/barrydesktop::
 	# Install barry icon
 	install -d $(CURDIR)/debian/barrydesktop/usr/share/pixmaps
-	install -m 0644 $(DEB_SRCDIR)/logo/barry_logo_icon.png $(CURDIR)/debian/barrydesktop/usr/share/pixmaps/barry_desktop_icon.png
+	install -m 0644 $(DEB_SRCDIR)/logo/barry_logo_debian_menu_icon.xpm $(CURDIR)/debian/barrydesktop/usr/share/pixmaps/barry_desktop_menu_icon.xpm
 	# Install Gnome .desktop file
 	install -d $(CURDIR)/debian/barrydesktop/usr/share/applications
 	install -m 0644 $(DEB_SRCDIR)/menu/barrydesktop.desktop $(CURDIR)/debian/barrydesktop/usr/share/applications
diff --git a/doc/ReleaseChecklist.txt b/doc/ReleaseChecklist.txt
index a04bbd37..99057c61 100644
--- a/doc/ReleaseChecklist.txt
+++ b/doc/ReleaseChecklist.txt
@@ -12,7 +12,8 @@ Barry Release Checklist:
 		- Doxyfile
 		- rpm/barry.spec
 		- debian/changelog
-		- debian/control (libbarry0 should not depend on minor number)
+		- debian/control (libbarry's name includes version number)
+		- debian/libbarry*.* (files need to be renamed)
 		- debian/rules (the barry18 includedir)
 		- opensync-plugin/configure.ac
 		- opensync-plugin/src/barry_sync.cc
diff --git a/logo/barry_logo_debian_menu_icon.xpm b/logo/barry_logo_debian_menu_icon.xpm
new file mode 100644
index 00000000..e65a575d
--- /dev/null
+++ b/logo/barry_logo_debian_menu_icon.xpm
@@ -0,0 +1,514 @@
+/* XPM */
+static char * barry_logo_debian_menu_icon_xpm[] = {
+"32 32 479 2",
+"  	c None",
+". 	c #FFFFFF",
+"+ 	c #FCFCFC",
+"@ 	c #CCCCCB",
+"# 	c #C2C7C2",
+"$ 	c #B7BAB7",
+"% 	c #E6E5E6",
+"& 	c #E3E4E2",
+"* 	c #FEFEFE",
+"= 	c #ECECEC",
+"- 	c #2D642A",
+"; 	c #153C13",
+"> 	c #1D571A",
+", 	c #A2A3A3",
+"' 	c #FFFEFF",
+") 	c #FDFCFD",
+"! 	c #B8B2B8",
+"~ 	c #1D521A",
+"{ 	c #446442",
+"] 	c #F2F2F2",
+"^ 	c #336531",
+"/ 	c #123E0F",
+"( 	c #1C6319",
+"_ 	c #156712",
+": 	c #C7CBC7",
+"< 	c #99A298",
+"[ 	c #10660C",
+"} 	c #20701C",
+"| 	c #0C3A0A",
+"1 	c #BEC2BE",
+"2 	c #979E9A",
+"3 	c #002700",
+"4 	c #185715",
+"5 	c #0C320A",
+"6 	c #324632",
+"7 	c #1F681C",
+"8 	c #0C2C0A",
+"9 	c #1D6B19",
+"0 	c #0F360D",
+"a 	c #1B6917",
+"b 	c #838983",
+"c 	c #FDFEFD",
+"d 	c #9A9194",
+"e 	c #601A35",
+"f 	c #5A263A",
+"g 	c #8C8687",
+"h 	c #6C012A",
+"i 	c #4D0522",
+"j 	c #14190B",
+"k 	c #164612",
+"l 	c #361018",
+"m 	c #2E1115",
+"n 	c #154A12",
+"o 	c #0F380D",
+"p 	c #124510",
+"q 	c #174010",
+"r 	c #BBBEBB",
+"s 	c #D6D4D5",
+"t 	c #E0E0E0",
+"u 	c #D3D0D2",
+"v 	c #8D3255",
+"w 	c #96083F",
+"x 	c #92083D",
+"y 	c #46041C",
+"z 	c #9A1046",
+"A 	c #950A40",
+"B 	c #8C083C",
+"C 	c #340B1C",
+"D 	c #9C1147",
+"E 	c #980A41",
+"F 	c #530523",
+"G 	c #4F202E",
+"H 	c #842D4B",
+"I 	c #850638",
+"J 	c #511F33",
+"K 	c #913458",
+"L 	c #8A224A",
+"M 	c #877A7F",
+"N 	c #C0B3B8",
+"O 	c #860034",
+"P 	c #930A3F",
+"Q 	c #8B0A3C",
+"R 	c #49051F",
+"S 	c #950B40",
+"T 	c #7C0935",
+"U 	c #580425",
+"V 	c #970A40",
+"W 	c #940A40",
+"X 	c #87093A",
+"Y 	c #45011B",
+"Z 	c #94053C",
+"` 	c #960A41",
+" .	c #67072C",
+"..	c #7D0232",
+"+.	c #96093F",
+"@.	c #6A1233",
+"#.	c #E2E6E5",
+"$.	c #FDFDFD",
+"%.	c #D9DCDB",
+"&.	c #780A35",
+"*.	c #8D0A3D",
+"=.	c #860839",
+"-.	c #380317",
+";.	c #41051C",
+">.	c #750831",
+",.	c #4F0521",
+"'.	c #350416",
+").	c #590626",
+"!.	c #8C093C",
+"~.	c #4E0521",
+"{.	c #300315",
+"].	c #840A39",
+"^.	c #5A0526",
+"/.	c #2F0213",
+"(.	c #6C072F",
+"_.	c #5C162F",
+":.	c #E7EAE9",
+"<.	c #F3F7F6",
+"[.	c #542838",
+"}.	c #370116",
+"|.	c #69062D",
+"1.	c #500421",
+"2.	c #76193C",
+"3.	c #A50B47",
+"4.	c #380418",
+"5.	c #981446",
+"6.	c #9B0A42",
+"7.	c #7B0835",
+"8.	c #2B0413",
+"9.	c #920D40",
+"0.	c #9C0B42",
+"a.	c #3E041A",
+"b.	c #540C28",
+"c.	c #A5104A",
+"d.	c #3E0219",
+"e.	c #58444C",
+"f.	c #FAFAFA",
+"g.	c #694F59",
+"h.	c #BE5D81",
+"i.	c #91083D",
+"j.	c #810937",
+"k.	c #380318",
+"l.	c #A3174C",
+"m.	c #8C093B",
+"n.	c #4E0622",
+"o.	c #981146",
+"p.	c #750832",
+"q.	c #730932",
+"r.	c #950D41",
+"s.	c #47071F",
+"t.	c #8F0C3E",
+"u.	c #5C0023",
+"v.	c #AC416A",
+"w.	c #9A7F89",
+"x.	c #704C5A",
+"y.	c #99003B",
+"z.	c #940B40",
+"A.	c #8E0A3D",
+"B.	c #41041C",
+"C.	c #9D0C44",
+"D.	c #4E0421",
+"E.	c #960B41",
+"F.	c #970B41",
+"G.	c #6F082F",
+"H.	c #780833",
+"I.	c #89093B",
+"J.	c #88093A",
+"K.	c #850939",
+"L.	c #600629",
+"M.	c #830938",
+"N.	c #7E0936",
+"O.	c #600729",
+"P.	c #94043C",
+"Q.	c #5A2D3E",
+"R.	c #A3A9A7",
+"S.	c #63001F",
+"T.	c #840939",
+"U.	c #7F0837",
+"V.	c #350317",
+"W.	c #800837",
+"X.	c #520623",
+"Y.	c #7F0936",
+"Z.	c #40031A",
+"`.	c #730731",
+" +	c #250210",
+".+	c #750732",
+"++	c #740832",
+"@+	c #48051F",
+"#+	c #280110",
+"$+	c #6E072E",
+"%+	c #310315",
+"&+	c #730831",
+"*+	c #73032F",
+"=+	c #988A8F",
+"-+	c #F8FCFB",
+";+	c #2A000C",
+">+	c #45041D",
+",+	c #550F2B",
+"'+	c #46041D",
+")+	c #4C0520",
+"!+	c #360317",
+"~+	c #4D0420",
+"{+	c #900B3E",
+"]+	c #4D0521",
+"^+	c #6B0C31",
+"/+	c #9B1348",
+"(+	c #960A40",
+"_+	c #6F0730",
+":+	c #5E1632",
+"<+	c #9B1549",
+"[+	c #990B41",
+"}+	c #27000F",
+"|+	c #50172D",
+"1+	c #927F87",
+"2+	c #615258",
+"3+	c #B63D6B",
+"4+	c #91093D",
+"5+	c #73052F",
+"6+	c #9A345B",
+"7+	c #92073D",
+"8+	c #910A3F",
+"9+	c #540422",
+"0+	c #A42F5C",
+"a+	c #93073D",
+"b+	c #65072B",
+"c+	c #870A3A",
+"d+	c #40041B",
+"e+	c #93093F",
+"f+	c #570424",
+"g+	c #78163C",
+"h+	c #570017",
+"i+	c #CAD3D0",
+"j+	c #685E62",
+"k+	c #9B023E",
+"l+	c #7A0834",
+"m+	c #7F0735",
+"n+	c #540523",
+"o+	c #6D072E",
+"p+	c #970A41",
+"q+	c #920A3F",
+"r+	c #830838",
+"s+	c #8F0A3D",
+"t+	c #4B0420",
+"u+	c #760832",
+"v+	c #510017",
+"w+	c #C2CBC8",
+"x+	c #EFF5F3",
+"y+	c #38000B",
+"z+	c #88073A",
+"A+	c #7E0836",
+"B+	c #320316",
+"C+	c #69072C",
+"D+	c #6B072D",
+"E+	c #3D041A",
+"F+	c #900A3D",
+"G+	c #940B3F",
+"H+	c #43041C",
+"I+	c #64072B",
+"J+	c #710730",
+"K+	c #3D0319",
+"L+	c #28000F",
+"M+	c #62062A",
+"N+	c #45051D",
+"O+	c #22020E",
+"P+	c #330010",
+"Q+	c #8A8285",
+"R+	c #D6D8D7",
+"S+	c #300F1C",
+"T+	c #330315",
+"U+	c #5C0727",
+"V+	c #60092B",
+"W+	c #7E0835",
+"X+	c #45051E",
+"Y+	c #64062B",
+"Z+	c #2E0213",
+"`+	c #7E103B",
+" @	c #A02C59",
+".@	c #7A0733",
+"+@	c #820938",
+"@@	c #610327",
+"#@	c #B03B69",
+"$@	c #430018",
+"%@	c #D5D8D7",
+"&@	c #903056",
+"*@	c #8F073C",
+"=@	c #4A0721",
+"-@	c #98194A",
+";@	c #93093E",
+">@	c #63072A",
+",@	c #6E0930",
+"'@	c #AB476E",
+")@	c #94083D",
+"!@	c #4E0723",
+"~@	c #9B1247",
+"{@	c #830937",
+"]@	c #43031C",
+"^@	c #9D0D44",
+"/@	c #510014",
+"(@	c #C6CFCB",
+"_@	c #EAEEEC",
+":@	c #6E1638",
+"<@	c #990B42",
+"[@	c #750833",
+"}@	c #870939",
+"|@	c #930B40",
+"1@	c #5F0528",
+"2@	c #65062B",
+"3@	c #750631",
+"4@	c #3E1224",
+"5@	c #BDB9BB",
+"6@	c #490F26",
+"7@	c #3A0016",
+"8@	c #550524",
+"9@	c #63072B",
+"0@	c #980B42",
+"a@	c #7B0834",
+"b@	c #340316",
+"c@	c #3E031A",
+"d@	c #2B0010",
+"e@	c #661E3A",
+"f@	c #570726",
+"g@	c #4B182A",
+"h@	c #DFE1E0",
+"i@	c #EBECEC",
+"j@	c #952F57",
+"k@	c #990940",
+"l@	c #370418",
+"m@	c #401123",
+"n@	c #510422",
+"o@	c #5B0425",
+"p@	c #41041B",
+"q@	c #79133A",
+"r@	c #A00A44",
+"s@	c #6E042D",
+"t@	c #802A4B",
+"u@	c #9B0E44",
+"v@	c #720931",
+"w@	c #D2D5D4",
+"x@	c #DDD7D9",
+"y@	c #921A48",
+"z@	c #9A0A42",
+"A@	c #580525",
+"B@	c #971446",
+"C@	c #960940",
+"D@	c #400C20",
+"E@	c #9B2453",
+"F@	c #880839",
+"G@	c #870D3D",
+"H@	c #940A3F",
+"I@	c #47031D",
+"J@	c #770833",
+"K@	c #532336",
+"L@	c #F3F5F4",
+"M@	c #EFF2F1",
+"N@	c #703149",
+"O@	c #7E0635",
+"P@	c #6C072E",
+"Q@	c #3C0419",
+"R@	c #6D082F",
+"S@	c #9C0B43",
+"T@	c #560424",
+"U@	c #68062C",
+"V@	c #40051C",
+"W@	c #530E29",
+"X@	c #3B0011",
+"Y@	c #E9EBEA",
+"Z@	c #A5959A",
+"`@	c #620024",
+" #	c #860A3A",
+".#	c #42061C",
+"+#	c #680029",
+"@#	c #4D0421",
+"##	c #700731",
+"$#	c #800836",
+"%#	c #45031D",
+"&#	c #883856",
+"*#	c #660329",
+"=#	c #68082D",
+"-#	c #9C174B",
+";#	c #820032",
+">#	c #9D9F9F",
+",#	c #B8AEB2",
+"'#	c #8F1A47",
+")#	c #57001F",
+"!#	c #BA4E78",
+"~#	c #67032A",
+"{#	c #5C1E35",
+"]#	c #42041C",
+"^#	c #810938",
+"/#	c #44041D",
+"(#	c #700931",
+"_#	c #4C2232",
+":#	c #F5FAF8",
+"<#	c #FBFBFB",
+"[#	c #EEEEEE",
+"}#	c #DEDEDE",
+"|#	c #C0C0C0",
+"1#	c #4E0924",
+"2#	c #7A0130",
+"3#	c #2D000F",
+"4#	c #8F073B",
+"5#	c #4A021F",
+"6#	c #A22354",
+"7#	c #9D0B43",
+"8#	c #40031B",
+"9#	c #390318",
+"0#	c #810736",
+"a#	c #3E373A",
+"b#	c #F2F4F4",
+"c#	c #F3F3F3",
+"d#	c #DDDDDD",
+"e#	c #C8C8C8",
+"f#	c #B4B4B4",
+"g#	c #A2A2A2",
+"h#	c #818785",
+"i#	c #394641",
+"j#	c #443138",
+"k#	c #461529",
+"l#	c #3F031A",
+"m#	c #5C0628",
+"n#	c #67062B",
+"o#	c #5B0526",
+"p#	c #A40A46",
+"q#	c #7F0434",
+"r#	c #473D41",
+"s#	c #CDCDCD",
+"t#	c #F7F7F7",
+"u#	c #E1E1E1",
+"v#	c #CBCBCB",
+"w#	c #B3B3B3",
+"x#	c #9B9B9B",
+"y#	c #848484",
+"z#	c #6E6E6E",
+"A#	c #595A59",
+"B#	c #2E2126",
+"C#	c #A7114B",
+"D#	c #590425",
+"E#	c #7C0735",
+"F#	c #880739",
+"G#	c #361B25",
+"H#	c #352028",
+"I#	c #4C4045",
+"J#	c #9A9A9A",
+"K#	c #CACACA",
+"L#	c #F9F9F9",
+"M#	c #E3E3E3",
+"N#	c #9D9D9D",
+"O#	c #868686",
+"P#	c #6F6F6F",
+"Q#	c #5A5A5A",
+"R#	c #424443",
+"S#	c #240C15",
+"T#	c #450C22",
+"U#	c #151817",
+"V#	c #191A19",
+"W#	c #1F1D1E",
+"X#	c #575858",
+"Y#	c #757575",
+"Z#	c #898989",
+"`#	c #9C9C9C",
+" $	c #F6F6F6",
+".$	c #CCCCCC",
+"+$	c #B8B8B8",
+"@$	c #A5A5A5",
+"#$	c #939393",
+"$$	c #838383",
+"%$	c #777676",
+"&$	c #6B6D6C",
+"*$	c #626564",
+"=$	c #686868",
+"-$	c #787878",
+";$	c #F4F4F4",
+">$	c #E4E4E4",
+",$	c #D5D5D5",
+"'$	c #C7C7C7",
+")$	c #BDBDBD",
+"!$	c #ADADAD",
+"~$	c #AAAAAA",
+"{$	c #F0F0F0",
+". . . . . . . . . . + @ # $ . . . . % & . . . . . . . . . . . . ",
+". . . . . . . . . * = - ; > , ' ) ! ~ { . * . . . . . . . . . . ",
+". . . . . . . * . . ] ^ / ( _ : < [ } | 1 . * . . . . . . . . . ",
+". . . . . * * . . . . 2 3 4 5 6 7 8 9 0 a b . . . * . . . . . . ",
+". . . . . . c d e f g h i j k l m n o p q r s t . * . . . . . . ",
+". . . . . . u v w x y z A B C D E F G H I J K L M . . . . . . . ",
+". . . . * . N O P Q R E S T U V W X Y Z `  ...+.@.#.* . . . . . ",
+". . . . . $.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(.A _.:.. . . . . . ",
+". . . . . <.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.F d.e.f.* . . . . . ",
+". . . . . g.h.i.j.k.l.m.n.o.W p.q.r.P A s.t.!.u.v.w.. . . . . . ",
+". . . . . x.y.z.A.B.C.X D.E.F.G.H.I.J.K.L.M.N.O.P.Q.. . . . . . ",
+". . . . . R.S.T.U.V.H.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+. . . . . . ",
+". . . . . -+;+,.>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+. * . . . . ",
+". . . . . 2+3+4+5+6+7+8+9+0+a+b+c+z.z.(+d+A.e+f+g+h+i+. . . . . ",
+". . . . . j+k+S l+m+z.A.n+a+S o+p.p+q+r+d+s+*.t+u+v+w+. . . . . ",
+". . . . . x+y+z+A+B+C+D+E+F+G+J.H+I+J+K+L+M+N+O+P+Q+. * . . . . ",
+". . . . * . R+S+T+]+U+V+W+X+|.Y+}.O.Z+`+ @.@+@@@#@$@. . . . . . ",
+". . . . . * %@&@*@6.=@-@;@X >@,@'@)@s+!@~@A {@]@^@/@(@. . . . . ",
+". . . . . * _@:@` <@>+4+z.A [@}@|@W F+B.s+J.1@2@3@4@. * . . . . ",
+". . . . . . . 5@6@7@k.&+s+}@8@9@0@!.a@b@c@d@e@f@g@h@* . . . . . ",
+". . . . . * * . i@j@k@>+l@m@n@l@o@L.p@q@r@s@t@u@v@w@. * . . . . ",
+". . . . . . . . x@y@P z@A@B@C@D@E@F@ .G@H@.+I@J@K@L@* . . . . . ",
+". . . . . . . * M@N@O@P@Q@R@T E+S@q+u+T@U@V@W@X@(@. . . . . . . ",
+". . . . . . . . . Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#. * . . . . . ",
+". . . . * . * . * . ,#'#*@)#!#~#{#A@]#(+^#/#(#_#:#. . * . . . . ",
+". . . . . * . <#[#}#|#1#2#3#4#5#6#7#/#8#9#0#a#b#+ . * . . . . . ",
+". . . . . * c#d#e#f#g#h#i#j#k#l#m#n#).o#p#q#r#s#d#c#* . . . . . ",
+". . . . . t#u#v#w#x#y#z#A#B#C#` D#E#F#G#H#I#J#w#K#u#t#. . . . . ",
+". . . . . L#M#v#f#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`#f#v#M#L#. . . . . ",
+". . . . * *  $u#.$+$@$#$$$%$&$*$=$z#-$$$#$@$+$.$u# $* * . . . . ",
+". . . . . * . $.;$>$,$'$)$w#!$~$~$!$w#)$'$,$>$;$$.. * . . . . . ",
+". . . . * . . . * . + L# $c#{$[#[#{$c# $L#+ . * . . . * . . . . "};
diff --git a/opensync-plugin-0.4x/debian/changelog b/opensync-plugin-0.4x/debian/changelog
index baa5f11b..0aa95120 100644
--- a/opensync-plugin-0.4x/debian/changelog
+++ b/opensync-plugin-0.4x/debian/changelog
@@ -1,11 +1,15 @@
-opensync1-plugin-barry (0.18-0) unstable; urgency=low
+opensync1-plugin-barry (0.18-1) unstable; urgency=low
 
   * Build rules for Barry releases
   * Bumped compat level to 6 (2011/06/28)
   * Removed .la files (2011/07/05)
   * Renamed package to opensync1-plugin-barry (2011/10/11)
+  * Bumped compat level to 7 (2012/03/03)
+  * Bumped Standards-Version to 3.9.1 (2012/03/03)
+  * Using >0 debian version, since I'll probably be Debian maintainer now
+  * Fixed extended-description-line-too-long lintian warning
 
- -- Chris Frey <cdfrey@foursquare.net>  Tue, 11 Oct 2011 00:03:23 -0400
+ -- Chris Frey <cdfrey@foursquare.net>  Sat,  3 Mar 2012 00:43:34 -0500
 
 opensync1-plugin-barry (0.17-0) unstable; urgency=low
 
diff --git a/opensync-plugin-0.4x/debian/compat b/opensync-plugin-0.4x/debian/compat
index 1e8b3149..7f8f011e 100644
--- a/opensync-plugin-0.4x/debian/compat
+++ b/opensync-plugin-0.4x/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/opensync-plugin-0.4x/debian/control b/opensync-plugin-0.4x/debian/control
index 80b7320b..3c8c7aa4 100644
--- a/opensync-plugin-0.4x/debian/control
+++ b/opensync-plugin-0.4x/debian/control
@@ -2,17 +2,18 @@ Source: opensync1-plugin-barry
 Section: misc
 Priority: optional
 Maintainer: Chris Frey <cdfrey@foursquare.net>
-Build-Depends: debhelper (>= 6.0.0), g++ (>= 4.1), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, zlib1g-dev, libopensync1-dev (>=0.39), libbarry-dev (>= 0.18)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.0), g++ (>= 4.1), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, zlib1g-dev, libopensync1-dev (>=0.39), libbarry-dev (>= 0.18)
+Standards-Version: 3.9.1
 
 Package: opensync1-plugin-barry
 Section: libs
 Architecture: any
-Depends: libopensync1 (>= 0.39), libbarry0 (>= 0.18), libbarry0 (<< 0.19), ${shlibs:Depends}
+Depends: libopensync1 (>= 0.39), libbarry18, ${shlibs:Depends}
 Description: Opensync Blackberry plugin, based on the Barry project
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
  .
- This package contains an opensync plugin for use with libopensync 0.39 and above.
+ This package contains an opensync plugin for use with libopensync 0.39
+ and above.
 
 Package: opensync1-plugin-barry-dbg
 Section: debug
diff --git a/opensync-plugin/debian/changelog b/opensync-plugin/debian/changelog
index 6e7a04a0..574035ba 100644
--- a/opensync-plugin/debian/changelog
+++ b/opensync-plugin/debian/changelog
@@ -1,9 +1,12 @@
-opensync0-plugin-barry (0.18-0) unstable; urgency=low
+opensync0-plugin-barry (0.18-1) unstable; urgency=low
 
   * Individual package for the 0.22 plugin
   * Bumped compat to level 6 (2011/06/28)
   * Removed .la files (2011/07/05)
   * Renamed package to opensync0-plugin-barry (2011/10/11)
+  * Bumped compat to level 7 (2012/03/03)
+  * Bumped Standards-Version to 3.9.1 (2012/03/03)
+  * Using >0 debian version, since I'll probably be Debian maintainer now
 
- -- Chris Frey <cdfrey@foursquare.net>  Tue, 11 Oct 2011 03:20:17 -0400
+ -- Chris Frey <cdfrey@foursquare.net>  Sat,  3 Mar 2012 00:44:39 -0500
 
diff --git a/opensync-plugin/debian/compat b/opensync-plugin/debian/compat
index 1e8b3149..7f8f011e 100644
--- a/opensync-plugin/debian/compat
+++ b/opensync-plugin/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/opensync-plugin/debian/control b/opensync-plugin/debian/control
index 6a2b5271..6ba8d5e0 100644
--- a/opensync-plugin/debian/control
+++ b/opensync-plugin/debian/control
@@ -2,13 +2,13 @@ Source: opensync0-plugin-barry
 Section: misc
 Priority: optional
 Maintainer: Chris Frey <cdfrey@foursquare.net>
-Build-Depends: debhelper (>= 6.0.0), g++ (>= 4.1), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, zlib1g-dev, libopensync0-dev (>= 0.22), libopensync0-dev (<< 0.30), libbarry-dev (>= 0.18)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.0), g++ (>= 4.1), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, zlib1g-dev, libopensync0-dev (>= 0.22), libopensync0-dev (<< 0.30), libbarry-dev (>= 0.18)
+Standards-Version: 3.9.1
 
 Package: opensync0-plugin-barry
 Section: libs
 Architecture: any
-Depends: libopensync0 (>= 0.22), libopensync0 (<< 0.30), libbarry0 (>= 0.18), libbarry0 (<< 0.19), ${shlibs:Depends}
+Depends: libopensync0 (>= 0.22), libopensync0 (<< 0.30), libbarry18, ${shlibs:Depends}
 Description: Opensync Blackberry plugin, based on the Barry project
  Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
  .
-- 
2.11.4.GIT