[DRE-commits] r4900 - in trunk/libcompass-ruby: . bin debian debian/patches

Micah Anderson micah at alioth.debian.org
Sat Mar 6 01:05:14 UTC 2010


Author: micah
Date: 2010-03-06 01:05:03 +0000 (Sat, 06 Mar 2010)
New Revision: 4900

Added:
   trunk/libcompass-ruby/debian/
   trunk/libcompass-ruby/debian/README.source
   trunk/libcompass-ruby/debian/changelog
   trunk/libcompass-ruby/debian/compat
   trunk/libcompass-ruby/debian/control
   trunk/libcompass-ruby/debian/copyright
   trunk/libcompass-ruby/debian/libcompass-ruby1.8.docs
   trunk/libcompass-ruby/debian/libcompass-ruby1.8.examples
   trunk/libcompass-ruby/debian/libcompass-ruby1.8.install
   trunk/libcompass-ruby/debian/patches/
   trunk/libcompass-ruby/debian/patches/get-version-from-right-place
   trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share
   trunk/libcompass-ruby/debian/patches/series
   trunk/libcompass-ruby/debian/repack.sh
   trunk/libcompass-ruby/debian/rules
   trunk/libcompass-ruby/debian/watch
Modified:
   trunk/libcompass-ruby/bin/compass
Log:
[svn-inject] Applying Debian modifications to trunk

Modified: trunk/libcompass-ruby/bin/compass
===================================================================
--- trunk/libcompass-ruby/bin/compass	2010-03-06 01:04:48 UTC (rev 4899)
+++ trunk/libcompass-ruby/bin/compass	2010-03-06 01:05:03 UTC (rev 4900)
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#! /usr/bin/ruby1.8
 # The compass command line utility
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'compass'))


Property changes on: trunk/libcompass-ruby/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/libcompass-ruby/debian/README.source
===================================================================
--- trunk/libcompass-ruby/debian/README.source	                        (rev 0)
+++ trunk/libcompass-ruby/debian/README.source	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,8 @@
+This package includes patches managed with the «quilt» patch
+management system. Changes to the upstream sources are stored as diffs
+in debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+ -- Micah Anderson <micah at debian.org>, Thu,  4 Mar 2010 16:53:54 -0500
+

Added: trunk/libcompass-ruby/debian/changelog
===================================================================
--- trunk/libcompass-ruby/debian/changelog	                        (rev 0)
+++ trunk/libcompass-ruby/debian/changelog	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,8 @@
+libcompass-ruby (0.8.5debian-1) unstable; urgency=low
+
+  * repack upstream source to remove license amigious 
+    example files and vendored fssm library
+  * Install VERSION.yaml and patch source to find it properly
+  * Initial release (Closes: #572555)
+
+ -- Micah Anderson <micah at debian.org>  Thu, 04 Mar 2010 15:45:17 -0500

Added: trunk/libcompass-ruby/debian/compat
===================================================================
--- trunk/libcompass-ruby/debian/compat	                        (rev 0)
+++ trunk/libcompass-ruby/debian/compat	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1 @@
+7

Added: trunk/libcompass-ruby/debian/control
===================================================================
--- trunk/libcompass-ruby/debian/control	                        (rev 0)
+++ trunk/libcompass-ruby/debian/control	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,37 @@
+Source: libcompass-ruby
+Section: ruby
+Priority: optional
+Maintainer: Micah Anderson <micah at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7), cdbs, ruby-pkg-tools (>= 0.8), libsetup-ruby1.8, quilt
+Standards-Version: 3.8.4
+Homepage: http://wiki.github.com/chriseppstein/compass/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libcompass-ruby/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libcompass-ruby/
+
+Package: libcompass-ruby
+Architecture: all
+Depends: libruby1.8, libhaml-ruby, ${misc:Depends}
+Description: Compass is a SASS-based stylesheet authoring tool
+ Compass is a stylesheet authoring tool that uses the Sass stylesheet
+ language to make your stylesheets smaller and your web site easier to
+ maintain. Compass provides ports of the best of breed css frameworks
+ that you can use without forcing you to use their presentational
+ class names. 
+ .
+ This is a dependency package which depends on Debian's default Ruby version
+ (currently 1.8).
+
+Package: libcompass-ruby1.8
+Architecture: all
+Depends: libruby1.8, libhaml-ruby1.8, ruby1.8, ${misc:Depends}
+Description: Compass is a SASS-based stylesheet authoring tool (Ruby 1.8)
+ Compass is a stylesheet authoring tool that uses the Sass stylesheet
+ language to make your stylesheets smaller and your web site easier to
+ maintain. Compass provides ports of the best of breed css frameworks
+ that you can use without forcing you to use their presentational
+ class names. 
+ .
+ This package is built for Ruby 1.8.
+
+

Added: trunk/libcompass-ruby/debian/copyright
===================================================================
--- trunk/libcompass-ruby/debian/copyright	                        (rev 0)
+++ trunk/libcompass-ruby/debian/copyright	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,83 @@
+Files: examples/ninesixty/src/grid.sass, examples/ninesixty/src/text.sass
+
+Licensed under GPL and MIT, on Debian systems, the complete text of
+the GNU General Public License can be found under
+`/usr/share/common-licenses/GPL'
+
+File: frameworks/compass/stylesheets/compass/_misc.sass
+Copyright: Jared Hardy <jared at jaredhardy.com>
+License: 
+
+  This work is licensed under the Creative Commons Attribution 3.0
+  United States License.  To view a copy of this license, visit
+  http://creativecommons.org/licenses/by/3.0/us/ or send a letter to:
+  Creative Commons, 171 Second Street, Suite 300, San Francisco,
+  California, 94105, USA.
+
+File: lib/compass/app_integration/rails/templates/compass-install-rails.rb
+Copyright: (c) 2009 Derek Perez
+License: 
+
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+Files: *
+Copyright: (c) 2008-2009, Christopher M. Eppstein 
+
+License:
+
+A slightly modified MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+No attribution is required by products that make use of this software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written authorization.
+
+Contributors to this project agree to grant all rights to the copyright
+holder of the primary product. Attribution is maintained in the source
+control history of the product.
+
+
+Files: debian/*
+Copyright: (c) 2010, Micah Anderson <micah at debian.org>
+License: Public Domain
+ It is assumed that all contributors release their packaging works under the
+ same term as the module itself.
+

Added: trunk/libcompass-ruby/debian/libcompass-ruby1.8.docs
===================================================================
--- trunk/libcompass-ruby/debian/libcompass-ruby1.8.docs	                        (rev 0)
+++ trunk/libcompass-ruby/debian/libcompass-ruby1.8.docs	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,2 @@
+README.markdown
+

Added: trunk/libcompass-ruby/debian/libcompass-ruby1.8.examples
===================================================================
--- trunk/libcompass-ruby/debian/libcompass-ruby1.8.examples	                        (rev 0)
+++ trunk/libcompass-ruby/debian/libcompass-ruby1.8.examples	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1 @@
+examples/*

Added: trunk/libcompass-ruby/debian/libcompass-ruby1.8.install
===================================================================
--- trunk/libcompass-ruby/debian/libcompass-ruby1.8.install	                        (rev 0)
+++ trunk/libcompass-ruby/debian/libcompass-ruby1.8.install	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1 @@
+frameworks/*		usr/share/compass/frameworks

Added: trunk/libcompass-ruby/debian/patches/get-version-from-right-place
===================================================================
--- trunk/libcompass-ruby/debian/patches/get-version-from-right-place	                        (rev 0)
+++ trunk/libcompass-ruby/debian/patches/get-version-from-right-place	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,13 @@
+Index: libcompass-ruby-0.8.5debian/lib/compass/version.rb
+===================================================================
+--- libcompass-ruby-0.8.5debian.orig/lib/compass/version.rb	2010-03-05 19:16:22.000000000 -0500
++++ libcompass-ruby-0.8.5debian/lib/compass/version.rb	2010-03-05 19:16:21.000000000 -0500
+@@ -28,7 +28,7 @@
+ 
+     def read_version_file
+       require 'yaml'
+-      @version = YAML::load(File.read(scope('VERSION.yml')))
++      @version = YAML::load(File.read('/usr/lib/ruby/1.8/compass/VERSION.yml'))
+       @version[:string] = "#{@version[:major]}.#{@version[:minor]}.#{@version[:patch]}"
+       @version[:teeny] = @version[:patch]
+     end

Added: trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share
===================================================================
--- trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share	                        (rev 0)
+++ trunk/libcompass-ruby/debian/patches/put-frameworks-in-usr-share	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,24 @@
+Index: libcompass-ruby-0.8.5debian/frameworks/blueprint.rb
+===================================================================
+--- libcompass-ruby-0.8.5debian.orig/frameworks/blueprint.rb	2010-03-05 19:58:15.000000000 -0500
++++ libcompass-ruby-0.8.5debian/frameworks/blueprint.rb	2010-03-05 19:56:32.000000000 -0500
+@@ -1,2 +1,2 @@
+-blueprint_dir = File.join(Compass.base_directory, 'frameworks', 'blueprint')
++blueprint_dir = File.join('/usr/share/compass/frameworks', 'blueprint')
+ Compass::Frameworks.register('blueprint', blueprint_dir)
+Index: libcompass-ruby-0.8.5debian/frameworks/compass.rb
+===================================================================
+--- libcompass-ruby-0.8.5debian.orig/frameworks/compass.rb	2010-03-05 19:58:15.000000000 -0500
++++ libcompass-ruby-0.8.5debian/frameworks/compass.rb	2010-03-05 19:56:42.000000000 -0500
+@@ -1,2 +1,2 @@
+-compass_dir = File.join(Compass.base_directory, 'frameworks', 'compass')
++compass_dir = File.join('/usr/share/compass/frameworks', 'compass')
+ Compass::Frameworks.register('compass', compass_dir)
+Index: libcompass-ruby-0.8.5debian/frameworks/yui.rb
+===================================================================
+--- libcompass-ruby-0.8.5debian.orig/frameworks/yui.rb	2010-03-05 19:58:15.000000000 -0500
++++ libcompass-ruby-0.8.5debian/frameworks/yui.rb	2010-03-05 19:56:52.000000000 -0500
+@@ -1,2 +1,2 @@
+-yui_dir = File.join(Compass.base_directory, 'frameworks', 'yui')
++yui_dir = File.join('/usr/share/compass/frameworks', 'yui')
+ Compass::Frameworks.register('yui', yui_dir)

Added: trunk/libcompass-ruby/debian/patches/series
===================================================================
--- trunk/libcompass-ruby/debian/patches/series	                        (rev 0)
+++ trunk/libcompass-ruby/debian/patches/series	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,2 @@
+get-version-from-right-place
+put-frameworks-in-usr-share

Added: trunk/libcompass-ruby/debian/repack.sh
===================================================================
--- trunk/libcompass-ruby/debian/repack.sh	                        (rev 0)
+++ trunk/libcompass-ruby/debian/repack.sh	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2debian"
+FILE="$3"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+	# Tarball does contain a root directory
+	UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+## Remove stuff
+rm -vfr $UP_BASE/examples/css3/extensions/fancy-fonts/templates/project/Vtks\ Revolt.ttf
+rm -vfr $UP_BASE/examples/css3/images/fresh-peas.jpg
+rm -vfr $UP_BASE/lib/vendor/fssm
+
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+FILE="../tarballs/${PKG}_${VER}.orig.tar.gz"
+mv "$DIR/repacked.tar.gz" "$FILE"
+
+echo "*** $FILE repackaged"

Added: trunk/libcompass-ruby/debian/rules
===================================================================
--- trunk/libcompass-ruby/debian/rules	                        (rev 0)
+++ trunk/libcompass-ruby/debian/rules	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+DEB_INSTALL_CHANGELOGS_ALL = ChangeLog
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+install/libcompass-ruby1.8::
+	mkdir -p $(CURDIR)/debian/libcompass-ruby1.8/usr/lib/ruby/1.8/compass
+	install -m 0644 VERSION.yml ./debian/libcompass-ruby1.8/usr/lib/ruby/1.8/compass
+
+binary-install/libcompass-ruby1.8::
+	chmod a-x $(CURDIR)/debian/libcompass-ruby1.8/usr/share/compass/frameworks/blueprint/templates/buttons/buttons/key.png
+	chmod a-x $(CURDIR)/debian/libcompass-ruby1.8/usr/share/compass/frameworks/blueprint/templates/buttons/buttons/tick.png
+	chmod a-x $(CURDIR)/debian/libcompass-ruby1.8/usr/share/compass/frameworks/blueprint/templates/buttons/buttons/cross.png


Property changes on: trunk/libcompass-ruby/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/libcompass-ruby/debian/watch
===================================================================
--- trunk/libcompass-ruby/debian/watch	                        (rev 0)
+++ trunk/libcompass-ruby/debian/watch	2010-03-06 01:05:03 UTC (rev 4900)
@@ -0,0 +1,5 @@
+version=3
+options="dversionmangle=s/debian[0-9]*//" \
+http://githubredir.debian.net/github/chriseppstein/compass/ v([.0-9]*).tar.gz debian debian/repack.sh
+
+




More information about the Pkg-ruby-extras-commits mailing list