[Python-apps-commits] r1508 - in packages/screenlets/trunk/debian (4 files)

[gilir-guest at users.alioth.debian.org]

    Date: Thursday, July 3, 2008 @ 21:25:29
  Author: gilir-guest
Revision: 1508

* Fix #488952 and #488953
* Simplify the get-orig-source rule

Modified:
  packages/screenlets/trunk/debian/changelog
  packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
  packages/screenlets/trunk/debian/rules
  packages/screenlets/trunk/debian/screenlets.install

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-06-29 22:17:46 UTC (rev 1507)
+++ packages/screenlets/trunk/debian/changelog	2008-07-03 21:25:29 UTC (rev 1508)
@@ -1,3 +1,14 @@
+screenlets (0.1.2-2) unstable; urgency=low
+
+  * debian/install
+   - Install prefix in /etc/screenlets/ (Closes: #488953)
+  * debian/patches/01-scripts-cleanup.patch
+   - Use "\n" to print correctly script output (Closes: #488952)
+  * debian/rules
+   - Only use uscan in get-orig-source.
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Thu, 03 Jul 2008 23:21:09 +0200
+
 screenlets (0.1.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch	2008-06-29 22:17:46 UTC (rev 1507)
+++ packages/screenlets/trunk/debian/patches/01-scripts-cleanup.patch	2008-07-03 21:25:29 UTC (rev 1508)
@@ -25,7 +25,7 @@
                  screenletpy="$l/$d/${d}Screenlet.py"
                  if [ -e $screenletpy ]; then
 -                    echo -e $d
-+                    printf $d
++                    printf "$d\n"
                  fi
              fi
          done
@@ -47,11 +47,11 @@
 -echo -e "Version=1.0" >> $AU_DIR/${1}Screenlet.desktop
 -echo -e "Exec=python -u $location > /dev/null" >> $AU_DIR/${1}Screenlet.desktop
 -echo -e "X-GNOME-Autostart-enabled=true" >> $AU_DIR/${1}Screenlet.desktop
-+printf "[Desktop Entry]" > $AU_DIR/${1}Screenlet.desktop              #Make a .desktop entry to autostart the screenlet
-+printf "Name=${1}Screenlet" >> $AU_DIR/${1}Screenlet.desktop
-+printf "Version=1.0" >> $AU_DIR/${1}Screenlet.desktop
-+printf "Exec=python -u $location > /dev/null" >> $AU_DIR/${1}Screenlet.desktop
-+printf "X-GNOME-Autostart-enabled=true" >> $AU_DIR/${1}Screenlet.desktop
++printf "[Desktop Entry]\n" > $AU_DIR/${1}Screenlet.desktop              #Make a .desktop entry to autostart the screenlet
++printf "Name=${1}Screenlet\n" >> $AU_DIR/${1}Screenlet.desktop
++printf "Version=1.0\n" >> $AU_DIR/${1}Screenlet.desktop
++printf "Exec=python -u $location > /dev/null\n" >> $AU_DIR/${1}Screenlet.desktop
++printf "X-GNOME-Autostart-enabled=true\n" >> $AU_DIR/${1}Screenlet.desktop
  }
  
  runScreenlet()
@@ -66,13 +66,13 @@
 -echo -e "\t    run \t\t\t Run the Screenlet"
 -echo -e "\t    au \t\t\t Add the Screenlet to your autostart list"
 -echo -e "\t    list \t\t\t List all installed screenlets"
-+printf "  Options:"
-+printf "\t --gui \t\t\t Open up the Graphical Interface"
-+printf "\t --cli \t\t\t Use the Command Line interface"
-+printf "  Cli Options (only use one at a time):"
-+printf "\t    run \t\t\t Run the Screenlet"
-+printf "\t    au \t\t\t Add the Screenlet to your autostart list"
-+printf "\t    list \t\t\t List all installed screenlets"
++printf "  Options:\n"
++printf "\t --gui \t\t\t Open up the Graphical Interface\n"
++printf "\t --cli \t\t\t Use the Command Line interface\n"
++printf "  Cli Options (only use one at a time):\n"
++printf "\t    run \t\t\t Run the Screenlet\n"
++printf "\t    au \t\t\t Add the Screenlet to your autostart list\n"
++printf "\t    list \t\t\t List all installed screenlets\n"
  }
  
 -if [ x$1 == x"--gui" ]; then            #Decide what to do

Modified: packages/screenlets/trunk/debian/rules
===================================================================
--- packages/screenlets/trunk/debian/rules	2008-06-29 22:17:46 UTC (rev 1507)
+++ packages/screenlets/trunk/debian/rules	2008-07-03 21:25:29 UTC (rev 1508)
@@ -31,9 +31,4 @@
 
 get-orig-source:
 	dh_testdir
-	cd ..
-	uscan --force-download --verbose --destdir=../$(CURDIR)
-		version=$$(uscan --force-download --dehs | \
-	sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p') && \
-	bzcat ../screenlets-$${version}.tar.bz2 | gzip --best -c - > \
-	../screenlets_$${version}.orig.tar.gz
+	uscan --force-download --verbose --repack

Modified: packages/screenlets/trunk/debian/screenlets.install
===================================================================
--- packages/screenlets/trunk/debian/screenlets.install	2008-06-29 22:17:46 UTC (rev 1507)
+++ packages/screenlets/trunk/debian/screenlets.install	2008-07-03 21:25:29 UTC (rev 1508)
@@ -7,3 +7,4 @@
 /desktop-menu/desktop-directories/* /usr/share/desktop-directories
 /desktop-menu/screenlets-daemon.desktop /usr/share/desktop-directories
 /debian/org.screenlets.ScreenletsDaemon.service /usr/share/dbus-1/services/
+debian/prefix /etc/screenlets/